Haohui Mai
|
061a26631f
|
HDFS-6722. Merge r1616669 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616670 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-08 04:29:32 +00:00 |
Andrew Wang
|
509ed4400a
|
Revert HADOOP-10876.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616659 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-08 01:40:15 +00:00 |
Aaron Myers
|
1fe7b04863
|
HDFS-6740. Make FSDataset support adding data volumes dynamically. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616624 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 23:01:36 +00:00 |
|
Aaron Myers
|
84d57bbfa8
|
HDFS-6728. Dynamically add new volumes to DataStorage, formatted if necessary. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616620 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 22:53:00 +00:00 |
Brandon Li
|
8a3f21cb08
|
HADOOP-10929. Merging change r1616616 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616618 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 22:50:41 +00:00 |
Jason Darrell Lowe
|
16c4bd1a96
|
svn merge -c 1616585 FIXES: MAPREDUCE-6021. MR AM should have working directory in LD_LIBRARY_PATH. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616591 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 20:29:48 +00:00 |
Jian He
|
06a0772d62
|
Merge r1616580 from trunk. YARN-2008. Fixed CapacityScheduler to calculate headroom based on max available capacity instead of configured max capacity. Contributed by Craig Welch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616581 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 20:01:14 +00:00 |
Arpit Agarwal
|
79d6802d5f
|
HDFS-6781. Add file missed in previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616577 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 19:46:38 +00:00 |
|
Arpit Agarwal
|
3f54884b46
|
HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616576 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 19:46:14 +00:00 |
Zhijie Shen
|
c6c4a74bef
|
YARN-2288. Made persisted data in LevelDB timeline store be versioned. Contributed by Junping Du.
svn merge --ignore-ancestry -c 1616540 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616541 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 17:03:58 +00:00 |
Steve Loughran
|
5a056789ad
|
HADOOP-10931 compile error on tools/hadoop-openstack
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616481 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 12:35:21 +00:00 |
Tsz-wo Sze
|
67557212c7
|
svn merge -c 1616426 from trunk for HDFS-6812. Remove addBlock and replaceBlock from DatanodeDescriptor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616427 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 07:33:01 +00:00 |
|
Tsz-wo Sze
|
645ca2d8f5
|
svn merge -c 1616422 from trunk for HDFS-6809. Move Balancer's inner classes MovedBlocks and Matcher as to standalone classes and separates KeyManager from NameNodeConnector.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616423 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 07:23:06 +00:00 |
|
Zhijie Shen
|
f55c04a94b
|
YARN-2388. Fixed TestTimelineWebServices failure due to HADOOP-10791. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1616405 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616406 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 05:38:58 +00:00 |
Karthik Kambatla
|
290d4e3ec8
|
YARN-2359. Application hangs when it fails to launch AM container. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616376 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-07 00:08:27 +00:00 |
Jing Zhao
|
5c7571fa3f
|
HDFS-6791. Merge change r1616306 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616311 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-06 19:15:04 +00:00 |
|
Jian He
|
72d90780c2
|
Merge r1616302 from trunk. YARN-2374. Fixed TestDistributedShell#testDSShell failure due to hostname dismatch. Contributed by Varun Vasudev
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616305 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-06 19:00:26 +00:00 |
Allen Wittenauer
|
cc5a7495b7
|
HDFS-6517. Remove hadoop-metrics2.properties from hdfs project (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616265 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-06 16:13:36 +00:00 |
Junping Du
|
8abd45b5bb
|
Merge r1616100 from trunk: YARN-2298. Move TimelineClient to yarn-common project (Zhijie Shen via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616102 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-06 05:56:34 +00:00 |
|
Brandon Li
|
5e3640eb4f
|
HDFS-6790. Merging change r1616058 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616072 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-06 01:13:36 +00:00 |
|
Brandon Li
|
34cb2a81af
|
HADOOP-10905. Merging change r1616054 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616056 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-05 23:59:05 +00:00 |
|
Karthik Kambatla
|
5f81675aea
|
Edit CHANGES.txt files to move HADOOP-10759 and HDFS-6717 from 2.5.0 to 2.6.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616037 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-05 22:49:34 +00:00 |
|
Jason Darrell Lowe
|
24346da6b6
|
svn merge -c 1616018 FIXES: MAPREDUCE-6014. New task status field in task attempts table can lead to an empty web page. Contributed by Mit Desai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616020 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-05 21:59:01 +00:00 |
Alejandro Abdelnur
|
22b88af106
|
HADOOP-10933. FileBasedKeyStoresFactory Should use Configuration.getPassword for SSL Passwords. (lmccay via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616009 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-05 21:31:03 +00:00 |
|
Alejandro Abdelnur
|
891d93bbcf
|
HADOOP-10791. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616006 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-05 21:25:22 +00:00 |
|
Andrew Wang
|
1fafce595f
|
HADOOP-10927. Fix CredentialShell help behavior and error codes. Contributed by Josh Elser.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615829 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-05 00:26:06 +00:00 |
|
Andrew Wang
|
fe1b4fc452
|
HADOOP-10928. Incorrect usage on hadoop credential list. Contributed by Josh Elser.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615828 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-05 00:23:55 +00:00 |
|
Brandon Li
|
c1452c4722
|
Merging change r1615801 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615802 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-04 21:33:10 +00:00 |
|
Brandon Li
|
225febccc1
|
HDFS-6451. Merging change r1615702 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615708 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-04 17:44:45 +00:00 |
Eric Yang
|
e5c5417f10
|
HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Sam Liu via Eric Yang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615703 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-04 17:40:08 +00:00 |
Uma Maheswara Rao G
|
4ac92fdbd5
|
Merge from trunk. HDFS-6787. Remove duplicate code in FSDirectory#unprotectedConcat. Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615623 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-04 15:45:56 +00:00 |
|
Junping Du
|
fc5bb235f2
|
Merge r1615550 from trunk: YARN-1354. Recover applications upon nodemanager restart. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615554 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-04 13:35:49 +00:00 |
Vinayakumar B
|
8e8d4717e9
|
Merged revision(s) 1615504 from hadoop/common/trunk:
HDFS-5185. DN fails to startup if one of the data dir is full. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615505 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-04 08:44:39 +00:00 |
|
Vinayakumar B
|
fed094d0af
|
Merged revision(s) 1615491 from hadoop/common/trunk:
HDFS-5723. Append failed FINALIZED replica should not be accepted as valid when that block is underconstruction. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615492 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-04 06:46:01 +00:00 |
|
Junping Du
|
0ad7bfb121
|
Merge r1615469 from trunk: YARN-2370. Fix comment in o.a.h.y.server.resourcemanager.schedulerAppSchedulingInfo (Contributed by Wenwu Peng)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615471 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-04 01:19:29 +00:00 |
Chris Nauroth
|
c87a14048e
|
HADOOP-10903. Merging change r1615386 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615388 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-03 05:17:02 +00:00 |
|
Chris Nauroth
|
2852c4866e
|
HDFS-6810: fix compilation error in TestReplicationPolicy.java.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615387 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-03 05:13:44 +00:00 |
|
Arpit Agarwal
|
89cf64edf3
|
HDFS-6810: Merging r1615381 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615382 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-03 02:08:57 +00:00 |
|
Jian He
|
2417753952
|
Merge r1615270 from trunk. YARN-2343. Improve NMToken expire exception message. Contributed by Li Lu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615271 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 23:46:26 +00:00 |
|
Andrew Wang
|
743837b259
|
HDFS-6793. Missing changes in HftpFileSystem when Reintroduce dfs.http.port / dfs.https.port in branch-2. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615243 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 21:54:18 +00:00 |
|
Andrew Wang
|
5f115917b3
|
HDFS-6788. Improve synchronization in BPOfferService with read write lock. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615242 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 21:50:45 +00:00 |
|
Andrew Wang
|
2777f777e9
|
Revert HDFS-6788, bad merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615239 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 21:45:38 +00:00 |
|
Andrew Wang
|
511234c828
|
HDFS-6788. Improve synchronization in BPOfferService with read write lock. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615191 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 18:56:25 +00:00 |
|
Andrew Wang
|
e86559fde3
|
HDFS-6802. Some tests in TestDFSClientFailover are missing @Test annotation. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615184 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 17:58:37 +00:00 |
|
Andrew Wang
|
f3db1ad3cc
|
HADOOP-10900. CredentialShell args should use single-dash style. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615178 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 17:43:34 +00:00 |
|
Arpit Agarwal
|
1b4f028385
|
HDFS-6794: Merging r1615169 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615175 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 17:35:14 +00:00 |
|
Tsz-wo Sze
|
91794728d5
|
svn merge -c 1615107 from trunk for HDFS-6796. Improve the argument check during balancer command line parsing.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615108 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 14:15:57 +00:00 |
|
Arpit Agarwal
|
a38e398a22
|
HDFS-6798: Merging r1615044 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615045 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 07:12:59 +00:00 |
|
Junping Du
|
75349f2d83
|
Merge r1615025 from trunk: YARN-2051. Fix bug in PBimpls and add more unit tests with reflection. (Contributed by Binglin Chang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615027 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 04:25:49 +00:00 |
|
Arpit Agarwal
|
5be502add3
|
HDFS-6797: Merging r1615017 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615018 13f79535-47bb-0310-9956-ffa450edef68
|
2014-08-01 01:15:04 +00:00 |