Commit Graph

1156 Commits

Author SHA1 Message Date
Tsz-wo Sze 134a29f226 svn merge -c 1574259 from trunk for HDFS-5535.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576128 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:37:46 +00:00
Chris Nauroth 0663d54767 HADOOP-10399. Merging change r1576124 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576126 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:15:51 +00:00
Colin McCabe fca36dcb4e HDFS-6065. HDFS zero-copy reads should return null on EOF when doing ZCR (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575110 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 01:19:05 +00:00
Colin McCabe a9f2c50805 HDFS-6061. Allow dfs.datanode.shared.file.descriptor.path to contain multiple entries and fall back when needed (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574798 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 08:26:26 +00:00
Colin McCabe 6f2dd3a25a HDFS-6057. DomainSocketWatcher.watcherThread should be marked as a daemon thread (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574789 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 08:01:41 +00:00
Haohui Mai 94ac5ba669 Merge r1574716 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574717 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 23:12:22 +00:00
Arpit Agarwal 2f3536ed12 HADOOP-10211. Merging r1574697 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574698 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 22:31:59 +00:00
Brandon Li b7c98f4912 HDFS-6043. Merging change r1574616 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574620 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:53:59 +00:00
Jing Zhao d5da583bda HDFS-5167. Merge change r1574603 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574608 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:24:09 +00:00
Haohui Mai 4cc5a8dbdb Merge r1574283 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574284 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 01:50:28 +00:00
Haohui Mai e81398da81 Merge r1574261 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574262 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 00:03:56 +00:00
Colin McCabe ba862fc744 HDFS-6051. HDFS cannot run on Windows since short-circuit memory segment changes (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574256 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 23:41:28 +00:00
Colin McCabe c1db6bf511 HDFS-6040. fix DFSClient issue without libhadoop.so and some other ShortCircuitShm cleanups (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573885 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 06:35:57 +00:00
Suresh Srinivas 70915f68b2 HADOOP-10378. Merge 1573776 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573779 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 22:12:20 +00:00
Kihwal Lee 31cf2ef1ca svn merge -c 1573604 merging from trunk to branch-2 to fix:HADOOP-10314. The ls command help still shows outdated 0.16 format. Contributed by Rushabh S Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573605 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 16:41:46 +00:00
Colin McCabe 1754ca0b90 HDFS-5950. The DFSClient and DataNode should use shared memory segments to communicate short-circuit information (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573435 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 04:05:58 +00:00
Arpit Agarwal e0f27f3755 HADOOP-10285. Merging r1573052 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573063 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 20:35:44 +00:00
Chris Nauroth 0eb2d3355a HADOOP-10353. Merging change r1572679 and r1572680 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572682 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 19:03:58 +00:00
Chris Nauroth 2244459186 HDFS-4685. Merge HDFS ACLs to branch-2. Merging changes r1569870, r1570466, r1570655, r1571573, r1571745, r1572142, r1572189 and r1572190 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572308 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 22:32:27 +00:00
Aaron Myers 4812bd1569 HADOOP-9454. Support multipart uploads for s3native. Contributed by Jordan Mendelson and Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572237 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 20:31:06 +00:00
Tsz-wo Sze b1d64419ac svn merge -c 1572220 from trunk for HADOOP-10368. InputStream is not closed in VersionInfo ctor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572221 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 19:58:38 +00:00
Jing Zhao 70707e613a HDFS-5939. Merge change r1571781 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571782 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 18:39:50 +00:00
Aaron Myers bd10814f31 HADOOP-10070. RPC client doesn't use per-connection conf to determine server's expected Kerberos principal name. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570777 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 01:12:13 +00:00
Arpit Agarwal 82095e0811 HADOOP-10278. Merging r1570703 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570704 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 20:54:53 +00:00
Jonathan Turner Eagles 9ffb6429a4 MAPREDUCE-5671. NaN can be created by client and assign to Progress (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570623 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 16:32:52 +00:00
Jing Zhao bb8da67817 HADOOP-10355. Merge change r1570460 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570464 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 06:17:59 +00:00
Chris Nauroth 631a915b94 HADOOP-10328. Merging change r1570304 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570305 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 19:04:04 +00:00
Jing Zhao 7ba83fb31b HADOOP-10348. Deprecate hadoop.ssl.configuration in branch-2, and remove it in trunk. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570297 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 18:41:06 +00:00
Arpit Agarwal 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
Colin McCabe 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
Vinod Kumar Vavilapalli 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
Jason Darrell Lowe 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
Vinod Kumar Vavilapalli 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
Andrew Wang 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
Vinod Kumar Vavilapalli 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
Suresh Srinivas 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 Gupta af2ad815cd HADOOP-10343. Merging change r1568054 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568059 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 22:00:14 +00:00
Vinod Kumar Vavilapalli dc8e01e752 YARN-1676. Modified RM HA handling of user-to-group mappings to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1568041 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568042 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 21:25:34 +00:00
Colin McCabe 6bd4581910 HDFS-5940. Minor cleanups to ShortCircuitReplica, FsDatasetCache, and DomainSocketWatcher (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567838 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 03:14:00 +00:00
Colin McCabe ccdf21bfe2 HDFS-5810. Unify mmap cache and short-circuit file descriptor cache (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567728 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 19:24:46 +00:00
Konstantin Shvachko 924be82437 HDFS-4858. HDFS DataNode to NameNode RPC should timeout. Contributed by Henry Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567537 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 07:06:44 +00:00
Colin McCabe e70faba559 HADOOP-10338. Cannot get the FileStatus of the root inode from the new Globber (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567500 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 02:16:21 +00:00
Arun Murthy 7ef269e9a4 Release notes for hadoop-2.3.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567119 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 13:33:14 +00:00
Aaron Myers b5df324d32 HADOOP-10326. M/R jobs can not access S3 if Kerberos is enabled. Contributed by bc Wong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566966 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 02:49:07 +00:00
Vinod Kumar Vavilapalli 3cd8219519 YARN-1459. Changed ResourceManager to depend its service initialization on the configuration-provider mechanism during startup too. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1566791 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566793 13f79535-47bb-0310-9956-ffa450edef68
2014-02-10 22:51:30 +00:00
Suresh Srinivas b7c2dece6c HADOOP-10333. Merge 1566709 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566710 13f79535-47bb-0310-9956-ffa450edef68
2014-02-10 19:35:46 +00:00
Chris Nauroth cf173a332b HADOOP-10327. Merging change r1565389 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565390 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 18:42:14 +00:00
Jing Zhao e7e5df5b0b HDFS-5873. Merge change r1564973 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564977 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 22:53:41 +00:00
Todd Lipcon c1503515da HDFS-5399. Revisit SafeModeException and corresponding retry policies. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564628 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 04:18:21 +00:00
Vinod Kumar Vavilapalli afa5cebbc1 YARN-1669. Modified RM HA handling of protocol level service-ACLS to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1564549 ../../trunk/
Ran into minor import related conflicts that I merged manually.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564552 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 22:57:37 +00:00
Vinod Kumar Vavilapalli 615716010e YARN-1667. Modified RM HA handling of super users (with proxying ability) to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1564100 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564101 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 22:11:22 +00:00
Karthik Kambatla ef4cbe7c15 HADOOP-10085. CompositeService should allow adding services while being inited. (Steve Loughran via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563696 13f79535-47bb-0310-9956-ffa450edef68
2014-02-02 19:52:40 +00:00
Colin McCabe 4fa696384d HDFS-5746. Add ShortCircuitSharedMemorySegment (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563363 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 02:31:14 +00:00
Jing Zhao c21e39b79b HADOOP-10295. Merge change r1563019 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563020 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 23:58:56 +00:00
Arpit Agarwal 7547307e5c HADOOP-10139. Merging r1562931 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562932 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 19:30:39 +00:00
Aaron Myers 3a23c563fa HADOOP-10310. SaslRpcServer should be initialized even when no secret manager present. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562867 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 15:52:39 +00:00
Andrew Wang f00e3a3d7a HADOOP-10305. Add rpc.metrics.quantile.enable and rpc.metrics.percentiles.intervals to core-default.xml. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562660 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 01:06:40 +00:00
Arpit Agarwal 01f6aee7d3 HADOOP-10291. Merging r1562353 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562355 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 04:41:46 +00:00
Suresh Srinivas c6095c8ed5 HADOOP-10292. Restore HttpServer from branch-2.2 in branch-2. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561967 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 07:50:54 +00:00
Suresh Srinivas afc40e8a66 HADOOP-10255. Merge 1561959 and 1561961 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561966 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 07:47:37 +00:00
Michael Stack a6acbd2403 HADOOP-10274 Lower the logging level from ERROR to WARN for UGI.doAs method (Takeshi Miao via stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561935 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 04:58:18 +00:00
Todd Lipcon 497eb4b402 HADOOP-10288. Explicit reference to Log4JLogger breaks non-log4j users. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561880 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 22:13:51 +00:00
Aaron Myers 9b4403eba9 HADOOP-10250. VersionUtil returns wrong value when comparing two versions. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561861 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 21:39:01 +00:00
Arpit Agarwal 63d3c13f4d HADOOP-10212. Merging r1561838 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561839 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 20:39:45 +00:00
Arpit Agarwal bca2735ffa HADOOP-9982. Merge r1561813 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561815 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 19:53:26 +00:00
Arpit Agarwal be32b2d1ad HADOOP-10086. Merging r1561776 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561777 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:36:07 +00:00
Aaron Myers e079120d58 HADOOP-10203. Connection leak in Jets3tNativeFileSystemStore#retrieveMetadata. Contributed by Andrei Savu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561724 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 16:22:28 +00:00
Jason Darrell Lowe a3286bdd51 svn merge -c 1561038 FIXES: Addendum patch for HADOOP-9652 to fix performance problems. Contributed by Andrew Wang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561043 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 15:49:14 +00:00
Uma Maheswara Rao G ad41e7a1c9 Merge HADOOP-10248. Property name should be included in the exception where property value is null. Contributed by Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560907 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 06:28:50 +00:00
Andrew Wang c4194399d3 Merge HDFS-4949 changes from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560522 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 21:43:00 +00:00
Aaron Myers 31339d3f5e HADOOP-10252. HttpServer can't start if hostname is not specified. Contributed by Jimmy Xiang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560451 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 18:13:22 +00:00
Michael Stack d726c27ae8 HBASE-10143 replace WritableFactories's hashmap with ConcurrentHashMap (Liang Xie via Stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559924 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 05:16:19 +00:00
Brandon Li e6d2096a18 HADOOP-10125. Merging change r1558575 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558952 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 23:01:53 +00:00
Daryn Sharp ce71fa1931 svn merge -c 1558883 FIXES: HADOOP-10146. Workaround JDK7 Process fd close bug (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558885 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 18:56:21 +00:00
Suresh Srinivas 79fe328c5f HADOOP-10236. Merge change 1558498 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558500 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 18:32:40 +00:00
Chris Nauroth b6b71bfd97 HADOOP-10234. Merging change r1558296 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558297 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 05:46:44 +00:00
Chris Nauroth a1d511639f HADOOP-10228. Merging change r1557236 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558146 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 18:25:17 +00:00
Karthik Kambatla a7632fa9e2 YARN-1574. RMDispatcher should be reset on transition to standby. (Xuan Gong via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557249 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 20:20:01 +00:00
Chris Nauroth 16efa09548 HADOOP-10178. Merging change r1557236 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557238 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 20:03:31 +00:00
Andrew Wang a2af7a32f1 HADOOP-9420. Add percentile or max metric for rpcQueueTime, processing time. Contributed by Liang Xie.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556984 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 23:42:32 +00:00
Karthik Kambatla fc73a88bd3 HADOOP-10214. Fix multithreaded correctness warnings in ActiveStandbyElector (Liang Xie via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556735 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 06:37:20 +00:00
Colin McCabe 082d4713bb HADOOP-10207. TestUserGroupInformation#testLogin is flaky (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556670 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 23:28:18 +00:00
Jing Zhao d1bf9f268e HADOOP-10208. Merge change r1556602 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556604 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 18:43:14 +00:00
Vinod Kumar Vavilapalli 9b38eb2c2e YARN-1029. Added embedded leader election in the ResourceManager. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1556103 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556105 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 01:56:56 +00:00
Colin McCabe 5745523e98 HDFS-5220 Expose group resolution time as metric (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555986 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 19:30:13 +00:00
Andrew Wang 4cf8f575fc HADOOP-10198. DomainSocket: add support for socketpair. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554891 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 20:07:21 +00:00
Kihwal Lee 3fce292af7 svn merge -c 1554815 merging from trunk to branch-2 to fix HADOOP-10173. Remove UGI from DIGEST-MD5 SASL server creation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554817 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 15:00:17 +00:00
Ivan Mitic 1e6b49ee8b HADOOP-10090 Merging change r1553561 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553564 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 19:51:48 +00:00
Chris Nauroth 1eaed17cdf HADOOP-10175. Merging change r1553169 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553171 13f79535-47bb-0310-9956-ffa450edef68
2013-12-23 18:38:11 +00:00
Jing Zhao 60f8b513f1 HDFS-5690. Merge change r1553167 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553168 13f79535-47bb-0310-9956-ffa450edef68
2013-12-23 18:28:09 +00:00
Karthik Kambatla 2dc61dea3c YARN-1028. Addendum patch. Added FailoverProxyProvider capability to ResourceManager to help with RM failover.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552921 13f79535-47bb-0310-9956-ffa450edef68
2013-12-21 16:30:06 +00:00
Jing Zhao 68164b197b HADOOP-10169. Merge change r1552820 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552822 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 22:08:53 +00:00
Daryn Sharp 02b722fba1 svn merge -c 1552389 FIXES: HADOOP-10172. Cache SASL server factories (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552391 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 18:23:26 +00:00
Robert Joseph Evans 971418cdb5 svn merge -c 1552104 FIXES: HADOOP-10164. Allow UGI to login with a known Subject (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552106 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 21:26:13 +00:00
Jonathan Turner Eagles a875bcb2da HADOOP-10171. TestRPC fails intermittently on jkd7 (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552033 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 17:12:23 +00:00
Vinod Kumar Vavilapalli 237310d89a YARN-1028. Added FailoverProxyProvider capability to ResourceManager to help with RM failover. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1551739 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551740 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 22:33:16 +00:00
Jing Zhao b19b529f38 HDFS-5536. Merge change r1547925 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551715 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 21:18:38 +00:00
Jing Zhao 88d09130e8 HDFS-5545. Merge change r1546151 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551703 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:59:27 +00:00
Jing Zhao 1b00e40a30 HDFS-5538. Merge change r1545491 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551692 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:45:27 +00:00
Suresh Srinivas 42d48b02df HADOOP-10168. Merge 1551646 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551648 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 18:24:38 +00:00
Jing Zhao 0835cb221e HADOOP-10106. Merge change r1551369 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551379 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 22:13:47 +00:00
Hitesh Shah 35bf9069ce Merge 1550570 from trunk to branch-2 for HADOOP-8753. LocalDirAllocator throws ArithmeticException: divide by zero when there is no available space on configured local dir. Contributed by Benoy Antony.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550571 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 22:57:40 +00:00
Colin McCabe f7e842683d HADOOP-10162. Fix symlink-related test failures in TestFileContextResolveAfs and TestStat in branch-2 (Mit Desai via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550487 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 18:58:41 +00:00
Colin McCabe 8e416ea685 HADOOP-10087. UserGroupInformation.getGroupNames() fails to return primary group first when JniBasedUnixGroupsMappingWithFallback is used (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550230 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 19:00:30 +00:00
Colin McCabe c9ad1bb3aa HADOOP-10020. disable symlinks temporarily (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550034 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 02:44:35 +00:00
Jason Darrell Lowe 5c1cbcb058 svn merge -c 1549705 FIXES: MAPREDUCE-5656. bzip2 codec can drop records when reading data in splits. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1549710 13f79535-47bb-0310-9956-ffa450edef68
2013-12-09 23:42:36 +00:00
Colin McCabe 9368cc0dbb HADOOP-10142. Avoid groups lookup for unprivileged users such as dr.who (vinay via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548767 13f79535-47bb-0310-9956-ffa450edef68
2013-12-07 00:31:56 +00:00
Jonathan Turner Eagles a768b8387e HADOOP-10058. TestMetricsSystemImpl#testInitFirstVerifyStopInvokedImmediately fails on trunk (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548218 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 17:48:46 +00:00
Jason Darrell Lowe 839d3fc19b svn merge -c 1548179 FIXES: HADOOP-10081. Client.setupIOStreams can leak socket resources on exception or error. Contributed by Tsuyoshi OZAWA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548181 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 16:06:09 +00:00
Sanford Ryza a51157a1ee HADOOP-10127. Add ipc.client.connect.retry.interval to control the frequency of connection retries (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547627 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 22:47:15 +00:00
Andrew Wang cd585dcc2f HDFS-5560. Trash configuration log statements prints incorrect units. Contributed by Josh Elser.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547267 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 03:33:12 +00:00
Colin McCabe 137bf488a5 HADOOP-10130. RawLocalFS pread does not track FileSystem Statistics (Binglin Chang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547119 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 17:30:00 +00:00
Uma Maheswara Rao G 003c57ca9b Merge. HADOOP-10132. RPC#stopProxy() should log the class of proxy when IllegalArgumentException is encountered. Contributed by Ted Yu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546193 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 20:57:37 +00:00
Suresh Srinivas e3f9960a7d HADOOP-10126. Merge change 1545376 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545379 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 19:46:46 +00:00
Jonathan Turner Eagles e34bc8dc97 HADOOP-10111. Allow DU to be initialized with an initial value (Kihwal Lee via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544241 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 16:19:18 +00:00
Uma Maheswara Rao G 87a23fa27f Merge HADOOP-9114. After defined the dfs.checksum.type as the NULL, write file and hflush will through java.lang.ArrayIndexOutOfBoundsException. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544190 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 14:08:49 +00:00
Jing Zhao 7e10509fe4 HDFS-3987. Merge change r1543962 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543967 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 22:00:32 +00:00
Arun Murthy 258775c9fd Merge -c 1543542 from trunk to branch-2 to fix HADOOP-10047. Add a direct-buffer based apis for compression. Contributed by Gopal V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543543 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 19:30:04 +00:00
Arun Murthy 71f9f49590 Revert HADOOP-10047, wrong patch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543539 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 19:26:01 +00:00
Arun Murthy 9ff2130eeb Merge -c 1543456 from trunk to branch-2 to fix HADOOP-10047. Add a direct-buffer based apis for compression. Contributed by Gopal V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543457 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 15:39:16 +00:00
Jing Zhao b07bd1006d HADOOP-10107. Merge change r1543335 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543338 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 07:44:30 +00:00
Jing Zhao 53f2a1efe5 HDFS-5502. Merge change r1542438 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542439 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 01:06:27 +00:00
Daryn Sharp 4495d087a7 svn merge -c 1542111 FIXES: HADOOP-9955. RPC idle connection closing is extremely inefficient (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542112 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 22:57:17 +00:00
Bikas Saha 63115de6fd Merging r1541995 from trunk to branch-2 for YARN-1222. Make improvements in ZKRMStateStore for fencing (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542026 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 19:09:40 +00:00
Chris Nauroth e28947c428 HADOOP-10094. Merging change r1541991 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541993 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 17:49:33 +00:00
Tsz-wo Sze 79e34c2a3c svn merge -c 1541750 from trunk for HADOOP-10095. In CodecPool, synchronize pool and codecList separately in order to reduce lock contention.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541751 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 22:51:43 +00:00
Daryn Sharp d993d01cdf svn merge -c 1541736 FIXES: HADOOP-9956. RPC listener inefficiently assigns connections to readers (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541743 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 21:48:21 +00:00
Steve Loughran 91342b9820 HADOOP-9594 commons-math
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541667 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:29:56 +00:00
Chris Nauroth 2cdd8f1b63 HADOOP-10093. Merging change r1541343 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541344 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 01:17:57 +00:00
Jing Zhao 76a7119930 HDFS-5371. Merge change r1540197 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540200 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 21:43:15 +00:00
Colin McCabe 60dd68f4bb HADOOP-9623. Update jet3t dependency to 0.9.0 (Amandeep Khurana via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539256 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 08:02:55 +00:00
Colin McCabe 5324b77a60 HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538252 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 18:51:14 +00:00
Colin McCabe 2946a3afdf HADOOP-10079. log a warning message if group resolution takes too long (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538114 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 00:48:29 +00:00
Andrew Wang 4dfa0bf99f HADOOP-9898. Set SO_KEEPALIVE on all our sockets. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537638 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 20:56:42 +00:00
Bikas Saha 330ada83eb Merge r1536888 from trunk to branch-2 for YARN-1068. Add admin support for HA operations (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536899 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:21:06 +00:00
Jonathan Turner Eagles 16cc6640b7 HADOOP-9016. HarFsInputStream.skip(long) must never return negative value. (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535088 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 18:12:02 +00:00
Jonathan Turner Eagles f64cb91d67 HADOOP-9291. enhance unit-test coverage of package o.a.h.metrics2 (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534476 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 03:48:37 +00:00
Colin McCabe 75968551bd HDFS-5276. FileSystem.Statistics should use thread-local counters to avoid multi-threaded performance issues on read/write. (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533670 13f79535-47bb-0310-9956-ffa450edef68
2013-10-19 00:38:13 +00:00
Chris Nauroth 2c1afcf3d0 HADOOP-10055. Merging change r1533188 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533189 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:16:02 +00:00
Andrew Wang 5776b0b324 HDFS-5360. Improvement of usage message of renameSnapshot and deleteSnapshot. Contributed by Shinichi Yamashita.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532938 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 23:16:13 +00:00
Jonathan Turner Eagles 186581fef2 HADOOP-9078. enhance unit-test coverage of class org.apache.hadoop.fs.FileContext (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532929 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:47:16 +00:00
Chris Nauroth 9cda28ef0d HADOOP-9897. Merging change r1532880 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532883 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:15:09 +00:00
Andrew Wang ea64a5a48d HADOOP-100046. Print a log message when SSL is enabled (David S. Wang via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532479 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 18:40:45 +00:00
Chris Nauroth 6f80868079 HADOOP-10040. Merging change r1532136 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532138 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 23:32:56 +00:00
Chris Nauroth d8a9841f40 HADOOP-10040. Merging change r1531994 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531996 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:43:52 +00:00
Chris Nauroth a5467739bb HADOOP-10040. Merging change r1531983 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531984 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:14:24 +00:00
Chris Nauroth 4e4e958213 HADOOP-10040. Merging change r1531977 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531978 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:06:42 +00:00
Brandon Li d890e365c8 HDFS-5329. Merging change 1531617 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531618 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 05:33:12 +00:00
Chris Nauroth 4f3386420c HADOOP-10040. Merging change r1531491 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531492 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 03:16:45 +00:00
Jing Zhao c89a36106e HDFS-5322. Merge change r1531436 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531440 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:53:29 +00:00