Commit Graph

628 Commits

Author SHA1 Message Date
Todd Lipcon ced2087998 HADOOP-8659. Native libraries must build with soft-float ABI for Oracle JVM on ARM. Contributed by Trevor Robinson.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1371508 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 21:58:29 +00:00
Alejandro Abdelnur 221e491f5d Merge -r 1370811:1370812 from trunk to branch. FIXES: HADOOP-8660
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370815 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 15:43:26 +00:00
Arun Murthy 92a99de731 Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370667 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 05:33:56 +00:00
Aaron Myers 9c8485f099 HDFS-3637. Add support for encrypting the DataTransferProtocol. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370360 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 16:46:03 +00:00
Alejandro Abdelnur 80f8a6f8a3 Merge -r 1370044:1370045 from trunk to branch. FIXES: HADOOP-8644
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370050 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 22:39:15 +00:00
Eli Collins afd9e523cd HADOOP-8480. The native build should honor -DskipTests. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368259 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 21:30:06 +00:00
Eli Collins f23d581bfd HADOOP-8620. Add -Drequire.fuse and -Drequire.snappy. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368256 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 21:27:12 +00:00
Thomas Graves 34f90dc93b merge -r 1368001:1368002 from trunk. FIXES: HADOOP-8633
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368003 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 14:03:01 +00:00
Thomas Graves 7fd5b56a8b merge -r 1367763:1367764 from trunk. FIXES: HADOOP-8370
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367765 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 20:44:12 +00:00
Thomas Graves 5a17a40ee6 merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367715 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:21:27 +00:00
Robert Joseph Evans 30ba954741 svn merge -c 1367702 FIXES: HADOOP-8637. FilterFileSystem#setWriteChecksum is broken (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367703 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:00:03 +00:00
Todd Lipcon 814dbbdd0b Fix typo in CHANGES.txt: wrote HADOOP-8642 instead of HADOOP-8624.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367346 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 22:38:27 +00:00
Robert Joseph Evans 04eeb42717 svn merge -c 1367296 FIXES: HADOOP-8635. Cannot cancel paths registered deleteOnExit (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367297 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 21:00:15 +00:00
Robert Joseph Evans 59d4ea2c64 svn merge -c 1367202 FIXES: HADOOP-8550. hadoop fs -touchz automatically created parent directories (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367203 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 18:12:29 +00:00
Robert Joseph Evans cc871e76f3 svn merge -c 1367196 FIXES: HADOOP-8634. Ensure FileSystem#close doesn't squawk for deleteOnExit paths (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367197 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 18:06:44 +00:00
Robert Joseph Evans 79fc1b2fe8 svn merge -c 1367114 FIXES: HADOOP-8627. FS deleteOnExit may delete the wrong path (daryn via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367115 13f79535-47bb-0310-9956-ffa450edef68
2012-07-30 15:19:56 +00:00
Daryn Sharp b1109c152e svn merge -c 1366440 FIXES: HADOOP-8613. AbstractDelegationTokenIdentifier#getUser() should set token auth type. (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366450 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 16:53:38 +00:00
Aaron Myers 85351f8176 HADOOP-8626. Typo in default setting for hadoop.security.group.mapping.ldap.search.filter.user. Contributed by Jonathan Natkins.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366412 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 15:15:05 +00:00
Aaron Myers 8a8461ef31 HDFS-3650. Use MutableQuantiles to provide latency histograms for various operations. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366245 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 00:22:54 +00:00
Suresh Srinivas 050df1454f HADOOP-8623. Merging change 1366126 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366134 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 18:32:43 +00:00
Todd Lipcon a19c96c3d8 HADOOP-8642. ProtobufRpcEngine should log all RPCs if TRACE logging is enabled. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366128 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 18:22:36 +00:00
Alejandro Abdelnur f00a592fe9 Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365982 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:25:41 +00:00
Todd Lipcon 76ec7feb54 Amend previous commit of HDFS-3626: accidentally included a hunk from HADOOP-8621 in svn commit. Reverting that hunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365818 13f79535-47bb-0310-9956-ffa450edef68
2012-07-25 22:05:12 +00:00
Todd Lipcon d7fdcea8bf HDFS-3626. Creating file with invalid path can corrupt edit log. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365803 13f79535-47bb-0310-9956-ffa450edef68
2012-07-25 21:52:43 +00:00
Robert Joseph Evans bd7735fe79 svn merge -c 1365588 FIXES: HADOOP-8551. fs -mkdir creates parent directories without the -p option (John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365589 13f79535-47bb-0310-9956-ffa450edef68
2012-07-25 13:57:54 +00:00
Robert Joseph Evans 99f87b520e svn merge -c 1365224 FIXES: HADOOP-8606. FileSystem.get may return the wrong filesystem (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365226 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 19:02:22 +00:00
Aaron Myers 91afa71cd1 HADOOP-8609. IPC server logs a useless message when shutting down socket. Contributed by Jon Zuanich.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363951 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 20:52:31 +00:00
Robert Joseph Evans 560a5d04ee Reverting HADOOP-8551. fs -mkdir creates parent directories without the -p option
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363548 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 21:16:33 +00:00
Robert Joseph Evans 48a86fbe8f svn merge -c 1363435 FIXES: HADOOP-8551. fs -mkdir creates parent directories without the -p option (Daryn Sharp and John George via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363437 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 17:48:33 +00:00
Todd Lipcon 1aa9249c61 HADOOP-8537. Fix TFile tests to pass even when native zlib support is not compiled. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362730 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 00:51:36 +00:00
Todd Lipcon 2b81fe68b7 HADOOP-8599. Non empty response from FileSystem.getFileBlockLocations when asking for data beyond the end of file. Contributed by Andrey Klochkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362296 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 22:41:59 +00:00
Eli Collins 551ed65482 Amend HDFS-3666, applied earlier version of the patch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362279 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 21:50:58 +00:00
Eli Collins 9404bc7cad HDFS-3666. Plumb more exception messages to terminate. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362274 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 21:30:42 +00:00
Eli Collins d3b1109de8 MAPREDUCE-4447. Remove aop from cruft from the ant build. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362207 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 19:10:26 +00:00
Alejandro Abdelnur 5b64da5b53 Merge -r 1362150:1362151 from trunk to branch. FIXES: HADOOP-8552
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362152 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 17:29:54 +00:00
Robert Joseph Evans c35da29454 svn merge -c 1362052. FIXES: MAPREDUCE-4395. Possible NPE at ClientDistributedCacheManager#determineTimestamps (Bhallamudi via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362054 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 14:20:47 +00:00
Harsh J 769194d5b3 Backport of HADOOP-8531 from trunk. SequenceFile Writer can throw out a better error if a serializer or deserializer isn't available. Contributed by Madhukara Phatak. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361943 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 09:03:24 +00:00
Eli Collins 5685eb30bb HDFS-3663. MiniDFSCluster should capture the code path that led to the first ExitException. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361777 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 19:48:15 +00:00
Harsh J a016d8e9a9 Backport of HADOOP-7818 from trunk. DiskChecker#checkDir should fail if the directory is not executable. Contributed by Madhukara Phatak. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361718 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 15:34:35 +00:00
Harsh J f868d9fc98 Backport of HADOOP-8362 from trunk. svn merge -c 1361712 ../../trunk. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361714 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 15:17:30 +00:00
Eli Collins dce88a6dbc HDFS-3641. Move server Util time methods to common and use now instead of System#currentTimeMillis. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360896 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 19:59:20 +00:00
Aaron Myers 91740f0917 HADOOP-8541. Better high-percentile latency metrics. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360502 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 01:34:41 +00:00
Aaron Myers 327ccbf07f HADOOP-8585. Fix initialization circularity between UserGroupInformation and HadoopConfiguration. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360499 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 01:23:37 +00:00
Eli Collins aaafa6a7b9 HADOOP-8587. HarFileSystem access of harMetaCache isn't threadsafe. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360450 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 22:31:07 +00:00
Eli Collins ef21cbf70a HDFS-3582. Hook daemon process exit for testing. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360331 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 18:04:23 +00:00
Harsh J 91472c5539 Backport of HADOOP-3886 from trunk. svn merge -c 1360222 ../../trunk (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360224 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 15:07:34 +00:00
Eli Collins 267a83df9f HADOOP-8586. Fixup a bunch of SPNEGO misspellings. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360053 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 08:14:46 +00:00
Thomas Graves 6d100d340c merge -r 1359890:1359891 from trunk. FIXES: HADOOP-8573
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359892 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 20:51:19 +00:00
Harsh J 504353c259 Backport of HADOOP-8423 from trunk. svn merge -c 1359866 ../../trunk (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359869 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 19:59:44 +00:00
Aaron Myers 1ed7052a82 HDFS-3568. fuse_dfs: add support for security. Contributed by Colin McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359826 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 18:31:25 +00:00
Robert Joseph Evans 2e4ec5ae32 svn merge -r 1359774:1359777 FIXES: HADOOP-8525. Provide Improved Traceability for Configuration (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359781 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 16:55:15 +00:00
Alejandro Abdelnur 3097c15d9d Merge -r 1359344:1359345 from trunk to branch. FIXES: MAPREDUCE-3993
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359347 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 19:19:42 +00:00
Eli Collins ac8b210736 HDFS-3603. Decouple TestHDFSTrash from TestTrash. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358806 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 18:19:43 +00:00
Alejandro Abdelnur 5fed0da5b2 Merge -r 1358453:1358454 from trunk to branch. FIXES: HADOOP-8566
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358455 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 22:29:51 +00:00
Robert Joseph Evans 2e6f49f4e4 svn merge -c 1358305 FIXES: MAPREDUCE-4379. Node Manager throws java.lang.OutOfMemoryError: Java heap space due to org.apache.hadoop.fs.LocalDirAllocator.contexts (Devaraj K via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358308 13f79535-47bb-0310-9956-ffa450edef68
2012-07-06 17:20:45 +00:00
Thomas Graves 9e4b5f52ea merge -r 1357810:1357811 from trunk. FIXES: HADOOP-8563
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357813 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 19:14:13 +00:00
Eli Collins 0929846101 HADOOP-8547. Package hadoop-pipes examples/bin directory (again). Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356948 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 21:13:02 +00:00
Todd Lipcon aec6b65fcb HDFS-3574. Fix small race and do some cleanup in GetImageServlet. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356937 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 20:55:10 +00:00
Todd Lipcon e60abcb8ab HDFS-3343. Improve metrics for DN read latency. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356930 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 20:46:42 +00:00
Daryn Sharp 3131e49840 HADOOP-8110. Fix trash checkpoint collisions (Jason Lowe via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356918 13f79535-47bb-0310-9956-ffa450edef68
2012-07-03 20:28:30 +00:00
Suresh Srinivas 84c073b341 HADOOP-8533. Merging change r1356504 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356515 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 23:03:17 +00:00
Eli Collins 2d05f1a749 HADOOP-8463. hadoop.security.auth_to_local needs a key definition and doc. Contributed by Madhukara Phatak
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356514 13f79535-47bb-0310-9956-ffa450edef68
2012-07-02 22:48:05 +00:00
Eli Collins 2b938bea99 HADOOP-8538. CMake builds fail on ARM. Contributed by Trevor Robinson
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1356042 13f79535-47bb-0310-9956-ffa450edef68
2012-07-01 22:51:13 +00:00
Harsh J d8409ef981 Backport of HADOOP-3450. svn merge -c 1355789 from trunk. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355791 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 18:53:00 +00:00
Harsh J 1ddedb6345 Backport of HADOOP-6802. svn merge -c 1355784 from trunk. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355788 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 18:44:31 +00:00
Harsh J 6f299e4e25 HADOOP-8449. hadoop fs -text fails with compressed sequence files with the codec file extension (backported from trunk) (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355637 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 05:05:41 +00:00
Todd Lipcon 535fd7de15 HDFS-3446. HostsFileReader silently ignores bad includes/excludes. Contributed by Matthew Jacobs.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355583 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 22:23:53 +00:00
Uma Maheswara Rao G 4bb629faad Merge from trunk r:1355211 HADOOP-8438. hadoop-validate-setup.sh refers to examples jar file which doesn't exist. Contributed by Devaraj K.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355219 13f79535-47bb-0310-9956-ffa450edef68
2012-06-29 02:51:44 +00:00
Alejandro Abdelnur b2324aa1fb Merge -r 1355084:1355085 from trunk to branch. FIXES: HADOOP-8168
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355086 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 17:43:33 +00:00
Robert Joseph Evans 9a0fc23c82 svn merge -c 1355019 FIXES: HADOOP-8535. Cut hadoop build times in half (Job Eagles via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355020 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 14:23:56 +00:00
Todd Lipcon 3fe00a6c77 HDFS-3572. Cleanup code which inits SPNEGO in HttpServer. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354766 13f79535-47bb-0310-9956-ffa450edef68
2012-06-27 22:41:26 +00:00
Robert Joseph Evans f16e379b47 svn merge -c 1354093. FIXES: HADOOP-8129. ViewFileSystemTestSetup setupForViewFileSystem is erring (Ahmed Radwan and Ravi Prakash via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354096 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 16:24:51 +00:00
Siddharth Seth 461ef73bf2 Merge MAPREDUCE-4031 from trunk. Prevent a Node Manager hang during shutdown. (Contributed by Devaraj K)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353040 13f79535-47bb-0310-9956-ffa450edef68
2012-06-22 21:47:12 +00:00
Harsh J 13bbb35577 svn merge -c 1352689 from trunk. Backport HADOOP-8524 to branch-2. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352693 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 21:15:46 +00:00
Alejandro Abdelnur 55b61efab6 Merge -r 1351407:1351408 from trunk to branch. FIXES: HADOOP-8512
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351409 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 16:31:26 +00:00
Thomas Graves 5f69497e35 merge -r 1351362:1351363 from trunk. FIXES: HADOOP-8495
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1351364 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 14:43:51 +00:00
Alejandro Abdelnur 497de4942a Merge -r 1350007:1350008 from trunk to branch. FIXES: HADOOP-8509
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1350012 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 20:50:16 +00:00
Eli Collins 17b4ce909c HADOOP-8433. Don't set HADOOP_LOG_DIR in hadoop-env.sh. Contributed by Brahma Reddy Battula
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349642 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 05:37:49 +00:00
Eli Collins bc5f311bb8 HDFS-3531. EditLogFileOutputStream#preallocate should check for incomplete writes. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349617 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 02:48:26 +00:00
Alejandro Abdelnur 5c15ffdc3e Merge -r 1349612:1349613 from trunk to branch. FIXES: HADOOP-8465
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349615 13f79535-47bb-0310-9956-ffa450edef68
2012-06-13 02:26:20 +00:00
Eli Collins 5b4080c094 Fix bug in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349566 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 22:13:58 +00:00
Eli Collins e1da4f4541 HADOOP-8507. Avoid OOM while deserializing DelegationTokenIdentifer. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349564 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 22:12:53 +00:00
Alejandro Abdelnur 12201fca35 Merge -r 1349554:1349555 from trunk to branch. FIXES: HDFS-3428
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349557 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 22:03:52 +00:00
Alejandro Abdelnur 16ae946de4 Merge -r 1349513:1349514 from trunk to branch. FIXES: HADOOP-8458
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349516 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 20:48:29 +00:00
Eli Collins 2acc997daa Revert HADOOP-8491
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349135 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 06:23:43 +00:00
Tsz-wo Sze 4c831ec671 svn merge -c 1349124 from trunk for HDFS-3504.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349126 13f79535-47bb-0310-9956-ffa450edef68
2012-06-12 05:33:54 +00:00
Eli Collins 9d83af831b HADOOP-8491. Check for short writes when using FileChannel#write and related methods. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349025 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 21:26:06 +00:00
Alejandro Abdelnur cca04f2bf6 HADOOP-8368. Amendment to add entry in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348961 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:47:53 +00:00
Alejandro Abdelnur f27f122609 Merge -r 1348956:1348957 from trunk to branch. FIXES: HADOOP-8368
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348959 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 18:44:57 +00:00
Todd Lipcon 7b743ac87f HADOOP-8244. Improve comments on ByteBufferReadable.read. Contributed by Henry Robinson.
(svn merge -c 1309625 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348209 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 19:54:42 +00:00
Todd Lipcon e3721d582c HADOOP-8135. Add ByteBufferReadable interface to FSDataInputStream. Contributed by Henry Robinson.
(svn merge -c 1296556 from trunk)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348208 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 19:52:59 +00:00
Eli Collins fb52b5ec9e HADOOP-8488. test-patch.sh gives +1 even if the native build fails. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347847 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 00:45:59 +00:00
Todd Lipcon 913ba74512 Move HDFS-3042 changes into main CHANGES.txt files for branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347805 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 21:30:54 +00:00
Todd Lipcon d7e171d5b8 Merge HDFS-3042 (automatic failover) to branch-2 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347804 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 21:25:34 +00:00
Tsz-wo Sze 1156fc41dc svn merge -c -1347094 for reverting HADOOP-8368 again.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347739 13f79535-47bb-0310-9956-ffa450edef68
2012-06-07 17:58:19 +00:00
Eli Collins 3f1179c966 HADOOP-8485. Don't hardcode "Apache Hadoop 0.23" in the docs. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347134 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 21:14:55 +00:00
Alejandro Abdelnur bad1c8bdd5 svn merge -c -1346495 for re-committing HADOOP-8368. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1347094 13f79535-47bb-0310-9956-ffa450edef68
2012-06-06 20:17:33 +00:00
Tsz-wo Sze b93758626e svn revert -c -1346102 for reverting HADOOP-8368.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346495 13f79535-47bb-0310-9956-ffa450edef68
2012-06-05 18:00:44 +00:00
Eli Collins 068b62b9a3 Updated CHANGES.txt files to reflect the 2.0.0-alpha release
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346151 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 20:54:17 +00:00
Eli Collins 2792df7640 HADOOP-8481. update BUILDING.txt to talk about cmake rather than autotools. Contributed by Colin Patrick McCabe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346149 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 20:50:38 +00:00
Alejandro Abdelnur 36c8624924 Merge -r 1345420:1345421 from trunk to branch. FIXES: HADOOP-8368
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346102 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 19:34:57 +00:00
Tsz-wo Sze a3bbdd6449 svn merge -c 1344419 from trunk for HDFS-744. Support hsync in HDFS.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346056 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 17:54:48 +00:00
Eli Collins 8960db7605 HADOOP-8450. Remove src/test/system. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345795 13f79535-47bb-0310-9956-ffa450edef68
2012-06-03 22:21:06 +00:00
Alejandro Abdelnur d9420f3c48 Merge -r 1345357:1345358 from trunk to branch. FIXES: HADOOP-8466
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345360 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 21:42:58 +00:00
Robert Joseph Evans 0bed0fec3c svn merge -c 1345304. FIXES: HADOOP-8460. Document proper setting of HADOOP_PID_DIR and HADOOP_SECURE_DN_PID_DIR (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1345306 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 18:19:02 +00:00
Robert Joseph Evans 71d16b28d5 svn merge -c 1344733 FIXES: HADOOP-8452. DN logs backtrace when running under jsvc and /jmx is loaded (Andy Isaacson via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344735 13f79535-47bb-0310-9956-ffa450edef68
2012-05-31 14:11:46 +00:00
Harsh J 1ff0b15e9b svn merge -c 1343732. Backport HADOOP-8444 to branch-2. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343735 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 14:16:35 +00:00
Harsh J d7585fa501 svn merge -c 1343290. Backport of HADOOP-8358 to branch-2. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343294 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 15:41:24 +00:00
Harsh J 1f804b5d20 svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:58:13 +00:00
Harsh J dda59a5ef9 svn merge -c 1342514 from trunk. Backports HADOOP-8323 (harsh).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342516 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 06:44:31 +00:00
Eli Collins 92f0d2be53 HADOOP-8422. Deprecate FileSystem#getDefault* and getServerDefault methods that don't take a Path argument. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342496 13f79535-47bb-0310-9956-ffa450edef68
2012-05-25 04:12:14 +00:00
Aaron Myers 27cfc48b3b Amend HADOOP-8408 per Daryn's post-commit feedback.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341339 13f79535-47bb-0310-9956-ffa450edef68
2012-05-22 07:50:58 +00:00
Eli Collins 8f1f57b37e HADOOP-8329. Build fails with Java 7. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340269 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 21:45:42 +00:00
Eli Collins b1d3b518c2 HADOOP-8408. MR doesn't work with a non-default ViewFS mount table and security enabled. Contributed by Aaron T. Myers
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339971 13f79535-47bb-0310-9956-ffa450edef68
2012-05-18 04:22:30 +00:00
Eli Collins 8c26cd2a3e HADOOP-8287. etc/hadoop is missing hadoop-env.sh. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339907 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 22:49:12 +00:00
Aaron Myers 1faa95d662 HDFS-3433. GetImageServlet should allow administrative requestors when security is enabled. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339543 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 10:28:15 +00:00
Todd Lipcon 274eddcb03 HADOOP-8406. CompressionCodecFactory.CODEC_PROVIDERS iteration is thread-unsafe. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339475 13f79535-47bb-0310-9956-ffa450edef68
2012-05-17 04:28:24 +00:00
Alejandro Abdelnur 00875b37f6 HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 19:46:30 +00:00
Alejandro Abdelnur 0a8ab63a6c Merge -r 1339297:1339298 from trunk to branch. FIXES: HADOOP-8400
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339300 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 18:20:20 +00:00
Todd Lipcon 73766e6d1d Move changes from 2.0.0-alpha to 2.0.1-alpha in CHANGES.txt for those that did not make rc1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339017 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 05:44:01 +00:00
Alejandro Abdelnur 10ff302093 Merge -r 1338997:1338998 from trunk to branch. FIXES: HADOOP-8393
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339001 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 04:16:01 +00:00
Eli Collins 9a8cf2b5a9 HADOOP-8398. svn merge -c 1338806 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1338807 13f79535-47bb-0310-9956-ffa450edef68
2012-05-15 17:28:15 +00:00
Tsz-wo Sze e1013c3d29 svn merge -c 1337283 from trunk for HADOOP-8366 Use ProtoBuf for RpcResponseHeader.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337430 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 01:49:52 +00:00
Tsz-wo Sze b2edecfdde svn merge -c 1329319 from trunk for HADOOP-8285 Use ProtoBuf for RpcPayLoadHeader.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337428 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 01:33:05 +00:00
Tsz-wo Sze 2aec5f3bc5 svn merge -c 1337415 from trunk for adding HADOOP-8113 to CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337416 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 23:38:46 +00:00
Eli Collins 4f5a189765 HADOOP-8224. svn merge -c 1337339 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337340 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 19:25:38 +00:00
Eli Collins 42b6b5fcca HADOOP-8316. svn merge -c 1337334 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337336 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 19:23:15 +00:00
Aaron Myers 35b27ae3f5 HADOOP-8353. hadoop-daemon.sh and yarn-daemon.sh can be misleading on stop. Contributed by Roman Shaposhnik.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337252 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 16:16:55 +00:00
Thomas White dc576b9fa1 Merge -r 1337198:1337199 from trunk to branch-2. Fixes: MAPREDUCE-4148.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337200 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 15:04:24 +00:00
Eli Collins 45bf0a3cac HADOOP-8388. svn merge -c 1336966 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336968 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 23:50:11 +00:00
Eli Collins 1135c04b40 HADOOP-8361. svn merge -c 1336945 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336947 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 23:20:17 +00:00
Aaron Myers 8ae40b7085 HDFS-3395. NN doesn't start with HA+security enabled and HTTP address set to 0.0.0.0. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336693 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 13:53:30 +00:00
Eli Collins 5ca0fc1b00 HADOOP-7868. svn merge -c 1336491 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336492 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 06:16:33 +00:00
Todd Lipcon d0f920fba8 HDFS-3341, HADOOP-8340. SNAPSHOT build versions should compare as less than their eventual release. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336460 13f79535-47bb-0310-9956-ffa450edef68
2012-05-10 00:44:52 +00:00
Suresh Srinivas 920663da2d HADOOP-8372. Merging change r1336446 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336451 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 23:25:54 +00:00
Robert Joseph Evans c581de57a6 svn merge -c 1336299. FIXES: HADOOP-8373. Port RPC.getServerAddress to 0.23 (Daryn Sharp via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1336300 13f79535-47bb-0310-9956-ffa450edef68
2012-05-09 17:07:45 +00:00
Robert Joseph Evans 09c2172681 svn merge -c 1335505 FIXES: HADOOP-8341. Fix or filter findbugs issues in hadoop-tools (bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335506 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 13:22:43 +00:00
Tsz-wo Sze 239fa432d0 svn merge -c 1335258 from trunk for HADOOP-8359.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335262 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 21:12:09 +00:00
Thomas White af074299c2 Merge -r 1335084:1335085 from trunk to branch-2. Fixes: HADOOP-8328
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335087 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 16:04:16 +00:00
Robert Joseph Evans 7602ae886f svn merge -c 1335075 FIXES: HADOOP-8327. distcpv2 and distcpv1 jars should not coexist (Dave Thompson via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335078 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 15:50:55 +00:00
Harsh J 9c4d5b4c59 svn merge -c 1334603 from trunk. Backport of HADOOP-8323. Reverts HADOOP-7940
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334606 13f79535-47bb-0310-9956-ffa450edef68
2012-05-06 11:35:49 +00:00
Aaron Myers 1409441e45 HADOOP-8349. ViewFS doesn't work when the root of a file system is mounted. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334233 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 22:16:44 +00:00
Eli Collins 2c4faa4b9c HDFS-2617. svn merge -c 1334216 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334225 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 22:07:09 +00:00
Alejandro Abdelnur d828c4ffeb Merge -r 1333749:1333750 from trunk to branch. FIXES: HADOOP-8343
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333752 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:34:28 +00:00
Alejandro Abdelnur c7a47f2b8f Merge -r 1333745:1333746 from trunk to branch. FIXES: HADOOP-8355
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333747 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:15:27 +00:00
Alejandro Abdelnur 8767e1803d Merge -r 1333743:1333744 from trunk to branch. FIXES: HADOOP-8356
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333745 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:11:37 +00:00
Todd Lipcon 512763f50f HADOOP-8350. Improve NetUtils.getInputStream to return a stream which has a tunable timeout. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333651 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 21:58:34 +00:00
Devaraj Das cd9063fa57 Merge -r 1333556:1333557 from hadoop-trunk onto branch-2. Fixes HADOOP-8346.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333559 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 17:22:13 +00:00
Eli Collins 8b1b26a3a6 HADOOP-8347. svn merge -c 1333321 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333322 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 06:42:23 +00:00
Alejandro Abdelnur 3faa2881f9 Merge -r 1333230:1333231 from trunk to branch. FIXES: HADOOP-8214
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333233 13f79535-47bb-0310-9956-ffa450edef68
2012-05-02 22:45:04 +00:00