320c7519ed
HDFS-5230. Merging change r1527726 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527741 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 19:37:33 +00:00
4ff49a7516
HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize ReflectionUtils.printThreadInfo. (Junping Du via llu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527651 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 17:01:51 +00:00
e26ac59ca0
HDFS-5256. Merging change r1527452 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527453 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 06:13:27 +00:00
579cf8f612
YARN-899. Added back queue level administrator-acls so that there is no regression w.r.t 1.x. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1527282 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527283 13f79535-47bb-0310-9956-ffa450edef68
2013-09-29 08:22:14 +00:00
3c3b52b80b
MAPREDUCE-5538. Fixed MR AppMaster to send job-notification URL only after the job is really done - a bug caused by MAPREDUCE-5505. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1527219 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527221 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 19:14:46 +00:00
83ef3a1ab5
YARN-1246. Added application finish-status to ApplicationSummary for the sake of testing given ApplicationHistoryServer is not yet ready. Contributed by Arpit Gupta.
...
svn merge --ignore-ancestry -c 1527205 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527206 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 16:30:28 +00:00
f5ecb84344
HADOOP-8545 findbugs patches from the final -037 patch
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527188 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 13:57:27 +00:00
905be853a1
HADOOP-10006. Compilation failure in trunk for o.a.h.fs.swift.util.JSONUtil
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527186 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 13:30:09 +00:00
f040bd0739
HDFS-5260. Merging change r1527113 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527115 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 22:56:54 +00:00
030c3c99e8
HDFS-5265. Merge change r1527093 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527096 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:53:33 +00:00
c4df7fb70e
HDFS-5268. Merging change r1527087 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527092 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:37:47 +00:00
d680392e39
Fixing up CHANGES.txt for HDFS-5031.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527086 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:20:46 +00:00
75f9db1c4d
YARN-1021. Yarn Scheduler Load Simulator. (ywskycn via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527065 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:32:06 +00:00
c03040a498
Merge -c 1527048 from trunk to branch-2 to fix MAPREDUCE-5529. Fix compat with hadoop-1 in mapred.TotalOrderPartitioner by re-introducing (get,set)PartitionFile which takes in JobConf. Contributed by Robert Kanter.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527054 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:04:31 +00:00
b063da7b50
HADOOP-8545. Fixed merge to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527052 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:54:55 +00:00
d36dec185e
svn commit -c 1527037 FIXES: MAPREDUCE-5545. org.apache.hadoop.mapred.TestTaskAttemptListenerImpl.testCommitWindow times out. Contributed by Robert Kanter
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527039 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:17:24 +00:00
146d9264a9
Merge -c 1527033 from trunk to branch-2 to fix MAPREDUCE-5531. Fix compat with hadoop-1 in mapreduce.(TaskID, TaskAttemptID) by re-introducing missing constructors. Contributed by Robert Kanter.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527034 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 19:10:07 +00:00
d8e9a472e7
svn merge -c 1527015 FIXES: MAPREDUCE-5332. Support token-preserving restart of history server. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527016 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 18:26:09 +00:00
c35a34d3ce
HADOOP-8545. Filesystem Implementation for OpenStack Swift
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526852 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 11:29:07 +00:00
d44334158a
HADOOP-8545. Filesystem Implementation for OpenStack Swift
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526848 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 11:12:42 +00:00
78045b7abc
Merge -c 1526735 from trunk to branch-2 to fix MAPREDUCE-5514. Fix TestRMContainerAllocator. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526736 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 23:03:25 +00:00
dfd64df5f1
Merging change r1526728 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526731 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 22:59:13 +00:00
2b7ae8dd5d
svn merge -c 1526688 FIXES: MAPREDUCE-5513. ConcurrentModificationException in JobControl. Contributed by Robert Parker
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526702 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 21:21:34 +00:00
d2e94731ee
HADOOP-9976. Different versions of avro and avro-maven-plugin (Karthik Kambatla via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526668 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 20:26:04 +00:00
e33f5dc85d
YARN-819. ResourceManager and NodeManager should check for a minimum allowed version (Robert Parker via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526665 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 20:06:47 +00:00
6bdd4791db
MAPREDUCE-5525. Merging change r1526624 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526625 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:47:45 +00:00
16794494d3
HDFS-5186. Merging change r1526615 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526617 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:34:29 +00:00
ee97d95c33
HDFS-5258. Merging change r1526610 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526611 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:24:26 +00:00
e45c32fced
HADOOP-9948. Merging change r1526606 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526607 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:11:40 +00:00
fa2a3c94f2
HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:24:40 +00:00
6e132b1a2b
MAPREDUCE-5170. Fixed a wrong log message in CombineFileInputFormat class. Contributed by Sangjin Lee.
...
svn merge --ignore-ancestry -c 1526377 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526379 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 04:30:36 +00:00
30c03cc118
YARN-1157. Fixed ResourceManager UI to behave correctly when apps like distributed-shell do not set tracking urls. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1526371 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526372 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 04:18:28 +00:00
b41137c73a
MAPREDUCE-5503. Fixed a test issue in TestMRJobClient. Contributed by Jian He.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526364 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 03:02:06 +00:00
d437cfb16d
Merge r1526330 from trunk to branch-2 for YARN-49. Improve distributed shell application to work on a secure cluster. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526332 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 23:41:05 +00:00
61a00d87d5
HDFS-5246. Merging change r1526316 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526319 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 22:16:34 +00:00
138fd7581f
HADOOP-9981. globStatus should minimize its listStatus and getFileStatus calls. (Contributed by Colin Patrick McCabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526300 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:58:37 +00:00
101664055c
Move CHANGES.txt entry for HADOOP-9761
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526291 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:35:55 +00:00
88eb46c7c2
HADOOP-9776. Merging change r1526109 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526110 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 05:22:25 +00:00
9f05462612
Merge r1526078 from trunk to branch-2 for YARN-1214. Register ClientToken MasterKey in SecretManager after it is saved (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526079 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 01:15:24 +00:00
a5ecb4de41
Merge r1526071 from trunk to branch-2 for MAPREDUCE-5505. Clients should be notified job finished only after job successfully unregistered (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526072 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:53:10 +00:00
e23d5672a7
merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:37:14 +00:00
2daddb610e
YARN-1204. Added separate configuration properties for https for RM and NM without which servers enabled with https will also start on http ports. Contributed by Omkar Vinit Joshi.
...
MAPREDUCE-5523. Added separate configuration properties for https for JHS without which even when https is enabled, it starts on http port itself. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1525947 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525948 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 17:20:48 +00:00
51ae59ec51
svn merge -c 1525828 from trunk for HDFS-5228. The RemoteIterator returned by DistributedFileSystem.listFiles may throw NullPointerException.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525829 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 10:17:46 +00:00
3227545fe7
HDFS-5251. Merge 1525787 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525792 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 05:38:42 +00:00
360a4e5f03
HDFS-5249. Merging change r1525770 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525771 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 04:19:22 +00:00
b35d226b62
HDFS-4971. Merge change r1525681 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525688 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 20:26:20 +00:00
e2bfdfc585
svn merge -c 1525670 FIXES: MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525673 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 18:39:47 +00:00
4af31993a2
HDFS-5139. Merge r1525665 from trunk to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525667 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 18:19:48 +00:00
8f354d141e
HDFS-5139. Merge r1525659 from trunk to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525661 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 18:03:27 +00:00
8338e33f57
HADOOP-9977. Merging change r1525657 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525658 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 17:52:58 +00:00
Brandon Li
Luke Lu
Vinod Kumar Vavilapalli
Steve Loughran
Chris Nauroth
Jing Zhao
Kihwal Lee
Alejandro Abdelnur
Arun Murthy
Jason Darrell Lowe
Sanford Ryza
Jonathan Turner Eagles
Colin McCabe
Hitesh Shah
Andrew Wang
Ivan Mitic
Bikas Saha
Siddharth Seth
Tsz-wo Sze
Suresh Srinivas
Robert Joseph Evans
Arpit Agarwal