01730690f3
HDFS-5483. Merging r1570040 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570041 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 01:44:36 +00:00
cb4541446a
YARN-713. Fixing missing update on branch-2 and branch-2.4.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570032 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 01:26:37 +00:00
bc56aae9dc
HDFS-5868. Merging r1569978 from trunk to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569982 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:42:03 +00:00
5dcbc034f2
YARN-713. Fixed ResourceManager to not crash while building tokens when DNS issues happen transmittently. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1569979 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569980 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:39:48 +00:00
df72553cba
HDFS-5318. Merging r1569951 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569959 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:08:29 +00:00
287536ef9d
HDFS-5973. add DomainSocket#shutdown method. (cmccabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569952 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:01:49 +00:00
34baa74273
YARN-1718. Fix a couple isTerminals in Fair Scheduler queue placement rules (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569929 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 21:37:24 +00:00
a5d2398377
YARN-1171. Add default queue properties to Fair Scheduler documentation (Naren Koneru via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569924 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 21:30:30 +00:00
07c3667c84
YARN-1479. Invalid NaN values in Hadoop REST API JSON response (Chen He via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569859 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 17:58:04 +00:00
0bbc1f4d95
YARN-1666. Modified RM HA handling of include/exclude node-lists to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1569856 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569857 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 17:53:45 +00:00
6edf8860ef
svn merge -c 1569789 merging from trunk to branch-2 to fix:HDFS-5961. OIV cannot load fsimages containing a symbolic link.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569790 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 15:30:34 +00:00
f33f8df2be
Merge from r1569585. YARN-1428. Fixed RM to write the final state of RMApp/RMAppAttempt to the application history store in the transition to the final state. (Contributed by Zhijie Shen)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569600 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 01:47:21 +00:00
3aa93a1702
Update change description for HDFS-5953
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569580 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 01:06:05 +00:00
eeae0cd829
YARN-1590. Fixed ResourceManager, web-app proxy and MR JobHistoryServer to expand _HOST properly in their kerberos principles. Contributed by Mohammad Kamrul Islam.
...
svn merge --ignore-ancestry -c 1569537 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569539 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 21:51:06 +00:00
d6ed3df506
HDFS-5893. Merge change r1569477 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569478 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 19:08:43 +00:00
ebb9cb3ee5
YARN-1724. Race condition in Fair Scheduler when continuous scheduling is turned on (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569451 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 18:07:59 +00:00
90cbdfaf9d
YARN-1721. When moving app between queues in Fair Scheduler, grab lock on FSSchedulerApp (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569445 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 17:52:30 +00:00
5c26966bb7
svn merge -c 1569391 merging from trunk to branch-2 to fix:HDFS-5803. TestBalancer.testBalancer0 fails.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569393 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 15:42:04 +00:00
d34f27becf
svn merge -c 1569382 FIXES: HADOOP-10346. Deadlock while logging tokens. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569385 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 15:27:46 +00:00
9da50ec5e6
svn merge -c 1569368. merging from trunk to branch-2 to fix:HDFS-5780. TestRBWBlockInvalidation times out intemittently.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569369 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 14:55:19 +00:00
1ccccb8534
Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 04:41:01 +00:00
2ad9a8d8ff
HDFS-5959. Merge r1569156 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569162 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 01:54:48 +00:00
3151800acd
HDFS-5942. Merging change r1569124 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569133 13f79535-47bb-0310-9956-ffa450edef68
2014-02-17 22:42:07 +00:00
3452748b21
svn merge -c 1569038 FIXES: MAPREDUCE-5757. ConcurrentModificationException in JobControl.toList. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569043 13f79535-47bb-0310-9956-ffa450edef68
2014-02-17 16:25:55 +00:00
18d0cc96bb
HDFS-5698. Update CHANGES.txt in branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568584 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 01:32:48 +00:00
f0e7b22059
HDFS-5759. Merging r1568578 from trunk to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568581 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 01:27:12 +00:00
54d43e5b41
HDFS-5953. TestBlockReaderFactory fails in trunk. (Akira Ajisaka via wang)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568569 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:52:59 +00:00
d795cbd791
HDFS-5847. Merging r1567812 from trunk to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568562 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:27:25 +00:00
fdbee9d53a
HDFS-5716. Merging change r1568547 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568553 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:17:58 +00:00
9829487fff
HDFS-5915. Merging r1566824 from trunk to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568552 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:16:27 +00:00
25c508e425
HDFS-5698. Merge r1566359 from trunk for merging the 'Use protobuf to serialize / deserialize FSImage' feature
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568548 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:08:04 +00:00
ecd71765c0
YARN-1553. Fixed a bug with branch-2 patch that broke compilation. Contributed by Haohui Mai.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568540 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 23:05:37 +00:00
bdb9562634
HDFS-5949. Merging change r1568536 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568537 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 22:17:34 +00:00
d0f8a63073
HDFS-5948. Merging r1568532 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568533 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 22:00:13 +00:00
be69bfc2f4
HDFS-3128. Unit tests should not use a test root in /tmp. (wang)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568527 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 21:29:36 +00:00
7e252cdc9d
YARN-1553. Modified YARN and MR to stop using HttpConfig.isSecure() and
...
instead rely on the http policy framework. And also fix some bugs related
to https handling in YARN web-apps. Contributed by Haohui Mai.
svn merge --ignore-ancestry -c 1568501 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568503 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 20:01:32 +00:00
696859201f
HDFS-5775. Merge change r1558599 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568451 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 18:47:59 +00:00
8f9e6d8fa0
HDFS-5768. Merge change r1558598 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568447 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 18:43:39 +00:00
73aa908be6
HDFS-5943. Merge 1568412 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568427 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 18:17:26 +00:00
ced619c93e
HDFS-5715 and HDFS-5726. Merge change r1556353 and r1556433 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568217 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 08:23:45 +00:00
bac1ab80f0
HDFS-5632. Merge change r1550917 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568210 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:47:06 +00:00
7fb827fb1d
HDFS-5647. Merge change r1548796 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568207 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:38:34 +00:00
99a661e449
HDFS-5554. Merge change r1548796 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568206 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:35:44 +00:00
418e152347
HDFS-5537. Merge change r1546184 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568204 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:18:58 +00:00
ccdeeb39e1
HDFS-5286. Merge change r1545768 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568203 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:13:02 +00:00
e1fd74bb98
HDFS-5285. Flatten INodeFile hierarchy: Add UnderContruction Feature. Merge change r1544389 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568201 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 06:59:06 +00:00
f744409914
HDFS-5531. Merge change r1544018 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568186 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 01:40:08 +00:00
dbe7e29f0a
HDFS-5901. Merging change r1568168 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568169 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:57:19 +00:00
ce1f918a32
HDFS-5934. Merging change r1568165 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568167 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:49:14 +00:00
42ebc843e9
HADOOP-10249. Merge 1568164 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568166 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:47:58 +00:00
Arpit Agarwal
Vinod Kumar Vavilapalli
Colin McCabe
Sanford Ryza
Jonathan Turner Eagles
Kihwal Lee
Jian He
Jing Zhao
Jason Darrell Lowe
Arun Murthy
Suresh Srinivas
Chris Nauroth
Andrew Wang
Brandon Li