Commit Graph

28 Commits

Author SHA1 Message Date
Eli Collins 401f9ace50 HDFS-3480. Multiple SLF4J binding warning. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349644 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 05:53:48 +00:00
Alejandro Abdelnur f27f122609 Merge -r 1348956:1348957 from trunk to branch. FIXES: HADOOP-8368
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348959 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:44:57 +00:00
Todd Lipcon d7e171d5b8 Merge HDFS-3042 (automatic failover) to branch-2 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347804 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 21:25:34 +00:00
Tsz-wo Sze 1156fc41dc svn merge -c -1347094 for reverting HADOOP-8368 again.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347739 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 17:58:19 +00:00
Alejandro Abdelnur bad1c8bdd5 svn merge -c -1346495 for re-committing HADOOP-8368. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347094 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 20:17:33 +00:00
Tsz-wo Sze b93758626e svn revert -c -1346102 for reverting HADOOP-8368.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346495 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 18:00:44 +00:00
Alejandro Abdelnur 36c8624924 Merge -r 1345420:1345421 from trunk to branch. FIXES: HADOOP-8368
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346102 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 19:34:57 +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
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
Suresh Srinivas 089f6ca742 HDFS-3136. Merge r1310476 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310477 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 16:51:15 +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
Eli Collins e5a92c8b05 HDFS-2303. svn merge -c 1299963 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299964 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 03:42:18 +00:00
Suresh Srinivas 40276d7f78 HDFS-1623. Merging change r1296534 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299412 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 17:55:58 +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
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 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
Thomas White 5fe01ec75a Merge -r 1215353:1215354 from trunk to branch-0.23. Fixes: HDFS-2640.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215355 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:12:05 +00:00
Alejandro Abdelnur 1a231a0b22 Merge -r 1214789:1214790 from trunk to branch. FIXES: HADOOP-7917
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214792 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 14:47:22 +00:00
Alejandro Abdelnur 0f3833fafe Merge -r 1212608:1212609 from trunk to branch. FIXES: HDFS-2511
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212630 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 21:02:38 +00:00
Arun Murthy fbfe1b0afa Changing branch-0.23 to 0.23.1-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205240 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 23:47:40 +00:00
Thomas White 1d54c6e5a7 Merge -r 1190702:1190703 from trunk to branch-0.23. Fixes: HADOOP-7763.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190706 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 00:17:58 +00:00
Alejandro Abdelnur 040013af9e Merge -r 1180093:1180094 from trunk to branch. FIXES: HDFS-2322
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190582 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 21:19:21 +00:00
Alejandro Abdelnur 50c4d995cf Merge -r 1179893:1179894 from trunk to branch-0.23. Fixes: HDFS-2294
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190573 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 21:08:23 +00:00
Mahadev Konar 291d905d9d HDFS-2401. Running a set of methods in a Single Test Class. (Jonathan Eagles via mahadev) - Merging r1182694 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182695 13f79535-47bb-0310-9956-ffa450edef68
2011-10-13 07:15:10 +00:00
Matthew Foley c387949961 HDFS-2344. Fix the TestOfflineEditsViewer test failure in 0.23 branch. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173285 13f79535-47bb-0310-9956-ffa450edef68
2011-09-20 18:15:07 +00:00
Arun Murthy 02cf28ece0 Merge -r 1162420:1162421 from trunk to branch-0.23 to fix HDFS-2289.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1162422 13f79535-47bb-0310-9956-ffa450edef68
2011-08-27 19:09:35 +00:00
Arun Murthy 6316e66279 HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161335 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 00:20:52 +00:00
Arun Murthy cd7157784e HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1161332 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 00:14:24 +00:00