604fe963fd
YARN-422. Add a NM Client library to help application-writers. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1487184 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487187 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 01:43:01 +00:00
71cc411340
MAPREDUCE-5237. Add methods that were removed from ClusterStatus back into 2.x so as to be compatible with 1.x. Contributed by Zhijie Shen.
...
Incompatible as ClusterStatus.UNINITIALIZED_MEMORY_VALUE is a long now and so breaks 0.23.x but it shouldn't be a big deal in reality.
svn merge --ignore-ancestry -c 1487175 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487176 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 00:43:47 +00:00
a2303831b4
MAPREDUCE-5270. Migrated MR app from using BuilderUtil factory methods to individual record factory methods. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1486271 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487158 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 22:38:14 +00:00
ea60ea3b85
svn merge -c 1456212 FIXES: HADOOP-9397. Incremental dist tar build fails. Contributed by Chris Nauroth
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487117 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 20:58:39 +00:00
0c221b3b03
Merge -r 1487092:1487093 from trunk onto branch-2. Fixes HDFS-4827.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487099 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 20:25:35 +00:00
419fb4a4de
svn merge -c 1486974 Merging from trunk to branch-2 to fix HDFS-4780.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486975 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 15:49:33 +00:00
dbe14af299
HDFS-4825. Merge change 1486386 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486387 13f79535-47bb-0310-9956-ffa450edef68
2013-05-26 02:28:10 +00:00
fa88e4ea6e
HADOOP-8562. CHANGES.txt cleanup related to merging the related jiras to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486384 13f79535-47bb-0310-9956-ffa450edef68
2013-05-26 00:09:12 +00:00
b8535c0ec1
Updating common and mapreduce CHANGES.txt with 2.0.4.1-alpha release
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486270 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 01:43:46 +00:00
6c5055fe92
YARN-571. Remove user from ContainerLaunchContext. Contributed by Omkar Vinit Joshi.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486251 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 23:11:25 +00:00
599b00e087
MAPREDUCE-5191. Merge r1484575 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486245 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:47:19 +00:00
5f496310b6
HADOOP-8562. Merge r1480883 for HADOOP-9553, r1480880 for HADOOP-9556, r1478633, r1478592 for HADOOP-9483, r1478577 for HADOOP-9043
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486244 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:36:52 +00:00
1a895a3fd6
HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:29:49 +00:00
baa2db4c64
HADOOP-8562. Merge r1477376 for HADOOP-9413, r1476877 for HDFS-4734, r1476856 for HADOOP-9524.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486238 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:20:55 +00:00
f0829a44e4
HADOOP-8562. Merge r1469667 for YARN-493 and HADOOP-9486 and r1469996 for HADOOP-9488.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486231 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 21:58:04 +00:00
1e119f5c31
HDFS-4705. Merge r1476610 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486199 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:54:00 +00:00
e0c878b493
HADOOP-9490. Merge r1476609 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486179 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:24:25 +00:00
fe81cd68c8
HADOOP-9500. Merge r1476606 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486177 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:19:46 +00:00
f05a2e5b69
HDFS-4722. Merge r1476597 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486176 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:16:58 +00:00
c0fbc823f0
HDFS-4740. Merge r1476596 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486174 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 19:14:04 +00:00
bc0eb9d993
HDFS-4743. Merge r1476591 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486162 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:45:39 +00:00
3694a73ff8
HADOOP-9290. Merge r1476586 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:37:58 +00:00
0610d2d2d3
HDFS-4741. Merge r1476585 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486151 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:29:50 +00:00
0af2735024
HDFS-3131. Merge r1305688 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486150 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:26:33 +00:00
f1f11999d9
HDFS-4732. Merge r1471090 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486146 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:17:52 +00:00
4a16d5b759
HDFS-4725. Merge r1470771 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486144 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:15:42 +00:00
57cf1e8fbf
HADOOP-9443. Merge r1470224 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486130 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 17:34:28 +00:00
5e007776f6
MAPREDUCE-4987. Merge r1470003 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486106 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 16:19:53 +00:00
de7911b528
HADOOP-8562. Merge r1469996 for HADOOP-9488, r1469998 for YARN-593
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486101 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 16:03:32 +00:00
a9176a64a1
HDFS-4693. Merge r1468457 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486098 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 15:44:33 +00:00
91084635f3
MAPREDUCE-4885. Merge r1467158 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485951 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 07:12:07 +00:00
9b910c5c88
HADOOP-8562. Merge r1464780 HDFS-4625, r1465869 YARN-557, r1466148 HDFS-4674, r1466306 HADOOP-9437, r1466746 YARN-487
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485934 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 05:34:41 +00:00
0a96ae767f
HADOOP-8562. Merge r1459586 for HDFS-4615, r1459592 for HDFS-4584, r1459643, r1459642 for HADOOP-9387, r1460086 for HADOOP-9353
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485932 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 05:12:56 +00:00
02205fa797
HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for HDFS-4607
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485911 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:51:31 +00:00
004a9d5567
MAPREDUCE-5230. Bring back NLineInputFormat.createFileSplit for binary compatibility with mapred in 1.x Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1485906 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485908 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:42:53 +00:00
a6c4b42353
HADOP-8662. Merge r1455637 for HADOOP-9388, r1455956 for HDFS-4593, r1456060 for HDFS-4582 and r1457057 for HDFS-4603
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485907 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:42:28 +00:00
830909a910
HADOOP-8562. Merge changes r1454616 for HDFS-4573, r1454889 for HADOOP-8973, r1455360 for HDFS-4572, r1455605 for HDFS-4287 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485892 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:51:30 +00:00
4bf02c3be8
YARN-711. Copied BuilderUtil methods in individual API records as BuilderUtils is going to be dismantled. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1485888 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485890 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:48:13 +00:00
7f66f9ccf6
HDFS-4714. Log short messages in Namenode RPC server for exceptions meant for clients. Contributed by Kihwal Lee.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485882 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:28:21 +00:00
a0a6e7b6fe
YARN-548. Add tests for YarnUncaughtExceptionHandler (Vadim Bondarev via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485879 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:27:19 +00:00
3f9b3d49a3
svn merge -c 1485861 Merging from trunk to branch-2 to fix HDFS-4807.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485863 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:37:32 +00:00
7ba49c56aa
Merge changes r1453645 for HADOOP-9373, r1453675 for HADOOP-9376, r1453676 for HADOOP-9365, r1454108 for HADOOP-9364.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485853 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:17:38 +00:00
84b91e1b01
HADOOP-9372. Merge r1453637 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485852 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:09:50 +00:00
3eb800f539
HADOOP-9373. Merge change r1453599 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485850 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 21:07:05 +00:00
a1235b5ba9
HADOOP-8562. Merge r1453486 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 20:41:53 +00:00
35dc9545e1
YARN-563. Add the concept of an application-type for each application. Contributed by Mayank Bansal.
...
MAPREDUCE-5246. Specify application-type at the time of job submission after YARN-563. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1485790 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485792 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 18:02:45 +00:00
01cdcf6eb4
Fixed incorrect jira in CHANGES.txt (YARN-716 to YARN-715)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485585 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 06:01:55 +00:00
9bd8b0c4f1
merge YARN-716 from trunk. Fixed unit test failures - TestDistributedShell and TestUnmanagedAMLauncher. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485580 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 05:49:07 +00:00
28822c2f64
MAPREDUCE-5233. Add methods that are changed or removed from JobControl.Job when compared to 1.x. This breaks 0.23.x users of one API in Job. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1485491 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485494 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 23:13:19 +00:00
6f45ab764e
YARN-708. Deleting files that were supposed to removed in the previous commit.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485482 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 23:07:51 +00:00
Vinod Kumar Vavilapalli
Jason Darrell Lowe
Devaraj Das
Kihwal Lee
Suresh Srinivas
Konstantin Boudnik
Jonathan Turner Eagles
Siddharth Seth