Commit Graph

2224 Commits

Author SHA1 Message Date
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
Robert Joseph Evans c21fe43ef1 svn merge -c 1300619 from trunk to branch-0.23 FIXES: HADOOP-8169. javadoc generation fails with java.lang.OutOfMemoryError: Java heap space (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300620 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 16:19:40 +00:00
Tsz-wo Sze 75f67416fb svn merge -c 1300392 from trunk for HDFS-3082.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300393 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 22:53:35 +00:00
Suresh Srinivas c4fe85ce23 HADOOP-8164. Merging change 1300290 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300292 13f79535-47bb-0310-9956-ffa450edef68
2012-03-13 19:10:41 +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
Todd Lipcon 7b9ebbb217 HDFS-2731. Add command to bootstrap the Standby Node's name directories from the Active NameNode. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299809 13f79535-47bb-0310-9956-ffa450edef68
2012-03-12 19:44:43 +00:00
Thomas Graves 275323b42f merge -r 1297661:1297662 from trunk to branch-0.23. FIXES: MAPREDUCE-3974
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299773 13f79535-47bb-0310-9956-ffa450edef68
2012-03-12 18:27:35 +00:00
Uma Maheswara Rao G 4e0d95988f merge HADOOP-7900. LocalDirAllocator confChanged() accesses conf.get() twice. Contributed by Ravi Gummadi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299443 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 20:38:02 +00:00
Suresh Srinivas d27bce1521 HDFS-1624, HADOOP-7454 - Merge r1296540 from trunk to 0.23 to fix CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299415 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 18:07:17 +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
Tsz-wo Sze cd4ce55758 Merge r1299139 and r1299144 from trunk for HDFS-3056.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299146 13f79535-47bb-0310-9956-ffa450edef68
2012-03-10 02:06:00 +00:00
Arun Murthy cac1864734 Merge -c 1299100 from trunk to branch-0.23 to fix MAPREDUCE-3773. Add queue metrics with buckets for job run times. Contributed by Owen O'Malley.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299101 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 23:36:41 +00:00
Harsh J 95e8912bc0 svn merge -c 1299045. Merge MAPREDUCE-3991 into branch-0.23. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299053 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 21:21:30 +00:00
Vinod Kumar Vavilapalli 07e7ad5e86 MAPREDUCE-3982. Fixed FileOutputCommitter to not err out for an 'empty-job' whose tasks don't write any outputs. Contributed by Robert Joseph Evans.
svn merge --ignore-ancestry -c 1299047 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299048 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 21:14:28 +00:00
Vinod Kumar Vavilapalli c383843732 MAPREDUCE-3348. Fixed a bug in MR client to redirect to JobHistoryServer correctly when RM forgets the app. Contributed by Devaraj K.
svn merge --ignore-ancestry -c 1298978 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298979 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 18:55:02 +00:00
Thomas White 4a151380c7 Merge -r 1298940:1298941 from trunk to branch-0.23. Fixes: MAPREDUCE-3578
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298942 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 17:38:10 +00:00
Eli Collins db5ad9eed1 HADOOP-7806. svn merge -c 1298700 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298701 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 04:45:15 +00:00
Eli Collins 8fe35af9a1 HADOOP-8154. svn merge -c 1298696 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298697 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 03:55:45 +00:00
Suresh Srinivas 867d1f475f HDFS-3036. Merge r1295961 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298251 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 01:49:29 +00:00
Suresh Srinivas e197c64c5b HADOOP-7557. Merge r1295261 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298245 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 00:57:13 +00:00
Suresh Srinivas 0e9e9afa84 HDFS-3014. Merge r1294926 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298244 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 00:53:19 +00:00
Suresh Srinivas 8893d46529 HDFS-3003. Merge r1293338 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298242 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 00:46:17 +00:00
Suresh Srinivas f7f68d2106 HADOOP-8108. Merge r1293128 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298239 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 00:25:43 +00:00
Suresh Srinivas 1a6236752c HDFS-2878. Merge r1242995 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298236 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 00:04:26 +00:00
Suresh Srinivas 985eb07407 HDFS-208. Merge r1204119 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298231 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 23:53:12 +00:00
Suresh Srinivas 9aa829fe67 HDFS-2764. Merge r1241780 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298229 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 23:48:42 +00:00
Suresh Srinivas 9c8f7e16e5 HADOOP-7888. Merge r1211728 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298222 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 23:38:56 +00:00
Suresh Srinivas 59e64c1b28 HADOOP-2430. Merge r1211650 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298214 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 23:33:22 +00:00
Suresh Srinivas 16afca9a55 HADOOP-7358. Merge r1205697 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298207 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 23:27:33 +00:00
Suresh Srinivas 1a4e973924 HDFS-2410. Merge r1204753 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298197 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 23:10:03 +00:00
Suresh Srinivas f68fa0365f HDFS-2285. Merge r1195013 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298183 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 22:45:37 +00:00
Suresh Srinivas b1dbd75065 HDFS-2507. Merge r1190060 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298089 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 20:22:19 +00:00
Suresh Srinivas d667cd871b HADOOP-7729. Merge r1183512 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298085 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 20:08:52 +00:00
Suresh Srinivas e4d3e2ffa3 HADOOP-7717. Merge r1179483 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298080 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 20:04:00 +00:00
Tsz-wo Sze c584783fd9 svn merge -c 1298066 from trunk for HDFS-2038.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298069 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 19:45:50 +00:00
Eli Collins 1061a1ea76 HDFS-3060. svn merge -c 1298044 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298045 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 19:16:42 +00:00
Todd Lipcon 52007208ba HADOOP-8141. Add method to SecurityUtil to init krb5 cipher suites. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298035 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 18:42:46 +00:00
Suresh Srinivas 21e7ea0f9a HDFS-2477. Merging change r1197801 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297866 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 06:57:41 +00:00
Suresh Srinivas 99b0f2aa2c HDFS-1765. Merging change r1213537 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297865 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 06:54:06 +00:00
Suresh Srinivas aec70c23aa HDFS-1580. Merging change r1210749, r1210602 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297864 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 06:48:27 +00:00
Suresh Srinivas d6f9460eba HDFS-2476. Merging change r1201991 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297863 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 06:43:11 +00:00
Suresh Srinivas 051ac2d9fa HDFS-2495. Merging change r1199024 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297862 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 06:38:53 +00:00
Suresh Srinivas 70804f394a HDFS-2477. Merging change r1196676 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297861 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 06:31:47 +00:00
Suresh Srinivas aa3bb33cd1 HDFS-2334. Merging change r1195620 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297858 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 06:26:35 +00:00
Suresh Srinivas f93d40e2c9 HDFS-2188. Merging change r1185354 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297857 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 06:20:53 +00:00
Suresh Srinivas e765df40dd HDFS-2158. Merging change r1177473 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297856 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 06:15:35 +00:00
Robert Joseph Evans b6d9e6b5f7 svn merge -c 1297825 from trunk to branch-0.23 FIXES: MAPREDUCE-3975. Default value not set for Configuration parameter mapreduce.job.local.dir (Eric Payne via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297826 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 01:28:34 +00:00
Robert Joseph Evans 9b32863cb8 svn merge -c 1297796 from trunk to branch-0.23 FIXES: MAPREDUCE-3977. LogAggregationService leaks log aggregator objects (Jason Lowe via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297797 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 23:46:02 +00:00
Robert Joseph Evans de89bbcb88 svn merge -c 1297788 from trunk to branch-0.23 FIXES: MAPREDUCE-3961. Map/ReduceSlotMillis computation incorrect (Siddharth Seth via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297789 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 23:23:25 +00:00
Robert Joseph Evans 99c16e8e04 svn merge -c 1297771 trunk to branch-0.23 FIXES: HADOOP-8140. dfs -getmerge should process its argments better (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297773 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 22:46:53 +00:00