Commit Graph

112 Commits

Author SHA1 Message Date
Arun Murthy 6796f8d226 Merge -c 1425560 from trunk to branch-2 to fix HDFS-4326. bump up Tomcat version for HttpFS to 6.0.36. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425562 13f79535-47bb-0310-9956-ffa450edef68
2012-12-24 00:16:23 +00:00
Arun Murthy f68da35bb2 Reverting HDFS-4326 since it caused 'mvn package' to break.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425400 13f79535-47bb-0310-9956-ffa450edef68
2012-12-23 03:52:42 +00:00
Alejandro Abdelnur e30516f017 HDFS-4326. bump up Tomcat version for HttpFS to 6.0.36. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424064 13f79535-47bb-0310-9956-ffa450edef68
2012-12-19 20:00:47 +00:00
Suresh Srinivas 448882534b HDFS-4236. Merge change 1418356 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1418363 13f79535-47bb-0310-9956-ffa450edef68
2012-12-07 15:40:24 +00:00
Alejandro Abdelnur edf729ebed HDFS-4171. WebHDFS and HttpFs should accept only valid Unix user names. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410828 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 05:34:52 +00:00
Robert Joseph Evans eeced257c0 svn merge -r 1409090:1409089 reverting HDFS-4171 until test failures can be fixed.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409268 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 17:35:42 +00:00
Alejandro Abdelnur 502d6b940d HDFS-4171. WebHDFS and HttpFs should accept only valid Unix user names. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409090 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 06:18:04 +00:00
Thomas White d488a59497 Merge -r 1407657:1407658 from trunk to branch-2. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408290 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 13:57:19 +00:00
Alejandro Abdelnur 437ce1aff0 HDFS-3999. HttpFS OPEN operation expects len parameter, it should be length. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394170 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 17:46:39 +00:00
Alejandro Abdelnur b568b09f4e HDFS-3944. Httpfs resolveAuthority() is not resolving host correctly. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1386995 13f79535-47bb-0310-9956-ffa450edef68
2012-09-18 05:46:47 +00:00
Alejandro Abdelnur 002c001d71 HDFS-3938. remove current limitations from HttpFS docs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384843 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 16:29:49 +00:00
Aaron Myers ac103a4314 HADOOP-8755. Print thread dump when tests fail due to timeout. Contributed by Andrey Klochkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384628 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 01:50:35 +00:00
Arun Murthy f403be7569 Set version in branch-2 to 2.0.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 12:57:48 +00:00
Alejandro Abdelnur 3d928ddeb8 HDFS-3895. hadoop-client must include commons-cli (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381720 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 19:05:57 +00:00
Alejandro Abdelnur a42a7fccf5 HDFS-3866. HttpFS POM should have property where to download tomcat from (zero45 via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380928 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 22:56:46 +00:00
Suresh Srinivas 5998a179b4 HDFS-3844. Merge change 1377168 from trunk. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377176 13f79535-47bb-0310-9956-ffa450edef68
2012-08-25 01:23:52 +00:00
Daryn Sharp a8f10869a8 svn merge -c 1374271 FIXES: HADOOP-7967. Need generalized multi-token filesystem support (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374346 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 16:26:01 +00:00
Thomas White 15b9897255 Merge -r 1373573:1373574 from trunk to branch-2. Fixes: HADOOP-8278 - Make sure components declare correct set of dependencies
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373594 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 19:28:51 +00:00
Alejandro Abdelnur faf54e5b2a Merge -r 1370386:1370387 from trunk to branch. FIXES: HDFS-3291
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370392 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 17:46:24 +00:00
Alejandro Abdelnur f5dfa69617 Merge -r 1368307:1368308 from trunk to branch. FIXES: HDFS-3724
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368310 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 23:16:48 +00:00
Alejandro Abdelnur 6406fb59f7 Merge -r 1368303:1368304 from trunk to branch. FIXES: HDFS-3513
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368305 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 23:10:26 +00:00
Alejandro Abdelnur 1849fca985 Merge -r 1365989:1365990 from trunk to branch. FIXES: HDFS-3113
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365991 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:43:17 +00:00
Alejandro Abdelnur c7bbda5ec9 Merge -r 1365987:1365988 from trunk to branch. FIXES: HDFS-3113
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365989 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:41:09 +00:00
Aaron Myers 5d110e145e HDFS-3583. Convert remaining tests to Junit4. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363948 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 20:44:56 +00:00
Eli Collins 03e8648d17 HDFS-3492. fix some misuses of InputStream#skip. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361450 13f79535-47bb-0310-9956-ffa450edef68
2012-07-14 00:22:55 +00:00
Eli Collins dce88a6dbc HDFS-3641. Move server Util time methods to common and use now instead of System#currentTimeMillis. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360896 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 19:59:20 +00:00
Eli Collins 267a83df9f HADOOP-8586. Fixup a bunch of SPNEGO misspellings. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360053 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 08:14:46 +00:00
Alejandro Abdelnur 1142e13bd4 Merge -r 1356329:1356330 from trunk to branch. FIXES: HDFS-3575
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356332 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 16:42:28 +00:00
Alejandro Abdelnur b51d32719d Merge -r 1355592:1355593 from trunk to branch. FIXES: HDFS-3580
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355595 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 22:59:09 +00:00
Alejandro Abdelnur 30c8f2bc9c Merge -r 1355555:1355556 from trunk to branch. FIXES: HDFS-3491
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355558 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 21:05:43 +00:00
Alejandro Abdelnur c4cbc45d05 Merge -r 1354598:1354599 from trunk to branch. FIXES: HDFS-3113
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354603 13f79535-47bb-0310-9956-ffa450edef68
2012-06-27 16:13:35 +00:00
Todd Lipcon 4db45a7f7a Revert HDFS-3492 from r1347192: patch broke TestShortCircuitLocalRead
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347797 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 21:06:41 +00:00
Todd Lipcon 56de3ad39d HDFS-3492. Fix some misuses of InputStream#skip. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347191 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 22:48:40 +00:00
Harsh J 1f804b5d20 svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:58:13 +00:00
Eli Collins 92f0d2be53 HADOOP-8422. Deprecate FileSystem#getDefault* and getServerDefault methods that don't take a Path argument. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342496 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 04:12:14 +00:00
Alejandro Abdelnur 671bd40e9b Merge -r 1342333:1342334 from trunk to branch. FIXES: HDFS-3460
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342336 13f79535-47bb-0310-9956-ffa450edef68
2012-05-24 16:51:46 +00:00
Alejandro Abdelnur 00875b37f6 HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 19:46:30 +00:00
Alejandro Abdelnur 596831bcba Merge -r 1331492:1331493 from trunk to branch. FIXES: HDFS-3309
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331494 13f79535-47bb-0310-9956-ffa450edef68
2012-04-27 16:30:56 +00:00
Alejandro Abdelnur 2690acc9d5 Merge -r 1329714:1329715 from trunk to branch. FIXES: HDFS-3314
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329725 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:52:07 +00:00
Alejandro Abdelnur cbcb7b09a8 Merge -r 1327626:1327627 from trunk to branch. FIXES: HDFS-3263
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327630 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:55:33 +00:00
Suresh Srinivas 6e9eb85f22 HDFS-3109. Merging change r1309971 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309974 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 17:47:52 +00:00
Eli Collins ed41b8dfe3 HDFS-3160. svn merge -c 1306665 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306666 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 01:16:26 +00:00
Arun Murthy 3e8925aa92 Changed version in branch-2 to 2.0.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:25:51 +00:00
Uma Maheswara Rao G 240a1eb4bf svn Merge HDFS-3111 added the apache licence headers (umamahesh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301878 13f79535-47bb-0310-9956-ffa450edef68
2012-03-17 07:22:11 +00:00
Alejandro Abdelnur 7014e3f6d6 Merge -r 1300636:1300637 from trunk to branch. FIXES: HDFS-3057
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300641 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 17:03:23 +00:00
Arun Murthy c79ae7a8db Moving branch-0.23 to version 0.23.3-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293515 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 01:58:06 +00:00
Alejandro Abdelnur e98fdc037c Merge -r 1242986:1242987 from trunk to branch. FIXES: HADOOP-8051
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242988 13f79535-47bb-0310-9956-ffa450edef68
2012-02-11 00:04:08 +00:00
Arun Murthy 78971a4267 Set version to 0.23.2-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241808 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 08:12:18 +00:00
Alejandro Abdelnur 56b07f1ab2 Merge -r 1236939:1236940 from trunk to branch. FIXES: HDFS-2840
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236942 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 00:28:37 +00:00
Alejandro Abdelnur 4132e3991e Merge -r 1236928:1236929 from trunk to branch. FIXES: HADOOP-7939
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236934 13f79535-47bb-0310-9956-ffa450edef68
2012-01-28 00:10:34 +00:00
Alejandro Abdelnur c1fd273580 Merge -r 1236337:1236338 from trunk to branch. FIXES: HDFS-2837
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236339 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 18:16:27 +00:00
Alejandro Abdelnur 5f2d286963 Merge -r 1236327:1236328 from trunk to branch. FIXES: HDFS-2836
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236331 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 18:00:41 +00:00
Alejandro Abdelnur 8539e71bd0 Merge -r 1234134:1234135 from trunk to branch. FIXES: HDFS-2816
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234138 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 21:07:21 +00:00
Alejandro Abdelnur e3e457398e Merge -r 1227786:1227787 from trunk to branch. FIXES: HADOOP-7934
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227805 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 20:06:52 +00:00
Harsh J 4f2b026450 merge HDFS-2722 (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1226880 13f79535-47bb-0310-9956-ffa450edef68
2012-01-03 17:20:20 +00:00
Alejandro Abdelnur 4c3ea975d1 Merge -r 1224793:1224794 from trunk to branch. FIXES: HDFS-2707
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1224795 13f79535-47bb-0310-9956-ffa450edef68
2011-12-26 19:41:14 +00:00
Alejandro Abdelnur ca5aa2c36f Merge -r 1221615:1221616 from trunk to branch. FIXES: HDFS-2705
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221619 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 05:53:50 +00:00
Alejandro Abdelnur 451dfb1005 Merge -r 1221579:1221580 from trunk to branch. FIXES: HDFS-2657
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221584 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 03:06:10 +00:00
Alejandro Abdelnur dc82b91b5e Merge -r 1221571:1221572 from trunk to branch. FIXES: HDFS-2646
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221576 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 02:54:08 +00:00
Alejandro Abdelnur f325906f2a Merge -r 1220809:1220810 from trunk to branch. FIXES: HDFS-2658
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1220814 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 15:56:57 +00:00
Eli Collins 71ce4a9c6a HDFS-2649. svn merge -c 1214046 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214049 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 03:57:21 +00:00
Alejandro Abdelnur 24e3d83445 Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212064 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 19:30:53 +00:00