commit 6743ef286bfdd317b600adbdb154f982cf2fac7a Author: Vinayakumar B Date: Wed Jul 22 10:25:49 2015 +0530 HADOOP-12017. Hadoop archives command should use configurable replication factor when closing (Contributed by Bibin A Chundatt) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java commit 51f11c50c4d11f80ced3459bb4983638f6117b2f Author: Jing Zhao Date: Wed Oct 15 10:27:30 2014 -0700 HDFS-7185. The active NameNode will not accept an fsimage sent from the standby during rolling upgrade. Contributed by Jing Zhao. (cherry picked from commit 439560dcf2242ab2bcfc9a267f0e4902e2aa65a5) (cherry picked from commit 47a702da205a39cd787c2b635ecced54eebedb6d) (cherry picked from commit 3259894b94b5f35757d413b6033f13c3146556f7) commit 8515239dd6da5ea749caa94c8eaa00d5dfd99dd6 Author: Chris Nauroth Date: Tue Jul 15 22:56:25 2014 +0000 HADOOP-7664. Merging change r1182645 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610875 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7da8724ade1c07c54e6dbbd6b04121ce7795ccd4) (cherry picked from commit 301eb5e7d17af70f6aab9c939156a8e923adafe8) commit 30e1ae5dac13a4c34467aefa1ec7367494d2ce45 Author: Karthik Kambatla Date: Sun Feb 8 22:48:10 2015 -0800 YARN-2990. FairScheduler's delay-scheduling always waits for node-local and rack-local delays, even for off-rack-only requests. (kasha) (cherry picked from commit 7e42088abf230dce9c63497d0937fee4f9a1e4a5) (cherry picked from commit 1cb1c8b615d6c3ccf12dc9b1c36812cc6b4bddff) (cherry picked from commit 2635c894e75ad9ada2ddef3ed300fbe364779a12) (cherry picked from commit 131c3f4f2ab7add455a13d0822c5516cc0c8f12a) (cherry picked from commit c58cd17f5cd5173f175d208faf22ce253e831c68) commit b3117af4a68ae5bf143cd01591984c96823077ea Author: Jenkins Date: Fri Jul 10 19:53:03 2015 -0700 Branch for CDH5.3.6 commit f119f628ef509bd41e77047ccd6c127d35b3d492 Author: Jenkins slave Date: Fri Jul 10 02:45:43 2015 -0700 CLOUDERA-BUILD - fixing parent POM commit 6e563d08b429054bcc83b8b48d3593dba4f63099 Author: Colin Patrick Mccabe Date: Fri Dec 19 13:08:29 2014 -0800 HDFS-7443. Datanode upgrade to BLOCKID_BASED_LAYOUT fails if duplicate block files are present in the same volume (cmccabe) (cherry picked from commit 8fa265a290792ff42635ff9b42416c634f88bdf3) (cherry picked from commit bcaf15e2fa94db929b8cd11ed7c07085161bf950) (cherry picked from commit f18ac082ff850901ca5a719f92ca7c5cd9d63849) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java commit 762b6649ff0444ed685367ac9c167d5d9867a510 Author: Andrew Wang Date: Tue Jun 30 15:04:18 2015 -0700 HADOOP-12158. Improve error message in TestCryptoStreamsWithOpensslAesCtrCryptoCodec when OpenSSL is not installed. (cherry picked from commit 9ee7b6e6c4ab6bee6304fa7904993c7cbd9a6cd2) commit 6ecfe01e402a8c2e6afba04793f5c3533cada119 Author: Andrew Wang Date: Thu Mar 12 21:40:58 2015 -0700 HADOOP-11711. Provide a default value for AES/CTR/NoPadding CryptoCodec classes. (cherry picked from commit 387f271c81f7b3bf53bddc5368d5f4486530c2e1) commit edc049e410292e22c89534bff3dff9d7f83ebafa Author: Colin Patrick Mccabe Date: Tue Jun 30 13:50:11 2015 -0700 CLOUDERA-BUILD. CDH-29026. Fix unit test failure in TestNameNodeJspHelper#testNodeListJspGenerateNodesList (cmccabe) (cherry picked from commit 301a8ea5d5f0acae6b7e2155e36f52926e0b0596) commit 243a9c9333c417b688ebba65d86a3c2e7bff968c Author: Yongjun Zhang Date: Fri Jun 19 23:39:13 2015 -0700 HDFS-8337. Accessing httpfs via webhdfs doesn't work from a jar with kerberos. Contributed by Yongjun Zhang. (cherry picked from commit 971dc838ecf8bf55a9bd64128ce2447e4613ea76) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (cherry picked from commit aaa01b6ff6e2a5ff084b589f3cec845caff27d4a) commit ed32931873e1e2cfd7b1979a12a8d40d2843dcfb Author: Yongjun Zhang Date: Fri Jun 19 14:06:17 2015 -0700 HADOOP-12103. Small refactoring of DelegationTokenAuthenticationFilter to allow code sharing. Contributed by Yongjun Zhang. (cherry picked from commit 49f5d20efe7af7cd7c45d93edad33997a695a746) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 95d5e8dd7d7fe130fc4c0b97b790c4b0193cee8d) commit c615c4f7e60022ea88fdbeffabe490ab56843e28 Author: Allen Wittenauer Date: Mon Feb 9 13:58:50 2015 -0800 HDFS-7546. Document, and set an accepting default for dfs.namenode.kerberos.principal.pattern (Harsh J via aw) (cherry picked from commit 63613c79c1042ea3d7706ed6f7eccc8cf48ff6ea) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (cherry picked from commit bfff198bb1e1d09c1f3398577c076b945a62c4f7) commit c197577e7172cd06f4eda7fb4f1226f53a19403f Author: Andrew Wang Date: Fri Jun 26 11:30:59 2015 -0700 HDFS-8656. Preserve compatibility of ClientProtocol#rollingUpgrade after finalization. (cherry picked from commit 60b858bfa65e0feb665e1a84784a3d45e9091c66) (cherry picked from commit dd7776b2fe158abbe0626743612adca4ad08f581) Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRollingUpgrade.java (cherry picked from commit 8c5f44d4a5fdad7426d557ef5a562ab25bce6c42) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java commit 52841638054b4ca2e9e7a1bac044fec7b4a57d54 Author: Kihwal Lee Date: Fri May 8 09:32:07 2015 -0500 HDFS-7894. Rolling upgrade readiness is not updated in jmx until query command is issued. Contributed by Brahma Reddy Battula. (cherry picked from commit 6f622672b62aa8d719060063ef0e47480cdc8655) (cherry picked from commit 802a5775f3522c57c60ae29ecb9533dbbfecfe76) (cherry picked from commit 145cd734fb68451197b4ab3c62d3a21a6b93b0d2) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java commit 911f11e58407326b78f2862cff50146e5c3d8c81 Author: Jing Zhao Date: Tue Apr 14 15:05:23 2015 -0700 HDFS-8127. NameNode Failover during HA upgrade can cause DataNode to finalize upgrade. Contributed by Jing Zhao. (cherry picked from commit fddd55279d0bdd08b3b40aba6fe2ded1d2e0d846) (cherry picked from commit 38b031d6bab8527698bd186887d301bd6a63cf01) commit 1816dca0d068d7bdc96209bb06f082173cf420ef Author: Tsz-Wo Nicholas Sze Date: Wed Jan 21 11:32:32 2015 -0800 HDFS-3443. Fix NPE when namenode transition to active during startup by adding checkNNStartup() in NameNodeRpcServer. Contributed by Vinayakumar B Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java (cherry picked from commit 1dc54830549a74e9b76e1f37a07930c5897585ca) (cherry picked from commit ee77453e9343197d4d4b7cc3fa48b62aa6915290) commit 064c8fae93fb0724bce7c960ab6eff7651e17f96 Author: Karthik Kambatla Date: Wed Jun 24 13:27:38 2015 -0700 CLOUDERA-BUILD. Fix rolling upgrades from CDH5.3.x to CDH5.4.x. Changes to 5.3.x. Reason: CDH5.3.x uses int for id in JVMId, while CDH5.4.x uses long. This incompatibility leads to job failures on rolling upgrade. Ref: CDH-28622 Commit details: - CDH5.3.6+ supports reading both int and long for id in JVMId. - Rolling upgrades within the 5.3.x line continue to work. - Among rolling upgrades from 5.3.x to 5.4.x, only 5.3.6 to 5.4.3+ work. Change-Id: Ie0e9bce00480868e20b144e7af3f3c358b12ae3b commit bbceebe05b97235d5dfe9848147316be21dafec7 Author: Jenkins Date: Tue Jun 23 01:55:31 2015 -0700 Updating Maven version to 5.3.6-SNAPSHOT commit 1e31c387f00acf31d9f426ad43b2d7ba50759aed Author: Jenkins Date: Mon Jun 22 23:31:40 2015 -0700 Updating Maven version to 5.3.6-SNAPSHOT commit 30da0e5553a4bd384528b9f7810be9db7cefcc06 Author: Karthik Kambatla Date: Mon Jun 22 17:45:41 2015 -0700 YARN-3842. NMProxy should retry on NMNotYetReadyException. (Robert Kanter via kasha) (cherry picked from commit 5ebf2817e58e1be8214dc1916a694a912075aa0a) (cherry picked from commit 9656ee4ee763dc48435ba8bb3ac9b10f6b306fe3) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit a2b02b35b0f81ee087e716c40bab18166781068a) commit c6a537857c2ee5a7fe313a1fe939aca58de5a4a8 Author: Harsh J Date: Sun Sep 23 10:37:52 2012 +0000 HADOOP-8151. Error handling in snappy decompressor throws invalid exceptions. Contributed by Matt Foley. (harsh) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1389006 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit ac31d6a4485d7ff9074fb5dade7a6cf5292bb347) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 9311fcc37c25ea46dcc91b178b247f78d188a06c) commit 465cab0c5ae62bc257bbef891d8cc43a1d8a3b71 Author: Arun Suresh Date: Fri Jun 19 12:04:49 2015 -0700 Revert "Fixing MR intermediate spills. Contributed by Arun Suresh." This reverts commit 9ed48eabd12f90d0f2caccd48ab046e7a8c144f3. commit 646aadec450e8d46d886a87f2feaf19275bbc72f Author: Jason Lowe Date: Fri Feb 6 21:47:32 2015 +0000 YARN-3143. RM Apps REST API can return NPE or entries missing id and other fields. Contributed by Jason Lowe (cherry picked from commit da2fb2bc46bddf42d79c6d7664cbf0311973709e) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java (cherry picked from commit 837a2f7f061b5fa3b9be8e34392fa470591b54fd) commit 9ed48eabd12f90d0f2caccd48ab046e7a8c144f3 Author: Vinod Kumar Vavilapalli Date: Thu May 14 16:07:56 2015 -0700 Fixing MR intermediate spills. Contributed by Arun Suresh. (cherry picked from commit 6b710a42e00acca405e085724c89cda016cf7442) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/EncryptedShuffle.md (cherry picked from commit a00c65d5312ca4ae73240b2e0581e840e7e53ab6) commit 29320bc1c5ce6587513c199dfc59e4f961fb118c Author: Arun Suresh Date: Fri Jun 5 08:15:50 2015 -0700 Revert "CLOUDERA-BUILD: CDH-27001. Fix security vulnerability in (en/de)crypting MR intermediate data spill files" This reverts commit c1c12a6fb64adfda47080b1fd080528aef1936f9. commit e6ac949aa25a154996daacde64a4cc4d90ddb51c Author: Colin Patrick Mccabe Date: Tue May 26 12:15:46 2015 -0700 HADOOP-11969. ThreadLocal initialization in several classes is not thread safe (Sean Busbey via Colin P. McCabe) (cherry picked from commit 7dba7005b79994106321b0f86bc8f4ea51a3c185) commit 6fbdc224a0350ca92f423952efbf92979e8896c6 Author: Andrew Wang Date: Tue May 26 11:55:02 2015 -0700 CLOUDERA-BUILD. CDH-28019. Cross site scripting vulnerability in dfsnodelist.jsp. (cherry picked from commit af7dbb6808375298487b3ad076a94a160b76d1dc) commit dc186316d366359e0e92dbc0afbd26ce3041b7df Author: Tsz-Wo Nicholas Sze Date: Sun Sep 7 07:44:28 2014 +0800 HDFS-6997: add more tests for data migration and replicaion. (cherry picked from commit 22a41dce4af4d5b533ba875b322551db1c152878) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/mover/Mover.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/mover/TestStorageMover.java commit df5dadc6e78fe84953b50b7fe1dceb0a70b69719 Author: Jenkins Date: Fri May 15 10:30:57 2015 -0700 Updating Maven version to 5.3.5-SNAPSHOT commit c1c12a6fb64adfda47080b1fd080528aef1936f9 Author: Arun Suresh Date: Thu May 14 13:24:26 2015 -0700 CLOUDERA-BUILD: CDH-27001. Fix security vulnerability in (en/de)crypting MR intermediate data spill files (cherry picked from commit a411399d0adc82fae419688c418d6590606a9631) commit 5adae383356b2f9c64dbb04fae90223ad4de06db Author: Tsz-Wo Nicholas Sze Date: Thu May 7 11:36:35 2015 -0700 HDFS-7980. Incremental BlockReport will dramatically slow down namenode startup. Contributed by Walter Su (cherry picked from commit 74bd9666d1860067940a7c8b8ff673acc01e78e1) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java commit d63d2cbfd0a1a61aa906196d02e1b9470361ac91 Author: Colin Patrick Mccabe Date: Wed May 13 14:29:05 2015 -0700 HDFS-8380. Always call addStoredBlock on blocks which have been shifted from one storage to another (cmccabe) (cherry picked from commit 281d47a96937bc329b1b4051ffcb8f5fcac98354) (cherry picked from commit 52da75180a949f671db4ea394e380b2e55df3854) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java commit 039399fe84aa89947950444e6ad7363421231d90 Author: Karthik Kambatla Date: Tue Apr 28 21:00:35 2015 -0700 YARN-3485. FairScheduler headroom calculation doesn't consider maxResources for Fifo and FairShare policies. (kasha) (cherry picked from commit 8f82970e0c247b37b2bf33aa21f6a39afa07efde) (cherry picked from commit 4cc38df7de89a361493826c057f3363f1738a7e2) Change-Id: I88bdeb28a859bb07b5260661a84a1a7f3370f1ff (cherry picked from commit 14abc62275ba148ffa94a570f6f6be56c4420dc5) (cherry picked from commit 9687477ac9b2280c9fa5fb99827930cfa1efaec1) commit 96b10411c8fa34661d4cef2174e3aead78623372 Author: Robert Kanter Date: Wed May 6 14:19:06 2015 -0700 YARN-3491. PublicLocalizer#addResource is too slow. (zxu via rkanter) (cherry picked from commit b72507810aece08e17ab4b5aae1f7eae1fe98609) commit 6be248e177d4cdcd04cc10eb669b38daf12999a1 Author: Arpit Agarwal Date: Mon Mar 30 15:25:16 2015 -0700 HDFS-7645. Rolling upgrade is restoring blocks from trash multiple times (Contributed by Vinayakumar B and Keisuke Ogiwara) (cherry picked from commit abf3ad988ddf07450fccb7ca8f4bb4dd688c118a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/extdataset/ExternalDatasetImpl.java (cherry picked from commit fff9f44d30591dc9056a6d31aecf3c363f8bb5b8) commit 7397f47b02fe128d82964691218ffcd002da411d Author: Vinayakumar B Date: Thu Mar 19 11:59:31 2015 +0530 HDFS-7869. Update action param from 'start' to 'prepare' in rolling upgrade ( Contributed by J.Andreina) (cherry picked from commit 338b477ff736cb6c8fb8204ab83fb038594dadf0) (cherry picked from commit 4527aa6f77ec817219951ddb6992d66fdf64fe91) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 1d8d948e0c2da9c7fbfdbf1e341f3ded5711949e Author: Vinayakumar B Date: Wed Mar 4 14:38:38 2015 +0530 HDFS-7869. Inconsistency in the return information while performing rolling upgrade ( Contributed by J.Andreina ) (cherry picked from commit 3560180b6e9926aa3ee1357da59b28a4b4689a0d) (cherry picked from commit c24448c27b91d0398fb42a0a9ab8b8cdd4887647) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 2f7f0c402a0b356e8c93f3c71bd1742d52593540 Author: Jing Zhao Date: Tue Nov 4 10:16:37 2014 -0800 HDFS-7340. Make rollingUpgrade start/finalize idempotent. Contributed by Jing Zhao. (cherry picked from commit b1fd0b66780d0df312da6e4f6a1e63f5ed178f0a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit a7e00bfa1990180ad8e8b67a2989ad5a3ad3a412 Author: Devaraj K Date: Thu Apr 30 12:33:22 2015 +0530 MAPREDUCE-6339. Job history file is not flushed correctly because isTimerActive flag is not set true when flushTimerTask is scheduled. Contributed by zhihai xu. (cherry picked from commit f5b38477f9d0827b238fadd260c1dd2889531fd4) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 015260829adf412a9c267e88ce21664dbd69d5fb Author: Yongjun Zhang Date: Tue Apr 21 13:43:02 2015 -0700 HDFS-7312. Update DistCp v1 to optionally not use tmp location. (Joseph Prosser via yzhangal) (cherry-picked from commit 22543d34bc5ca83c242fae075d42d705a4c0c34d) (cherry picked from commit 90255bf138271f5391193df0e15ecf4d19a581f7) commit 20dfd2ca3dfc50b30a2c7d28802a2b811631fab4 Author: Yongjun Zhang Date: Tue Apr 21 12:31:50 2015 -0700 MAPREDUCE-5710. Backport MAPREDUCE-1305 to branch-1 (Yongjun Zhang via Sandy Ryza) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1556372 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 1e521f3824596178b7f1c6a24b0a4d5bf4ba59d8) commit fe9b506f666f7fa6471666ec3d536bc23ec30a5e Author: Jian He Date: Thu Apr 16 19:33:15 2015 -0700 YARN-3021. YARN's delegation-token handling disallows certain trust setups to operate properly over DistCp. Contributed by Yongjun Zhang (cherry picked from commit bb6dde68f19be1885a9e7f7949316a03825b6f3e) (cherry picked from commit 42cf8e05543964e8ec9b00cfdbf2cff06d72d3e5) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit cae5797f8624528103b57f2e431dcb21c85aca88) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java commit b6555ab8b89c05010838e4a564e0ebbfeaeea760 Author: Robert Kanter Date: Mon Apr 20 14:14:08 2015 -0700 MAPREDUCE-6238. MR2 can't run local jobs with -libjars command options which is a regression from MR1 (zxu via rkanter) (cherry picked from commit d50e8f09287deeb51012d08e326a2ed71a6da869) Conflicts: hadoop-mapreduce-project/CHANGES.txt hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobResourceUploader.java (cherry picked from commit a19b4452cc3e398df93a080d27214cf2d70a04bb) commit 00f67a62c5050b21b3bb8fe7d1f065a1325f7d82 Author: Karthik Kambatla Date: Mon Mar 23 13:22:03 2015 -0700 YARN-3241. FairScheduler handles invalid queue names inconsistently. (Zhihai Xu via kasha) (cherry picked from commit 2bc097cd14692e6ceb06bff959f28531534eb307) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestAllocationFileLoaderService.java (cherry picked from commit 86e01393a160758d0d7b799ce3c005aab3b09859) commit 4596173db17e48904c5a31b8d8b71a90f912aa08 Author: Ray Chiang Date: Fri Apr 17 10:45:25 2015 -0700 MR1: MAPREDUCE-3859. Fix CapacityScheduler to correctly compute runtime queue limits for high-ram jobs. Contributed by Sergey Tryuber. (cherry picked from commit 6775450a8889162e4454820cfedc2dafd9c1e04e) commit c18e6ba5597ef2f59b9e410c62be776597995271 Author: Robert Kanter Date: Tue Feb 3 10:39:41 2015 -0800 YARN-3022. Expose Container resource information from NodeManager for monitoring (adhoot via ranter) (cherry picked from commit f7a77819a1e4ff394e110941c1f8dd80f47dd38f) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit e56dbedc0e9a2780e2a144d9e6565537ef5a897f) commit 67a9b4b49ae77d1b9f76d8347c7ecd66c05fec9b Author: Karthik Kambatla Date: Sat Jan 17 05:44:04 2015 +0530 YARN-2984. Metrics for container's actual memory usage. (kasha) (cherry picked from commit 84198564ba6028d51c1fcf9cdcb87f6ae6e08513) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit cb91dd67d25d6034a5d60e94565dac06d453495f) commit b95191ef145ac508eeb47256cdf85797a3ca58e7 Author: Andrew Wang Date: Thu Dec 18 14:06:53 2014 -0800 HDFS-7530. Allow renaming of encryption zone roots. Contributed by Charles Lamb. (cherry picked from commit b0b9084433d5e80131429e6e76858b099deb2dda) (cherry picked from commit 8d98d87745374090d83437705c928ab18c0b895a) (cherry picked from commit a1ef4ccb619f317bfae2cb74cdc29e99d7c58829) commit e1c4d5b48591cb09dc15d240fb47bcfc9dee5da7 Author: Karthik Kambatla Date: Thu Apr 9 00:07:49 2015 -0700 YARN-3465. Use LinkedHashMap to preserve order of resource requests. (Zhihai Xu via kasha) (cherry picked from commit 6495940eae09418a939882a8955845f9241a6485) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit b97e2ccf02490935184b18f57575e449d003c831) commit dcbd666cdba29ffd0c96c47ca6ef46136f063dca Author: Arpit Agarwal Date: Tue Aug 12 21:43:06 2014 +0000 HDFS-6830: Merging r1617598 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617599 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 004068c3911ab2738c8e5d00b49d4b69cd42c603) (cherry picked from commit 82a65209d6e9e4a2b41fdbcd8190c7ea38730627) commit 9d1dde632ddf9b971b1f1dcc5ef864822ab07f2f Author: Tsz-wo Sze Date: Thu Aug 7 07:33:01 2014 +0000 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 (cherry picked from commit 67557212c7a6ff59c22aadae1e6dca035654e432) (cherry picked from commit f32b8d21d9df68570547610affc46406e72c1310) commit 3b9ebca783d5aca7e9897e16fa8529095cfc856f Author: Jing Zhao Date: Wed Mar 18 18:51:14 2015 -0700 HDFS-7587. Edit log corruption can happen if append fails with a quota violation. Contributed by Jing Zhao. (cherry picked from commit c7c71cdba50cb7d8282622cd496cc913c80cff54) (cherry picked from commit 5a5b2446485531f12d37f3d4ca791672b9921872) (cherry picked from commit ef5246901b5da103ffdc69e1ea9909ef44460813) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/DirectoryWithQuotaFeature.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodesInPath.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDiskspaceQuotaUpdate.java commit 289da85a97b4e304ca7d9ffd4a43952c9cc41cc6 Author: Andrew Wang Date: Tue Mar 24 09:07:02 2015 -0700 HDFS-7961. Trigger full block report after hot swapping disk. Contributed by Eddy Xu. (cherry picked from commit e39c58fd9dfa03851301d105abcb2e62f757b3f5) (cherry picked from commit 6413d34986f3399023426c89c9a0d401c9557716) (cherry picked from commit 6b80fed824abe5bb19ec2952c8e0b2e9cd77b95a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java commit 4bada24109ce4e7feb3a55a66e116f90d36a845c Author: Andrew Wang Date: Mon Mar 23 22:00:34 2015 -0700 HDFS-7960. The full block report should prune zombie storages even if they're not empty. Contributed by Colin McCabe and Eddy Xu. (cherry picked from commit 2f46ee50bd4efc82ba3d30bd36f7637ea9d9714e) (cherry picked from commit 50ee8f4e67a66aa77c5359182f61f3e951844db6) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestBlockListAsLongs.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDatanodeProtocolRetryPolicy.java (cherry picked from commit a48e0ec1d56e288f84128b54a7a96e9ff5b3a388) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java commit 79a586ca39b5851e675b38d6ace0a85e3a87e7cf Author: Stephen Chu Date: Thu Mar 26 12:00:11 2015 -0700 HDFS-7575. Upgrade should generate a unique storage ID for each volume. (Contributed by Arpit Agarwal) commit c40cb22fdf698d23e4a6e96ee64afb7ed9e41106 Author: cnauroth Date: Sat Jan 10 09:18:33 2015 -0800 HDFS-7596. NameNode should prune dead storages from storageMap. Contributed by Arpit Agarwal. (cherry picked from commit ef3c3a832c2f0c1e5ccdda2ff8ef84902912955f) (cherry picked from commit 75e4e55e12b2faa521af7c23fddcba06a9ce661d) (cherry picked from commit 30643df22ecba748611f973e06c8bf0cd2ce1ae8) commit c59f4e350604285e1c59064b7358f3e0a9c44ef7 Author: cnauroth Date: Thu Jan 8 15:12:56 2015 -0800 HDFS-7579. Improve log reporting during block report rpc failure. Contributed by Charles Lamb. (cherry picked from commit 7e2d9a32426d04b5f08c2835f61882b053612a20) (cherry picked from commit f0acb7c2a284db61640efee15a1648c6c26d24f5) (cherry picked from commit e1b938a4a007bf4fbb21b11af28ec2514393c440) commit 4640e089ed0e771e062b3ae45b925c87069576e0 Author: Tsz-Wo Nicholas Sze Date: Wed Oct 15 20:44:24 2014 -0700 HDFS-7208. NN doesn't schedule replication when a DN storage fails. Contributed by Ming Ma Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java (cherry picked from commit 253e3eb31c6c180737c07eadaceab986f4898385) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 3c410afb1fefa614dcc1a294b2a082d212cbf1a0 Author: Arpit Agarwal Date: Sat Aug 23 06:36:46 2014 +0000 HDFS-6899: Merging r1619970 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619975 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 9d09b549c53a9f14f0851b06b87130dac0551dd3) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 8a44c60b3751e0750ea134e322b19f6d0a1f957a Author: Arpit Agarwal Date: Thu Aug 21 00:42:42 2014 +0000 HDFS-6878: Merging r1619271 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619272 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 3e9b4f19508f379fd997ac99eaa151f9c8167793) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 954cf4e215c2277a27744ff1017a2f6db7d1e439 Author: Chris Nauroth Date: Mon Jul 14 22:58:35 2014 +0000 HDFS-6678. Merging change r1610549 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610551 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f7cb4c6e0384a8ad38a99bcc3090238c4da0026b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 5c65fc5630418e71c75a93ec1ca82de1be0b9523 Author: Yongjun Zhang Date: Fri Apr 3 16:03:13 2015 -0700 Revert "HDFS-7575. Upgrade should generate a unique storage ID for each volume. (Contributed by Arpit Agarwal)" This reverts commit 8d30476b017b4f0dbbbe2b5e2496d2f30cd43f60. commit f495a7d9f219c4c74c228763f54cbbe46d117f18 Author: Yongjun Zhang Date: Fri Apr 3 16:03:01 2015 -0700 Revert "HDFS-7960. The full block report should prune zombie storages even if they're not empty. Contributed by Colin McCabe and Eddy Xu." This reverts commit 618f6ac118cccec9b150e126def08fcbc23f743b. commit 2ea1640c0480b587128fb42478d35a3e6ed3a686 Author: Yongjun Zhang Date: Fri Apr 3 16:02:49 2015 -0700 Revert "HDFS-7961. Trigger full block report after hot swapping disk. Contributed by Eddy Xu." This reverts commit a7d91ec8d2e3d18004fcef5d912c687549957d43. commit 009967c5f104ef6e1c3d5f313ce2aafba516f5d0 Author: Jason Lowe Date: Thu Mar 19 21:39:21 2015 +0000 MAPREDUCE-6275. Race condition in FileOutputCommitter v2 for user-specified task output subdirs. Contributed by Gera Shegalov and Siqi Li (cherry picked from commit 91baca145a6c16fe13f455d150c05bd73179531b) Conflicts: hadoop-mapreduce-project/CHANGES.txt (cherry picked from commit dade26c4d798dddc2bd8566ecde3b393da8c967a) (cherry picked from commit 454dc956bc20064c4e73fb8f844cb629ec1146a6) commit 0a48b8b0769538bb88ecd0ca4c8c9444627b8a66 Author: Gera Shegalov Date: Tue Mar 10 11:12:48 2015 -0700 MAPREDUCE-4815. Speed up FileOutputCommitter#commitJob for many output files. (Siqi Li via gera) (cherry picked from commit aa92b764a7ddb888d097121c4d610089a0053d11) Conflicts: hadoop-mapreduce-project/CHANGES.txt (cherry picked from commit 16b2de27321db7ce2395c08baccfdec5562017f0) (cherry picked from commit 1c1236182304d4075276c00c4592358f428bc433) commit 31f8133c628e3c62c145fc91376a11a6f85f1e81 Author: Zhihai Xu Date: Wed Apr 1 17:39:05 2015 -0700 MAPREDUCE-6076: Zero map split input length combine with none zero map split input length will cause MR1 job hung. commit fee04d7e48f3d459bc40c7962c2ca5541da183ee Author: Jenkins Date: Mon Mar 30 17:37:55 2015 -0700 Updating Maven version to 5.3.4-SNAPSHOT commit 51cc5adedeab7b25ea1b0fdea634e35a60408e60 Author: Arun Suresh Date: Thu Mar 26 18:57:47 2015 -0700 CLOUDERA-BUILD: CDH-26365 Allow KMS Tomcat version to be specifyable via the root cdh pom commit a7d91ec8d2e3d18004fcef5d912c687549957d43 Author: Andrew Wang Date: Tue Mar 24 09:07:02 2015 -0700 HDFS-7961. Trigger full block report after hot swapping disk. Contributed by Eddy Xu. (cherry picked from commit e39c58fd9dfa03851301d105abcb2e62f757b3f5) (cherry picked from commit 6413d34986f3399023426c89c9a0d401c9557716) (cherry picked from commit 6b80fed824abe5bb19ec2952c8e0b2e9cd77b95a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java commit 618f6ac118cccec9b150e126def08fcbc23f743b Author: Stephen Chu Date: Thu Mar 26 12:01:29 2015 -0700 HDFS-7960. The full block report should prune zombie storages even if they're not empty. Contributed by Colin McCabe and Eddy Xu. commit 8d30476b017b4f0dbbbe2b5e2496d2f30cd43f60 Author: Stephen Chu Date: Thu Mar 26 12:00:11 2015 -0700 HDFS-7575. Upgrade should generate a unique storage ID for each volume. (Contributed by Arpit Agarwal) commit ece0e170565a1cfa27fd85328bc4177d71f2cafb Author: Robert Kanter Date: Wed Mar 25 11:32:22 2015 -0700 CLOUDERA-BUILD. Revert "MAPREDUCE-5875. Make Counter limits consistent across JobClient, MRAppMaster, and YarnChild. (Gera Shegalov via kasha)" (CDH-26346) This reverts commit 7601e2a8e3a42470c214a6bbff3df7123dc8c302. (cherry picked from commit 98764ad5b281622c4132399d21bf044856f88755) commit 7aebef00b789ec10c5328caae0a70a2a1ad6f219 Author: Karthik Kambatla Date: Sat Oct 11 22:48:47 2014 -0700 MAPREDUCE-5875. Make Counter limits consistent across JobClient, MRAppMaster, and YarnChild. (Gera Shegalov via kasha) (cherry picked from commit e8a31f2e1c34514fba2f480e8db652f6e2ed65d8) Conflicts: hadoop-mapreduce-project/CHANGES.txt (cherry picked from commit 2b2b6c14c0dce31ed8b21e2720b58e0a6dd7102b) commit 2ad0a99f5137be84a0b6a1681daf05b352c7b20d Author: Karthik Kambatla Date: Wed Mar 18 16:30:33 2015 -0700 YARN-3351. AppMaster tracking URL is broken in HA. (Anubhav Dhoot via kasha) (cherry picked from commit 20b49224eb90c796f042ac4251508f3979fd4787) (cherry picked from commit 05627dd96deff49d13d433177f5bc2def03e923b) Conflicts: hadoop-yarn-project/CHANGES.txt commit 6c3ed2bfecd6748cb40c2d022acc4ca188dfcd6c Author: Aaron T. Myers Date: Tue Mar 17 19:41:36 2015 -0700 HADOOP-11722. Some Instances of Services using ZKDelegationTokenSecretManager go down when old token cannot be deleted. Contributed by Arun Suresh. (cherry picked from commit fc90bf7b27cc20486f2806670a14fd7d654b0a31) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 970e8a64c2fb4bb67a1dff7e81688190a170680d Author: yliu Date: Wed Jan 28 00:07:21 2015 +0800 HADOOP-11469. KMS should skip default.key.acl and whitelist.key.acl when loading key acl. (Dian Fu via yliu) (cherry picked from commit ee1e06a3ab9136a3cd32b44c5535dfd2443bfad6) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 062cd64b4e976ebfc55d83c2605c59d4dfa8aedb Author: yliu Date: Fri Mar 13 02:26:16 2015 +0800 HADOOP-11710. Make CryptoOutputStream behave like DFSOutputStream wrt synchronization. (Sean Busbey via yliu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 813c93cb250d6d556604fe98845b979970bd5e18) Reason: Bug Author: Sean Busbey Ref: CDH-25801 commit e25552098ed06f95c00668a31d37e9d363b28463 Author: Zhihai Xu Date: Wed Mar 11 11:40:16 2015 -0700 CLOUDERA-BUILD. fix FileSystem memory leak at KilledHistoryService commit 05ea966c908aed98a59ffe432cc40d242bf895b9 Author: yliu Date: Thu Mar 5 06:39:58 2015 +0800 HADOOP-11674. oneByteBuf in CryptoInputStream and CryptoOutputStream should be non static. (Sean Busbey via yliu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/crypto/CryptoInputStream.java (cherry picked from commit b569c3ab1cb7e328dde822f6b2405d24b9560e3a) Reason: Bug Author: Sean Busbey Ref: CDH-25802 commit 7af1a97bdea104e8c3d23340bc60842eb470a583 Author: Karthik Kambatla Date: Wed Mar 4 19:47:02 2015 -0800 YARN-3242. Asynchrony in ZK-close can lead to ZKRMStateStore watcher receiving events for old client. (Zhihai Xu via kasha) (cherry picked from commit 8d88691d162f87f95c9ed7e0a569ef08e8385d4f) Conflicts: hadoop-yarn-project/CHANGES.txt commit 6d79c702fbee741c4350b63408c689c5a7503b70 Author: Jian He Date: Wed Nov 19 19:48:33 2014 -0800 YARN-2865. Fixed RM to always create a new RMContext when transtions from StandBy to Active. Contributed by Rohith Sharmaks (cherry picked from commit 9cb8b75ba57f18639492bfa3b7e7c11c00bb3d3b) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 65db69f59309940155f5b55a94fbf37a1bae9c23) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java commit d90b0600eec30e1c667d490f7620ec44e2c456a0 Author: Zhihai Xu Date: Sun Mar 1 09:43:43 2015 -0800 CLOUDERA-BUILD. fix MAPREDUCE-5656 in MR1 code(bzip2 codec can drop records when reading data in splits) (cherry picked from commit b65204ed98f69aad11ad826f2cfcbce761e0673f) commit 3f9eeda47916af0ea1f6434785c68c1e53f2a8d2 Author: Jason Lowe Date: Tue Jan 6 21:19:10 2015 +0000 HADOOP-11445. Bzip2Codec: Data block is skipped when position of newly created stream is equal to start of split. Contributed by Ankit Kamboj (cherry picked from commit d02fb53750bc592c23ba470ae82eb6f47d9a00ec) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit d012e21063cd87b25a5b203efeb6959486631d61 Author: Andrew Wang Date: Wed Feb 25 21:15:44 2015 -0800 HADOOP-11620. Add support for load balancing across a group of KMS for HA. Contributed by Arun Suresh. (cherry picked from commit 71385f9b70e22618db3f3d2b2c6dca3b1e82c317) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit f8c629f3459fcac7a5103fcf0aabe0caec230cab Author: Alejandro Abdelnur Date: Tue Aug 13 13:55:59 2013 -0700 MR1: MAPREDUCE-4049. ShuffleProviderPlugin not initializing Reason: bug, a missing hunk from the original backport (cherry picked from commit 68db90ba305c5901e53c1ae573bcf42ab3186dfb) commit 4f9b3c7a3f282a3fba98b09c93e04268b07d7829 Author: Vinod Kumar Vavilapalli Date: Tue Oct 21 20:09:40 2014 -0700 YARN-2715. Fixed ResourceManager to respect common configurations for proxy users/groups beyond just the YARN level config. Contributed by Zhijie Shen. (cherry picked from commit c0e034336c85296be6f549d88d137fb2b2b79a15) (cherry picked from commit 77dc9afe86057d5219115f4c44ca217bb63f5a66) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java (cherry picked from commit 399edecc52da6b8eef1e88d8a563ede94c9cc87c) commit 1183d2c4ca7c11bcfcbd5bc1f082fcb1e31054f9 Author: Jason Darrell Lowe Date: Mon Jul 21 18:22:45 2014 +0000 MAPREDUCE-5957. AM throws ClassNotFoundException with job classloader enabled if custom output format/committer is used. Contributed by Sangjin Lee git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612371 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7c445366788f2f47473ea6ea43b9c332c884fa84) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 7fac4f7180b5c3e118f05dba5ab9196059113b63 Author: Kihwal Lee Date: Tue Feb 3 14:45:15 2015 -0600 HDFS-7707. Edit log corruption due to delayed block removal again. Contributed by Yongjun Zhang Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit b3d97ec612c746821af12d1fb18ed4e3e53f52eb Author: Jenkins slave Date: Wed Feb 11 13:04:00 2015 -0800 Preparing for CDH5.3.3 development commit 9812f612e227ed39295d1b99d186de52f74d80db Author: Zhijie Shen Date: Mon Nov 24 14:58:59 2014 -0800 YARN-2697. Remove useless RMAuthenticationHandler. Contributed by Haosong Huang. (cherry picked from commit e37a4ff0c1712a1cb80e0412ec53a5d10b8d30f9) (cherry picked from commit 57d62d4ded47ac5751bf886d8de6086ba36d2c02) Conflicts: hadoop-yarn-project/CHANGES.txt commit 4140b3976393bd5351d0007db6266beb8e467f15 Author: Zhijie Shen Date: Tue Oct 14 21:50:46 2014 -0700 YARN-2656. Made RM web services authentication filter support proxy user. Contributed by Varun Vasudev and Zhijie Shen. (cherry picked from commit 1220bb72d452521c6f09cebe1dd77341054ee9dd) (cherry picked from commit bec165e163e827f1a1a8f39fe5491c26faa9409e) Conflicts: hadoop-yarn-project/CHANGES.txt commit 9f3445c019a5fbde105093f98ed55687b809c30f Author: Colin Patrick Mccabe Date: Mon Feb 9 20:23:23 2015 -0800 HDFS-7718. Store KeyProvider in ClientContext to avoid leaking key provider threads when using FileContext (Arun Suresh via Colin P. McCabe) (cherry picked from commit 02340a24f211212b91dc7380c1e5b54ddb5e82eb) (cherry picked from commit 643a8892d1a5a15d2f9de273d4df09dc0c84bde0) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java commit bcc63b56b305e36ce3cdf101117c37db15e16c49 Author: Tsuyoshi Ozawa Date: Fri Jan 23 16:04:18 2015 +0900 YARN-3082. Non thread safe access to systemCredentials in NodeHeartbeatResponse processing. Contributed by Anubhav Dhoot. (cherry picked from commit 3aab354e664a3ce09e0d638bf0c1e7d273d40579) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit cc668cea2773d7273e5b2b37826a45543dccd88b) commit e51d62a1b3f3ccc3cfd26c8b1c9b1d9e76b0862e Author: Haohui Mai Date: Thu Jan 15 16:17:30 2015 -0800 HADOOP-11350. The size of header buffer of HttpServer is too small when HTTPS is enabled. Contributed by Benoy Antony. (cherry picked from commit 2e4df8710435c8362506fe944a935e74ad5919c0) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java (cherry picked from commit b1466f1d19dadd797d68af613f5d99a72dc86cd2) commit 6b8ba0c40ab833576e8e46b24e5c3dea3986fd9f Author: Kihwal Lee Date: Tue Dec 16 10:31:57 2014 -0600 HDFS-6425. Large postponedMisreplicatedBlocks has impact on blockReport latency. Contributed by Ming Ma. (cherry picked from commit b7923a356e9f111619375b94d12749d634069347) (cherry picked from commit b70c0c295cab04073d7889b6d7c893c29ba5b7ba) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml commit c4dc6b63a95cff59ca7be68f5611972473a79505 Author: Wangda Tan Date: Wed Jan 28 21:54:27 2015 -0800 YARN-3079. Scheduler should also update maximumAllocation when updateNodeResource. (Zhihai Xu via wangda) (cherry picked from commit 7882bc0f1433ae73361cab4207eb0c15abee4586) Conflicts: hadoop-yarn-project/CHANGES.txt commit 420e525035ffd9af6ed03b1268dfcd74cf12d684 Author: Jenkins slave Date: Mon Jan 26 08:52:19 2015 -0800 Preparing for CDH5.3.2 development commit cd2a660e4fea7e3b797b3d420efb6c30dd79b303 Author: bc Wong Date: Tue Jan 20 17:26:36 2015 -0800 CLOUDERA-BUILD. CDH-24428. Exclude joda-time from aws dependency (cherry picked from commit 9e506369a1aadaf539db81eb43c58b2d70b2f76a) commit 1d957f473f515c1b4d63b852236a7bf2691c383c Author: Arun Suresh Date: Fri Jan 23 09:48:26 2015 -0800 CLOUDERA-BUILD. Optimistic backport of HADOOP-11482 patch v2. Fix addDelegationTokens() method in KMSClientProvider for long lived clients (cherry picked from commit 2dfe0a554a338e12cfb950c94ef37b9540029f19) commit 33e4251d369116d19007e00d2d4d7d8fde97e992 Author: Vinod Kumar Vavilapalli Date: Fri Oct 17 15:56:07 2014 -0700 HADOOP-11207. Enhanced common DelegationTokenAuthenticationHandler to support proxy-users on Delegation-token management operations. Contributed by Zhijie Shen. (cherry picked from commit 11375578162d77b78cc3f7a82f2495b1e31a3656) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit b9cb3a9bccb9c3a5a32bee904ab6b03801628429) commit 0796f377a7d6dfc7420655807f575507d13e1dba Author: Jason Lowe Date: Thu Dec 18 23:28:18 2014 +0000 YARN-2964. RM prematurely cancels tokens for jobs that submit jobs (oozie). Contributed by Jian He (cherry picked from commit 0402bada1989258ecbfdc437cb339322a1f55a97) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java (cherry picked from commit 152b886589f4d1055dc3b967761d22dc40644bc0) commit 95ce7ee32a98bf07326e1d62a3ca87d961079ed2 Author: Zhihai Xu Date: Sun Jan 11 10:41:54 2015 -0800 CDH-24231:Enabling RM HA puts both RMs in standby commit 3e7784edaf4b18e6e40221757d5d1de434523a69 Author: Robert Kanter Date: Mon Jan 12 10:47:52 2015 -0800 YARN-3027. Scheduler should use totalAvailable resource from node instead of availableResource for maxAllocation. (adhoot via rkanter) (cherry picked from commit ae7bf31fe1c63f323ba5271e50fd0e4425a7510f) Conflicts: hadoop-yarn-project/CHANGES.txt commit 4f8ba73acc3008437894f6d2d5f7047308e4e920 Author: cnauroth Date: Mon Dec 22 13:59:10 2014 -0800 HDFS-7560. ACLs removed by removeDefaultAcl() will be back after NameNode restart/failover. Contributed by Vinayakumar B. (cherry picked from commit 2cf90a2c338497a466bbad9e83966033bf14bfb7) (cherry picked from commit 54861246684e9468df9d2b68b9103099ab48cdc6) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAclOp.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java (cherry picked from commit a3939fb86cceaca6e02a451e484c1fea3b2e2c77) commit a61cc5ea384ca19b4e950ea303e6461e070c360e Author: Karthik Kambatla Date: Tue Nov 4 17:44:59 2014 -0800 YARN-2010. Handle app-recovery failures gracefully. (Jian He and Karthik Kambatla via kasha) (cherry picked from commit b2cd2698028118b6384904732dbf94942f644732) (cherry picked from commit 3e4b280de793030539ea8f01a8bbe80795a3ae6b) (cherry picked from commit 8e90dff1c00541f6cb31c011dbdd89db5c12de9d) commit f0083378c8b667517518cee0b5f58df8ae6a08b6 Author: Karthik Kambatla Date: Sat Dec 20 12:17:50 2014 -0800 YARN-2975. FSLeafQueue app lists are accessed without required locks. (kasha) (cherry picked from commit 24ee9e3431d27811530ffa01d8d241133fd643fe) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 7071e72af514f4a23ff4b9d9db55744b44025df3) commit eb6cd4e3d7c9f80e10381a8e0ca136872f727368 Author: Colin Patrick Mccabe Date: Mon Dec 15 10:00:25 2014 -0800 HDFS-7513. HDFS inotify: add defaultBlockSize to CreateEvent (cmccabe) (cherry picked from commit 6e13fc62e1f284f22fd0089f06ce281198bc7c2a) (cherry picked from commit c9950f00a33d6088e5b8f310799ae889c7d8e88a) commit e4f3f56a62c8c72c60bd13bc83b964d40b5ed363 Author: Jian He Date: Fri Dec 26 17:59:58 2014 -0800 YARN-2992. ZKRMStateStore crashes due to session expiry. Contributed by Karthik Kambatla (cherry picked from commit 1454efe5d4fe4214ec5ef9142d55dbeca7dab953) (cherry picked from commit ca0349b87ab1b2d0d2b9dc93de7806d26713165c) (cherry picked from commit 5c9d8b370050a4dd7bd9d45098924382930d5d39) commit 762ce2448625faad469c7d22ae35473216ff6a63 Author: Haohui Mai Date: Wed Oct 1 10:53:38 2014 -0700 HDFS-7158. Reduce the memory usage of WebImageViewer. Contributed by Haohui Mai. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 41d9ace545a6d018e27bf20994402aea29715463 Author: Robert Kanter Date: Fri Dec 19 11:39:04 2014 -0800 MAPREDUCE-6198. NPE from JobTracker#resolveAndAddToTopology in MR1 cause initJob and heartbeat failure. (zxu via rkanter) (cherry picked from commit eb5191195ae142f6678b633af5625a4fce5c9c59) Conflicts: CHANGES.txt src/core/org/apache/hadoop/net/ScriptBasedMapping.java src/mapred/org/apache/hadoop/mapred/JobTracker.java (cherry picked from commit 25878e690564edb7838df18b8f3e388faac53874) commit 92080042d78dd7a14e45aa51dcd23f8e7cc331de Author: Karthik Kambatla Date: Fri Dec 19 16:00:24 2014 -0800 YARN-2675. containersKilled metrics is not updated when the container is killed during localization. (Zhihai Xu via kasha) (cherry picked from commit 954fb8581ec6d7d389ac5d6f94061760a29bc309) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/metrics/NodeManagerMetrics.java (cherry picked from commit fc74cad0d80b7d8c447e9183eee5dc38018fab05) commit d076d4c782cea90c5151450d4480e995af7f82ed Author: Robert Kanter Date: Mon Dec 15 17:54:31 2014 -0800 MAPREDUCE-6196. Fix BigDecimal ArithmeticException in PiEstimator (rchiang via rkanter) (cherry picked from commit 0860d1a26bc1ea4a4d89d2c8bc7e6797553f656a) Conflicts: CHANGES.txt (cherry picked from commit 5edde4f640fd2015001952e8d7f52ce9f56b904b) commit ce16d3886200905eb93f850d1bddb19eb678ae03 Author: Colin Patrick Mccabe Date: Mon Dec 15 16:16:02 2014 -0800 HADOOP-11410. Make the rpath of libhadoop.so configurable (cmccabe) (cherry picked from commit fb20797b6237054f3d16ff94a665cbad4cbe3293) commit dc33164faa9ecbfda4debfb4dd228bdb1598885d Author: Andrew Wang Date: Thu Dec 11 18:12:47 2014 -0800 HDFS-7497. Inconsistent report of decommissioning DataNodes between dfsadmin and NameNode webui. Contributed by Yongjun Zhang. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 10b58b2a18d0952c6f84da560f65dca2938bb2a0 Author: Colin Patrick Mccabe Date: Thu Dec 4 12:51:42 2014 -0800 HADOOP-11348. Remove unused variable from CMake error message for finding openssl (Dian Fu via Colin P. McCabe) (cherry picked from commit 565b0e60a8fc4ae5bc0083cc6a6ddb2d01952f32) (cherry picked from commit a0976152e66dd2cdfbc06f5c3e771966cb2d08ec) (cherry picked from commit 90ee754e884e7da7bdfe40cc743596baa0dabe18) commit 847697d9658df6547cfdbe4355fdf43bff40123a Author: Colin Patrick Mccabe Date: Thu Oct 30 10:37:24 2014 -0700 HADOOP-11250. fix endmacro of set_find_shared_library_without_version in CMakeLists (Yi Liu via Colin P. McCabe) (cherry picked from commit e488f0d93bf22d25aaaac7a6a88fc300f9aa6d5a) (cherry picked from commit e107ea5177776bbe14178859a53740f72a46b64b) (cherry picked from commit e831b65ca7a87a3deebdf60fb0ff122521851c2e) commit ed9bb85dfb273bb4b2abc2087bc5e680332c1356 Author: yliu Date: Thu Oct 30 10:38:52 2014 +0800 HADOOP-11216. Improve Openssl library finding. (cmccabe via yliu) (cherry picked from commit 51f621c01cde37ac81c0dabcbbe95fc51a0ff130) (cherry picked from commit cc6b3860a25aa19279fed0fabacb3a7c7721847d) commit b33f346ce6576298831cc1032db4052508160e90 Author: Karthik Kambatla Date: Tue Dec 9 14:00:31 2014 -0800 YARN-2910. FSLeafQueue can throw ConcurrentModificationException. (Wilfred Spiegelenburg via kasha) (cherry picked from commit a2e07a54561a57a83b943628ebbc53ed5ba52718) (cherry picked from commit d81d2fae0ad1ec01550bbcdf6caae881208a43d1) commit 7e9b76eba01c9790efc7828836ec9bc6f781c20d Author: Andrew Wang Date: Tue Dec 9 10:46:50 2014 -0800 HADOOP-11368. Fix SSLFactory truststore reloader thread leak in KMSClientProvider. Contributed by Arun Suresh. (cherry picked from commit 74d4bfded98239507511dedb515bc6a54958d5a8) (cherry picked from commit deaa172e7a2ab09656cc9eb431a3e68a73e0bd96) (cherry picked from commit f7b8b04e988da8790806bb42d05f263930227a8e) commit a378c93c8ece33afb9ff045efc49f2b063e1b61c Author: Colin Patrick Mccabe Date: Tue Dec 9 10:55:17 2014 -0800 HDFS-7489. Incorrect locking in FsVolumeList#checkDirs can hang datanodes (Noah Lorang via Colin P. McCabe) (cherry picked from commit d8352b9b2b99aa46679c5880a724ba3f0ceb41ff) (cherry picked from commit a037d6030b5ae9422fdb265f5e4880d515be9e37) (cherry picked from commit d93bfbace41fc93e1b2188bf48259ae8728b8295) (cherry picked from commit c03706088b5cf8bb5447212fe7cb718af9b06dc7) commit 32ee71bd7831a026d1876fca4f54c631c663523a Author: arp Date: Fri Sep 5 11:14:10 2014 -0700 HDFS-6998. warning message 'ssl.client.truststore.location has not been set' gets printed for hftp command. (Contributed by Xiaoyu Yao) (cherry picked from commit 624e793ad6bfe4f94b9d4f1877de1420e8cea779) (cherry picked from commit bc1c927d159ec7fb3d19663b53ed5a9a0c331ffa) commit c3dedec48d3e98724a167498dcc84593a17b9e03 Author: Karthik Kambatla Date: Mon Dec 8 22:18:32 2014 -0800 YARN-2931. PublicLocalizer may fail until directory is initialized by LocalizeRunner. (Anubhav Dhoot via kasha) (cherry picked from commit db73cc9124bb8511c1626ba40d3fad81e980e44f) Conflicts: hadoop-yarn-project/CHANGES.txt commit f83fb8a5ec99c034ccad56ea3dd6d75aaa245f1e Author: Andrew Wang Date: Mon Dec 8 13:44:44 2014 -0800 HADOOP-11329. Add JAVA_LIBRARY_PATH to KMS startup options. Contributed by Arun Suresh. (cherry picked from commit ddffcd8fac8af0ff78e63cca583af5c77a062891) (cherry picked from commit 686b7f292ebbb8765501ea8ba77db59a31627f50) commit adefad98126fdd451d9b3c1fd84366a4bdbd9945 Author: Zhijie Shen Date: Tue Oct 28 22:43:40 2014 -0700 YARN-2747. Fixed the test failure of TestAggregatedLogFormat when native I/O is enabled. Contributed by Xuan Gong. (cherry picked from commit ec63a3ffbd9413e7434594682fdbbd36eef7413c) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 90879d0e80838ece5cc830fcd0470c343921f115) commit f1a8c0d8fed5c1e8ea4c2068c690001e31905a5c Author: Colin Patrick Mccabe Date: Fri Oct 31 13:15:17 2014 -0700 HDFS-6917. Add an hdfs debug command to validate blocks, call recoverlease, etc. (cmccabe) (cherry picked from commit 7b026c50f1be399987d23e06b4ecfbffc51dc7b5) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit b4b91e180a6e9a0648a7e0f5107499dfe1b3f59c Author: Haohui Mai Date: Mon Sep 29 18:10:47 2014 -0700 HDFS-6779. Add missing version subcommand for hdfs. Contributed by Sasaki Toru. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs commit 9ca9dc03c14ed7e51681b6ed9ead20efac83229f Author: Andrew Wang Date: Fri Dec 5 18:20:19 2014 -0800 HADOOP-11343. Overflow is not properly handled in caclulating final iv for AES CTR. Contributed by Jerry Chen. (cherry picked from commit 0707e4eca906552c960e3b8c4e20d9913145eca6) (cherry picked from commit dabdd2d746d1e1194c124c5c7fe73fcc025e78d2) (cherry picked from commit e8f9559d62fd8fb61041693dfb92f3e663231b25) commit f9deb1c5f3c5336c67e5b8f7d6a64d7537b6a9ed Author: Andrew Wang Date: Fri Dec 5 12:01:23 2014 -0800 HADOOP-11355. When accessing data in HDFS and the key has been deleted, a Null Pointer Exception is shown. Contributed by Arun Suresh. (cherry picked from commit 9cdaec6a6f6cb1680ad6e44d7b0c8d70cdcbe3fa) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 165c8c9505413a1670caa551119517eb5a8f0e5a) commit 2db3dd8baffd577cc89b0a195c2034b429ffaf9c Author: stack Date: Mon Dec 1 23:07:05 2014 -0800 HADOOP-11301. [optionally] update jmx cache to drop old metrics (Maysam Yabandeh via stack) Ref: CDH-23378 updateJmxCache in MetricsSourceAdapter misses MBean attribute updates, makes metrics inaccessible Reviewer: Andrew Wang and stack (cherry picked from commit b36f29298247f6c5db9f6eff7c2f5177a0fe3de5) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 70835388de09cf0190b6dbf92dcb5bdd6abaadf9 Author: Robert Kanter Date: Wed Dec 3 18:23:02 2014 -0800 CLOUDERA-BUILD. Fixing TestContainerAllocation.testExcessReservationThanNodeManagerCapacity (CDH-23593) commit 0913cb3f11cf11b1cbe7ec2549d5421deea5d0f4 Author: Jason Lowe Date: Mon Dec 1 22:29:05 2014 +0000 YARN-2905. AggregatedLogsBlock page can infinitely loop if the aggregated log file is corrupted. Contributed by Varun Saxena (cherry picked from commit 0f9528b99addbb0fd9a19d84db22a8c8e934b05f) (cherry picked from commit 38ea1419f60d2b8176dba4931748f1f0e52ca84e) (cherry picked from commit 688b20dd47223c7c04c4e61705fa23910d999b96) commit dd3d2ffc4c906c04872f163932a190581420f20b Author: Karthik Kambatla Date: Wed Dec 3 13:44:41 2014 -0800 YARN-2874. Dead lock in DelegationTokenRenewer which blocks RM to execute any further apps. (Naganarasimha G R via kasha) (cherry picked from commit 799353e2c7db5af6e40e3521439b5c8a3c5c6a51) (cherry picked from commit 25be97808b99148412c0efd4d87fc750db4d6607) (cherry picked from commit a20bab846266993f4ae11340d3dd76557effa53b) commit cc3316ade3f230c61298a209de0096d60a69f74a Author: Andrew Wang Date: Wed Dec 3 12:00:14 2014 -0800 HADOOP-11342. KMS key ACL should ignore ALL operation for default key ACL and whitelist key ACL. Contributed by Dian Fu. (cherry picked from commit 1812241ee10c0a98844bffb9341f770d54655f52) (cherry picked from commit 31601e58ae8bd176e5008cf701cb9084e06fef2b) commit 1e1f70f306cc1cb22679ec01e48e2b12f6512687 Author: Steve Loughran Date: Tue Dec 2 15:04:26 2014 +0000 HDFS-7448 TestBookKeeperHACheckpoints fails in trunk build (cherry picked from commit 75d53456ea79b38b0e99303f7b298036b027f337) (cherry picked from commit bd63bf6c2597695e68bd824ec30725619e9fca18) commit 70bf3d812c97d7357606c7344c96205e17d2fc09 Author: Eric Yang Date: Fri Jun 13 21:36:15 2014 +0000 MR1: MAPREDUCE-4490. Fixed LinuxTaskController to re-initialize user log directory when JVM reuse option is enabled. (Sam Liu via eyang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1602528 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from 484c4fd41398b3a9110fb1e2f0744799ab19933d) (cherry picked from commit c963206070b212e7270b8551e3851ee341afda94) commit beafde254564be70de7be93c931ce9e0983b6ebb Author: Andrew Wang Date: Tue Dec 2 19:04:20 2014 -0800 HADOOP-11344. KMS kms-config.sh sets a default value for the keystore password even in non-ssl setup. Contributed by Arun Suresh. (cherry picked from commit 3d48ad7eb424206dd1528179b35de4cdf51afdf3) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 4c2b4be85a3ba32425c8b882d05bfce30e34467b) commit f027f421f81db4a6f00929ff8afe15164aa9e035 Author: Colin Patrick Mccabe Date: Tue Nov 25 17:44:34 2014 -0800 HDFS-7446. HDFS inotify should have the ability to determine what txid it has read up to (cmccabe) (cherry picked from commit 75a326aaff8c92349701d9b3473c3070b8c2be44) (cherry picked from commit 06552a15d5172a2b0ad3d61aa7f9a849857385aa) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSInotifyEventInputStream.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/AuthorizationProviderProxyClientProtocol.java (cherry picked from commit c4de8f243914251f04c584754b862f0c059d43e8) commit 2e0dd599066d345b1e0fa77cfc25a79d5dca3e97 Author: Andrew Wang Date: Mon Dec 1 21:53:18 2014 -0800 HADOOP-11341. KMS support for whitelist key ACLs. Contributed by Arun Suresh. (cherry picked from commit 31b4d2daa14a7f6e8ee73fd3160e126d8db62ffb) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 578564c36757267ab09e3fcc1618b617f391a4dd) commit a8edd7eda4bd983d45e955b76cca9fc2b7e9abbd Author: Jason Lowe Date: Thu Sep 11 19:53:25 2014 +0000 HADOOP-11085. Excessive logging by org.apache.hadoop.util.Progress when value is NaN. Contributed by Mit Desai (cherry picked from commit 581176cdc868b8701a761b5a0d52f771cbba709a) (cherry picked from commit b4ab7aa110d04934cc63ae98a4db8b295804ba81) (cherry picked from commit c177950169035dd1d0162e93cbd4bf2955bcba7d) commit f1eafd84e7208ad690608ac36027a40cbc904c53 Author: Andrew Wang Date: Mon Dec 1 21:21:23 2014 -0800 HADOOP-11337. KeyAuthorizationKeyProvider access checks need to be done atomically. Contributed by Dian Fu. (cherry picked from commit 9fa29902575ac3774bf3728e7bcde7f3eefb1d4c) (cherry picked from commit 084667aad99df7f869a24f3f00d1d1e1b5c02acf) (cherry picked from commit cc8369fdd02994c57a74f4aaf6485ad548ff284a) commit ca103656f24de22f5592aef99aca4d432725839d Author: Jenkins slave Date: Mon Dec 1 17:57:28 2014 -0800 Preparing for CDH5.3.1 development commit 4975660fb6e25d2ae9a0e368463a706f2e127d9b Author: yliu Date: Tue Nov 25 01:12:31 2014 +0800 HADOOP-11322. key based ACL check in KMS always check KeyOpType.MANAGEMENT even actual KeyOpType is not MANAGEMENT. (Dian Fu via yliu) (cherry picked from commit 4b62d6d2fd1c7740b7b768e3294ecd9572f94e98) (cherry picked from commit 81a067b0f83166b7b1a6235139229073d4eb1f25) commit b86bf7bb86a3bfb74fac2f0baf7b6d671b4e00c8 Author: Colin Patrick Mccabe Date: Mon Dec 1 11:42:10 2014 -0800 HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification pipe is full (zhaoyunjiong via cmccabe) (cherry picked from commit 86e3993def01223f92b8d1dd35f6c1f8ab6033f5) (cherry picked from commit f6d1bf5ed1cf647d82e676df15587de42b1faa42) commit 5a8f971664c2d6f360e638f08b79a2e953562830 Author: Colin Patrick Mccabe Date: Mon Oct 6 14:44:13 2014 -0700 HADOOP-10404. Commit correct version of patch (cmccabe) (cherry picked from commit 687d83c9e10a4432c8d54c2cd406c7ccb4392187) (cherry picked from commit b5158c8d24810899972fa625f3e42cbea3263155) commit 8bb7057718c735ee55fc963ab75cb8a33a53d1d8 Author: Colin Patrick Mccabe Date: Mon Oct 6 14:40:41 2014 -0700 HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected by the lock (cmccabe) (cherry picked from commit 8099de259fb91a29674bf17cb1382c038b707a90) (cherry picked from commit c97134d05442cebd619dfdb5cd8b81ccf1b2a0c4) commit 85003f71f3993148526f3376ebd20f5c60633e9d Author: Arun Suresh Date: Wed Nov 26 10:37:48 2014 -0800 CLOUDERA-BUILD. CDH-23265 Ensure ssl-server.xml is also copied to server.xml for tomcat backward compatibility commit e458180ce433c21720018385de4d75019063f47a Author: Andrew Wang Date: Tue Nov 25 15:12:04 2014 -0800 HADOOP-11300. KMS startup scripts must not display the keystore / truststore passwords. Contributed by Arun Suresh. (cherry picked from commit 56f3eecc129486d3297d082d9b97f26b40d0a2c6) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit a917d1c567bfece87bd8551f390eee56747878d5) commit ca9cb4d398fca15b3e81993454e73f8f22680140 Author: Brandon Li Date: Mon Nov 17 13:16:43 2014 -0800 HDFS-7146. NFS ID/Group lookup requires SSSD enumeration on the server. Contributed by Yongjun Zhang (cherry picked from commit 351c5561c2fd380ab7746ca4e91d7b838e61e03f) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit b51a83a849cc0be3330ef5485ecdc04d7bf89c06 Author: Brandon Li Date: Tue Nov 11 13:03:31 2014 -0800 HDFS-7387. NFS may only do partial commit due to a race between COMMIT and write. Contributed by Brandon Li (cherry picked from commit 99d9d0c2d19b9f161b765947f3fb64619ea58090) Conflicts: hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 6c07781f0de439cb0adfc8cd085f500e9d086e79 Author: Jing Zhao Date: Tue Nov 4 15:04:26 2014 -0800 HDFS-7356. Use DirectoryListing.hasMore() directly in nfs. Contributed by Li Lu. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 9b54be32aba8df37f3255f5e31a99968c657711e Author: Haohui Mai Date: Wed Oct 29 17:54:26 2014 -0700 HADOOP-11247. Fix a couple javac warnings in NFS. Contributed by Brandon Li. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 743a945dace84844decb11fc5aa8fac4f24263ff Author: Brandon Li Date: Wed Oct 29 11:05:29 2014 -0700 HADOOP-11195. Move Id-Name mapping in NFS to the hadoop-common area for better maintenance. Contributed by Yongjun Zhang (cherry picked from commit 72a556d3b0def0ab4e4509528cc513f6df06b084) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 49f9828d68474c2edac4fba9615ca6e3e79cb8d7 Author: Brandon Li Date: Wed Oct 22 21:27:01 2014 -0700 HDFS-7180. NFSv3 gateway frequently gets stuck due to GC. Contributed by Brandon Li (cherry picked from commit d71d40a63d198991077d5babd70be5e9787a53f1) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 4c7a195f8ec675a01ac792b0552210b9a235b29c Author: Brandon Li Date: Tue Oct 21 10:20:29 2014 -0700 HDFS-7259. Unresponseive NFS mount point due to deferred COMMIT response. Contributed by Brandon Li Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit e8e57c06ae8facfda285ead2607ad3a998e853fd Author: Haohui Mai Date: Wed Oct 1 13:18:56 2014 -0700 HDFS-6894. Add XDR parser method for each NFS response. Contributed by Brandon Li. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit c9d9917e6d88646a467f4df130e27337803cc21c Author: Brandon Li Date: Mon Sep 29 15:05:43 2014 -0700 HADOOP-11130. NFS updateMaps OS check is reversed. Contributed by Brandon Li (cherry picked from commit c88c6c57aa79e8a1f33d2e075491656f472c858b) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 74401f9e38b5183fe4212986f8d9b0f82ec07f75 Author: Brandon Li Date: Tue Sep 2 11:27:28 2014 -0700 HADOOP-10990. Add missed NFSv3 request and response classes. Contributed by Brandon Li (cherry picked from commit bad5f38d47f5e93c21641931ac92595c71b05bd7) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 10851271b3f7712b105a99095bb5a2e5af4381d8 Author: Aaron Myers Date: Fri Aug 15 02:35:25 2014 +0000 HDFS-6850. Move NFS out of order write unit tests into TestWrites class. Contributed by Zhe Zhang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618092 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit ec7d400103dbdd5db09f986e1bfe9f9e776e290c Author: Kihwal Lee Date: Fri Sep 19 08:52:16 2014 -0500 HDFS-6948. DN rejects blocks if it has older UC block. Contributed by Eric Payne. (cherry picked from commit f02d934fedf00f0ce43d6f3f9b06d89ccc6851a5) (cherry picked from commit 2a6c9f0725891f62291c472aeba6b1c3eea21a50) commit 1158605a0fa5b9cf5b550d0c065c8447dc8ab0cd Author: Andrew Wang Date: Tue Nov 25 16:13:32 2014 -0800 HADOOP-11173. Improve error messages for some KeyShell commands. (cherry picked from commit fae266bbf19e44a2595fa62366d9b65e7c996df8) (cherry picked from commit 8018d1af58330b6d21c858fa5ebfee6a66cd10b3) (cherry picked from commit f51c548a83d18a1a68782050466cda3731834c0b) commit a04de1411e4e7b78bc2a7c7c7c598d1330f7d5fe Author: Andrew Wang Date: Tue Nov 25 15:37:11 2014 -0800 HDFS-7097. Allow block reports to be processed during checkpointing on standby name node. (kihwal via wang) (cherry picked from commit f43a20c529ac3f104add95b222de6580757b3763) (cherry picked from commit 915176c4e769f510f835f1ad182bc62586a01e0b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (cherry picked from commit 70e88701e5fbc859479b8a61249df6b8d27f806b) commit 662b797f0d7eacb6155cd1688ad21ecf988f7082 Author: cnauroth Date: Thu Nov 13 12:31:44 2014 -0800 HDFS-7385. ThreadLocal used in FSEditLog class causes FSImage permission mess up. Contributed by jiangyu. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit ab3a41f49e585e2348618f1c32269882bb257ed5 Author: Colin Patrick Mccabe Date: Mon Nov 24 10:46:33 2014 -0800 HDFS-4882. Prevent the Namenode's LeaseManager from looping forever in checkLeases (Ravi Prakash via Colin P. McCabe) (cherry picked from commit daacbc18d739d030822df0b75205eeb067f89850) (cherry picked from commit 946df98dce18975e37a6a14744ca7a5429f019ce) commit d3010b19a3a7ea6a7ee0ade3bec893050344abb3 Author: Karthik Kambatla Date: Mon Nov 24 17:32:38 2014 -0800 Revert "MR1: CDH-22440. JT HA should survive HDFS restarts" This reverts commit f283b2490fb801da81b3871b80181d3c820bea96. commit 0cba4b1178440158c5e685d357017c82009ab816 Author: Haohui Mai Date: Wed Nov 5 20:29:17 2014 -0800 HDFS-7367. HDFS short-circuit read cannot negotiate shared memory slot and file descriptors when SASL is enabled on DataTransferProtocol. Contributed by Chris Nauroth. (cherry picked from commit 8e33d4bdb35eed8b60cf197247fad465b1912ef7) commit 20524c4281e45f59a3cba10a45744c325a2fb7e6 Author: Colin Patrick Mccabe Date: Mon Nov 24 10:51:18 2014 -0800 HDFS-7419. Improve error messages for DataNode hot swap drive feature (Lei Xu via Colin P. Mccabe) (cherry picked from commit f636f9d9439742d7ebaaf21f7e22652403572c61) (cherry picked from commit 4435ac9af5667869e3c5a080d07431a569a44085) commit 26d334302e8048483ff804f65791baa9a79cf058 Author: Karthik Kambatla Date: Mon Nov 24 11:50:51 2014 -0800 Revert "MAPREDUCE-5785. Derive heap size or mapreduce.*.memory.mb automatically. (Gera Shegalov and Karthik Kambatla via kasha)" This reverts commit e97ab615c694b54d42ccccd0d76c99bf535bf329. commit b79ccd113d8926648f27eb7754c0d56c31e45921 Author: Karthik Kambatla Date: Fri Nov 21 10:32:28 2014 -0800 YARN-2604. Scheduler should consider max-allocation-* in conjunction with the largest node. (Robert Kanter via kasha) (cherry picked from commit 3114d4731dcca7cb6c16aaa7c7a6550b7dd7dccb) (cherry picked from commit e9db0aa35c95bc67b5c5b8692e681865577e572d) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java commit 62e3dcfb5061880c2916e25a7e9cf40b925f1510 Author: Sandy Ryza Date: Fri Nov 21 16:04:32 2014 -0800 YARN-2669. FairScheduler: queue names shouldn't allow periods (Wei Yan via Sandy Ryza) (cherry picked from commit a128cca305cecb215a2eef2ef543d1bf9b23a41b) commit 614c8d22e9fada962c168a156f69d6185215f414 Author: Zhijie Shen Date: Tue Oct 21 21:49:17 2014 -0700 YARN-2721. Suppress NodeExist exception thrown by ZKRMStateStore when it retries creating znode. Contributed by Jian He. (cherry picked from commit 7e3b5e6f5cb4945b4fab27e8a83d04280df50e17) (cherry picked from commit 4b9de2cdfe4f9b4861fb67e0c0c72a4029fc7476) commit 0666016801ae31eb22134b49d71f5427fe4e0880 Author: Jason Lowe Date: Mon Nov 17 21:13:22 2014 +0000 YARN-2414. RM web UI: app page will crash if app is failed before any attempt has been created. Contributed by Wangda Tan (cherry picked from commit 81c9d17af84ed87b9ded7057cb726a3855ddd32d) (cherry picked from commit 242fd0e39ad1c5d51719cd0f6c197166066e3288) commit 16bc96456dcf77c76f463cf6e8cbcda0b9f62da4 Author: Vinod Kumar Vavilapalli Date: Sat Nov 15 12:05:25 2014 -0800 YARN-1703. Fixed ResourceManager web-proxy to close connections correctly. Contributed by Rohith Sharma. (cherry picked from commit 198fb58776ec02397af5ad83259535b0291b745c) (cherry picked from commit 41275755c7f4f6b39f2db6ab180d598572bf7179) commit ef0d2a151646fb5e487b9bf000f49c9e60362800 Author: Jian He Date: Fri Nov 14 17:24:09 2014 -0800 YARN-2432. RMStateStore should process the pending events before close. Contributed by Varun Saxena (cherry picked from commit 9b860661a5754e829bd8c34ef092757421589bbe) (cherry picked from commit 21054c5d149ae56ee998e42a11cafd80b7aaa279) commit 3cf16669c9c12837ec8a147ac1603647779010f6 Author: Sandy Ryza Date: Fri Nov 14 15:18:56 2014 -0800 YARN-2811. In Fair Scheduler, reservation fulfillments shouldn't ignore max share (Siqi Li via Sandy Ryza) (cherry picked from commit c4c77669f0c275eb326dbde5ecf433402f3cf100) commit ac1d1148bc006193c427970f5ac5256c54d79c39 Author: Jian He Date: Thu Nov 13 15:33:20 2014 -0800 YARN-2856. Fixed RMAppImpl to handle ATTEMPT_KILLED event at ACCEPTED state on app recovery. Contributed by Rohith Sharmaks (cherry picked from commit d005404ef7211fe96ce1801ed267a249568540fd) (cherry picked from commit beb184ac580b0d89351a3f3a7201da34a26db1c1) commit 5c0d40213b12864f5d80adc163457ba0bc5e4ae7 Author: Jason Lowe Date: Thu Nov 13 16:11:04 2014 +0000 YARN-2846. Incorrect persist exit code for running containers in reacquireContainer() that interrupted by NodeManager restart. Contributed by Junping Du (cherry picked from commit 33ea5ae92b9dd3abace104903d9a94d17dd75af5) (cherry picked from commit 6fd547da8feb71058f701eb94296cf6cace357b2) commit ae02402b316b879ab98927ee91c7c022697aac17 Author: Vinod Kumar Vavilapalli Date: Thu Nov 13 08:12:41 2014 -0800 YARN-2853. Fixed a bug in ResourceManager causing apps to hang when the user kill request races with ApplicationMaster finish. Contributed by Jian He. (cherry picked from commit 3651fe1b089851b38be351c00a9899817166bf3e) (cherry picked from commit ed3e5cb164e8209504b1a40508c4aeaa17f71133) commit fbfe408b9476fe54cbffe51b8cf89453896ccad9 Author: Xuan Date: Mon Nov 10 18:25:01 2014 -0800 YARN-2841. RMProxy should retry EOFException. Contributed by Jian He (cherry picked from commit 5c9a51f140ba76ddb25580aeb288db25e3f9653f) (cherry picked from commit b3badf935a150f2dc5ae28b63d3b42f9e38ed605) commit 898218cd74c218c22f8ada48cf8f8230bafcbf0a Author: Jason Lowe Date: Fri Nov 7 23:40:22 2014 +0000 YARN-2632. Document NM Restart feature. Contributed by Junping Du and Vinod Kumar Vavilapalli (cherry picked from commit 1e215e8ba2e801eb26f16c307daee756d6b2ca66) (cherry picked from commit 9447235527b262605e932065a6f6ac891ec9a338) commit a5488fffb0411cee50efdee34d40e4c769323b71 Author: Jason Lowe Date: Fri Nov 7 23:16:37 2014 +0000 YARN-2825. Container leak on NM. Contributed by Jian He (cherry picked from commit c3d475070a1ec54c4b05923f4782cef204effd2c) (cherry picked from commit a5764cb7831d20848de444e870a6ed0fd52b3515) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeStatusUpdaterImpl.java commit 72e0a8fa1857cc79ae35d2828b773c571cd052ff Author: Vinod Kumar Vavilapalli Date: Fri Nov 7 09:28:36 2014 -0800 YARN-2823. Fixed ResourceManager app-attempt state machine to inform schedulers about previous finished attempts of a running appliation to avoid expectation mismatch w.r.t transferred containers. Contributed by Jian He. (cherry picked from commit a5657182a7accebe08cd86e46b4cdeb163d4d1f2) (cherry picked from commit eb01c602ed9259f54e50e10821fffe2ce384405e) commit 31fe3c604458d995329d93584cc61e0e3a506088 Author: Jian He Date: Wed Nov 5 16:59:54 2014 -0800 YARN-2579. Fixed a deadlock issue when EmbeddedElectorService and FatalEventDispatcher try to transition RM to StandBy at the same time. Contributed by Rohith Sharmaks (cherry picked from commit 395275af8622c780b9071c243422b0780e096202) (cherry picked from commit f92ff24f5e904058239615db57bf39e90e269875) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java commit 745b3544464e69715f9f5f7a5fc5972a3dc3657b Author: Vinod Kumar Vavilapalli Date: Mon Nov 3 16:38:55 2014 -0800 YARN-1922. Fixed NodeManager to kill process-trees correctly in the presence of races between the launch and the stop-container call and when root processes crash. Contributed by Billie Rinaldi. (cherry picked from commit c5a46d4c8ca236ff641a309f256bbbdf4dd56db5) (cherry picked from commit 9c76dcadafb941d641b72586885ad98f8408c4e0) commit 95d2a43224264a527f43e83deba94644af4498ef Author: Jason Lowe Date: Fri Oct 31 22:53:04 2014 +0000 YARN-2707. Potential null dereference in FSDownload. Contributed by Gera Shegalov (cherry picked from commit 7bc179f9f5e1e270fd5e6f1ad29b0f32fe371d15) (cherry picked from commit ada40aa9339acf09864edb1b2669da8f3d033b5f) commit aabb7b516e0467fde68ac6055fcb30f4df0d4344 Author: Jason Lowe Date: Thu Oct 30 15:10:27 2014 +0000 YARN-2755. NM fails to clean up usercache_DEL_ dirs after YARN-661. Contributed by Siqi Li (cherry picked from commit 73e626ad91cd5c06a005068d8432fd16e06fe6a0) (cherry picked from commit 3e8544c5f2d6c6bece2fb89830a75f03560d7dc2) commit 2b213ccce2488f664a488509e0aaa2924ecafb09 Author: Karthik Kambatla Date: Wed Oct 29 10:24:57 2014 -0700 YARN-2742. FairSchedulerConfiguration should allow extra spaces between value and unit. (Wei Yan via kasha) (cherry picked from commit 782971ae7a0247bcf5920e10b434b7e0954dd868) (cherry picked from commit e88832dfb3db170b890dbab47dede97ad52a980d) commit e97ab615c694b54d42ccccd0d76c99bf535bf329 Author: Karthik Kambatla Date: Fri Nov 21 15:03:41 2014 -0800 MAPREDUCE-5785. Derive heap size or mapreduce.*.memory.mb automatically. (Gera Shegalov and Karthik Kambatla via kasha) (cherry picked from commit a4df9eed059977374c8e889cb85d79e8e514ad30) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java (cherry picked from commit 7ff9ba3ab20c39cc2a04c2214017053c8f1ff29c) commit e54f3a1dbc13a27d0a8e15c930c067fc8ee59d3b Author: Zhihai Xu Date: Fri Nov 21 16:26:07 2014 -0800 YARN-2679: Add metric for container launch duration (cherry picked from commit e3f51070dc99cb537d34bb93ac70ad7e90095715) commit 71d4b8b650f99ab91bc641f9bde2ae8c18ebd9db Author: Karthik Kambatla Date: Thu Nov 20 15:36:57 2014 -0800 MAPREDUCE-6169. MergeQueue should release reference to the current item from key and value at the end of the iteration to save memory. (Zhihai Xu via kasha) (cherry picked from commit 90194ca1cbd695d48c3705121c2ac9a8554578a2) Conflicts: hadoop-mapreduce-project/CHANGES.txt hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMerger.java (cherry picked from commit 1d4e68cd792bc531ad25dcf080fab15dd882dbb4) commit defe3f7aa1465e1a85bd897abaecfa0d2047e63f Author: Karthik Kambatla Date: Tue Oct 28 08:49:14 2014 -0700 YARN-2760. Remove 'experimental' from FairScheduler docs. (Harsh J via kasha) (cherry picked from commit ade3727ecb092935dcc0f1291c1e6cf43d764a03) Conflicts: hadoop-yarn-project/CHANGES.txt commit bf1b9f0c1505c8962002be429895db633b8ade60 Author: Jian He Date: Fri Oct 24 23:05:16 2014 -0700 YARN-2314. Disable ContainerManagementProtocolProxy cache by default to prevent creating thousands of threads in a large cluster. Contributed by Jason Lowe (cherry picked from commit f44cf99599119b5e989be724eeab447b2dc4fe53) Conflicts: hadoop-yarn-project/CHANGES.txt commit c79599c20944b023c2f598461e433b5c3c3823a3 Author: Zhijie Shen Date: Fri Oct 24 11:13:44 2014 -0700 YARN-2724. Skipped uploading a local log file to HDFS if exception is raised when opening it. Contributed by Xuan Gong. (cherry picked from commit e31f0a6558b106662c83e1f797216e412b6689a9) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java commit cd6760d3d2db221fab3271e040507aa7f6740f39 Author: Zhijie Shen Date: Thu Oct 23 21:56:03 2014 -0700 YARN-2209. Replaced AM resync/shutdown command with corresponding exceptions and made related MR changes. Contributed by Jian He. (cherry picked from commit 0f3b6900be1a3b2e4624f31f84656f4a32dadce9) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ProtoUtils.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java commit 7111ac68dc2c1ec6c7a697c8b9813f69ba5c02fa Author: Zhijie Shen Date: Mon Oct 20 22:21:37 2014 -0700 YARN-2717. Avoided duplicate logging when container logs are not found. Contributed by Xuan Gong. (cherry picked from commit 171f2376d23d51b61b9c9b3804ee86dbd4de033a) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/LogCLIHelpers.java commit c56a939cbcb377b70311a1b5418c50d59e35a005 Author: Xuan Date: Fri Oct 31 14:36:25 2014 -0700 YARN-2701. Addendum patch. Potential race condition in startLocalizer when using LinuxContainerExecutor. Contributed by Xuan Gong (cherry picked from commit 86ff28dea09037795f9a76d1712d741d04e33bfe) commit 242b05ace8510d46af7c1df355171e2685bca6ad Author: Jian He Date: Mon Oct 20 19:57:45 2014 -0700 Missing file for YARN-2701 (cherry picked from commit 4fa1fb3193bf39fcb1bd7f8f8391a78f69c3c302) commit 6ba49d873eb724a7b2b521f16b3bfe3f9ebe6582 Author: Jian He Date: Mon Oct 20 18:42:30 2014 -0700 YARN-2701. Potential race condition in startLocalizer when using LinuxContainerExecutor. Contributed by Xuan Gong (cherry picked from commit 2839365f230165222f63129979ea82ada79ec56e) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java commit 94ff89585052877016891beda9609c72b12649bc Author: Allen Wittenauer Date: Wed Sep 24 08:47:55 2014 -0700 YARN-2161. Fix build on macosx: YARN parts (Binglin Chang via aw) (cherry picked from commit 034df0e2eb2824fb46a1e75b52d43d9914a04e56) Conflicts: hadoop-yarn-project/CHANGES.txt commit 99d575e4ff67799e02896547fc7264f42ba45487 Author: Jian He Date: Fri Oct 17 16:35:13 2014 -0700 YARN-1879. Marked Idempotent/AtMostOnce annotations to ApplicationMasterProtocol for RM fail over. Contributed by Tsuyoshi OZAWA (cherry picked from commit c3de2412eb7633ff16c67e71e73bbe27a982d984) (cherry picked from commit 78a57087bf12b67134c71aa4357e31930e01cb76) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java commit 6fdf92e2e86b05417df993b8c73dbca596d66b5e Author: Jian He Date: Fri Oct 3 11:04:02 2014 -0700 YARN-2562. Changed ContainerId#toString() to be more readable. Contributed by Tsuyoshi OZAWA (cherry picked from commit eb6ce5e97c6a379caf9de0b34cc7770c4447bb1a) (cherry picked from commit 1c58ab92063d7e44be4fc2dca64d5e1285b323de) Conflicts: hadoop-yarn-project/CHANGES.txt commit f2660faffa5c075b2c32341331e16a867602cd30 Author: Zhijie Shen Date: Thu Oct 2 14:55:37 2014 -0700 YARN-2527. Fixed the potential NPE in ApplicationACLsManager and added test cases for it. Contributed by Benoy Antony. (cherry picked from commit 1c93025a1b370db46e345161dbc15e03f829823f) (cherry picked from commit ecaae67ab32f842627c0bee06bba7b4773972a67) Conflicts: hadoop-yarn-project/CHANGES.txt commit e15186e4a00c2f761eb0dec70fff13af4b06cb29 Author: junping_du Date: Wed Oct 1 16:47:47 2014 -0700 YARN-2613. Support retry in NMClient for rolling-upgrades. (Contributed by Jian He) (cherry picked from commit 625456746c899887874d97e81db1393f148cd714) Conflicts: hadoop-yarn-project/CHANGES.txt commit 3b73bf9ddc7d9732be69ef9d01edf2ed77484ee4 Author: Allen Wittenauer Date: Fri Sep 26 12:47:26 2014 -0700 YARN-2372. There are Chinese Characters in the FairScheduler's document (Fengdong Yu via aw) (cherry picked from commit 6f5d555ad0caa3ea2f446aecb72b3e85b0ad81df) Conflicts: hadoop-yarn-project/CHANGES.txt commit c9189945e0a9400aa4827f2fc1b201397f069365 Author: Jason Lowe Date: Thu Sep 25 22:39:57 2014 +0000 YARN-2523. ResourceManager UI showing negative value for "Decommissioned Nodes" field. Contributed by Rohith (cherry picked from commit 8269bfa613999f71767de3c0369817b58cfe1416) (cherry picked from commit e4d46e5ff609858e7c76b0eda7fab3882092396d) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java commit 094680113be7dd54b39e9c23871c3765f39ab31d Author: Allen Wittenauer Date: Thu Aug 21 14:57:53 2014 +0000 YARN-2424. LCE should support non-cgroups, non-secure mode (Chris Douglas via aw) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619424 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 5d965f2f3cf97a87603720948aacd4f7877d73c4) Conflicts: hadoop-yarn-project/CHANGES.txt commit 619334e9eaec992aef250870c9d51bfca7a9020f Author: Karthik Kambatla Date: Wed Aug 20 22:14:13 2014 +0000 YARN-1919. Potential NPE in EmbeddedElectorService#stop. (Tsuyoshi Ozawa via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619253 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit bf0e9e894dd0969682617fb11eb0c3d09f6b0642) Conflicts: hadoop-yarn-project/CHANGES.txt commit cc3cdd321e0e3f3707d86dabea463c853333b340 Author: Zhijie Shen Date: Sat Aug 9 18:48:15 2014 +0000 YARN-1954. Added waitFor to AMRMClient(Async). Contributed by Tsuyoshi Ozawa. svn merge --ignore-ancestry -c 1617002 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617003 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit af83e57e82952ae516fdb15f4fe19f82234db08b) Conflicts: hadoop-yarn-project/CHANGES.txt commit d9a0b13d8e59664c05de2b05dbe0c8ecc59e283b Author: Aaron Myers Date: Sat Jul 26 01:52:25 2014 +0000 YARN-1796. container-executor shouldn't require o-r permissions. Contributed by Aaron T. Myers. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613549 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 5d0172fdf52001d7ecd31a6b1fa5dfe97a247659) Conflicts: hadoop-yarn-project/CHANGES.txt commit 1eddeab72ad21d47ea92993c31f457de96dea2e7 Author: Sanford Ryza Date: Mon Jul 21 05:00:56 2014 +0000 YARN-2323. FairShareComparator creates too many Resource objects (Hong Zhiguo via Sandy Ryza) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612188 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 28aae5c8c024be7708ae4ac4a0808e1b9aedbdba) Conflicts: hadoop-yarn-project/CHANGES.txt commit fedd57503d33eff2c8a821957e5566028cb42589 Author: Jian He Date: Wed Jul 16 18:27:09 2014 +0000 Merge r1611126 from trunk. YARN-2264. Fixed a race condition in DrainDispatcher which may cause random test failures. Contributed by Li Lu git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611127 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 1c2fec20c9125f99e72003fb15b5938fd1df035e) Conflicts: hadoop-yarn-project/CHANGES.txt commit e1a980c93cc8f5bd020bf51498f5912b9104a905 Author: Byron Wong Date: Sat Oct 25 12:30:17 2014 -0700 HADOOP-6857. FsShell should report raw disk usage including replication factor. Contributed by Byron Wong. (cherry picked from commit d991cd52d8b2338faffaacf2a49c379e94cb55ac) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 6766f9362daa0193ee1053ee4b567988e86632db Author: Karthik Kambatla Date: Wed Nov 19 20:15:40 2014 -0800 YARN-2315. FairScheduler: Set current capacity in addition to capacity. (Zhihai Xu via kasha) (cherry picked from commit a9a0cc3679432774154a07d3157ffa0a43e0bf01) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 93ffe9f2c6b5517b33483ca2746778f039db8eaa) commit ff7aaad7767680fd42ae4fac81b922934bbbc627 Author: Karthik Kambatla Date: Wed Nov 19 19:49:36 2014 -0800 YARN-2802. ClusterMetrics to include AM launch and register delays. (Zhihai Xu via kasha) (cherry picked from commit c90fb84aaa902e6676de65d0016dee3a5414eb95) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 81224c62b83341548578eb83ffdffd16d25e0742) commit 5983710efaa5f45fad43fee98a17499916b4cfb1 Author: Jason Lowe Date: Fri Nov 14 21:25:59 2014 +0000 YARN-2816. NM fail to start with NPE during container recovery. Contributed by Zhihai Xu (cherry picked from commit 49c38898b0be64fc686d039ed2fb2dea1378df02) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 41bc8c094df49d745f6ab623f25b5ab4ac428f81) (cherry picked from commit 51f3669bca2e0632c4c70f2244e1e4d14e60197f) commit 3e320000981849feb4519dd6ee00f8c64a22e1cb Author: Andrew Wang Date: Thu Nov 20 11:05:42 2014 -0800 HADOOP-11323. WritableComparator#compare keeps reference to byte array. Contributed by Wilfred Spiegelenburg. (cherry picked from commit eb4045e7652be6ceaf9dfd33e9139d67774b99ab) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 1183fe32cc455ad22031fdb899c572d0b241a6a5) commit 2a7da287dcd358706d7e0883db4407c9f6957a39 Author: Karthik Kambatla Date: Thu Nov 20 15:13:39 2014 -0800 MR1: MAPREDUCE-6170. TestUlimit failure on JDK8. (bc Wong via kasha) (cherry-picked from commit 2dff54ebc8a3a541209c333dbdbbafe82b02e6e9) (cherry picked from commit b72ab4c4466bc00cf16fe79b8528faca95c46802) commit 7dac4d37520ebcaf3bf3de9c72df97f5e2b5178d Author: Jason Lowe Date: Mon Nov 17 22:59:59 2014 +0000 MAPREDUCE-6162. mapred hsadmin fails on a secure cluster. Contributed by Jason Lowe (cherry picked from commit 09b3dee122ad20fae22ae8de74886dbf11c39343) (cherry picked from commit 0b9a1a3e033fa2d0fec2bf0c4903cb8eacd25d4e) (cherry picked from commit 6d800b9291eec535d62934574f91ab5c17c83d92) commit 22e9e904f93687969c1b9fea0bc37960cdfde2f0 Author: Jason Lowe Date: Thu Nov 13 15:42:25 2014 +0000 MAPREDUCE-6156. Fetcher - connect() doesn't handle connection refused correctly. Contributed by Junping Du (cherry picked from commit 177e8090f5809beb3ebcb656cd0affbb3f487de8) (cherry picked from commit e62a5f9d0af481eb4cba55d39253f64a1abdff1b) (cherry picked from commit 74a867e71fe7f6ad6a7cd5d5ab232fb21a541dad) commit 625f3e285264e5b46ed78a90a4710fafdfad182a Author: Jason Lowe Date: Thu Nov 6 15:10:40 2014 +0000 MAPREDUCE-5960. JobSubmitter's check whether job.jar is local is incorrect with no authority in job jar path. Contributed by Gera Shegalov (cherry picked from commit 10f9f5101c44be7c675a44ded4aad212627ecdee) (cherry picked from commit c0bbb72912b8e9c1de28bc82ba4b541cd0b222a8) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java (cherry picked from commit 1e6a5d7d9faa5f98836a166e654749ee1f9714c0) commit daa5644af00c520d6d16d3880daf8959767ac611 Author: Zhijie Shen Date: Sat Nov 1 00:47:57 2014 -0700 MAPREDUCE-6052. Supported overriding the default container-log4j.properties file per job. Contributed by Junping Du. (cherry picked from commit ed63b116465290fdb0acdf89170025f47b307599) (cherry picked from commit c4aaa4db6cca09feb18cb1ea2f8febebc91d673c) (cherry picked from commit 4238907a9556d0bc73f27bcbb3ec7546d1365bcd) commit 14cf615ff718e475fdc0ca6a9cf989d3f7884589 Author: Jason Lowe Date: Fri Oct 17 19:51:10 2014 +0000 MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in client. Contributed by Rohith (cherry picked from commit 209b1699fcd150676d4cc47e8e817796086c1986) (cherry picked from commit 8885b75d78e63716e0b9b7b19bc6629819b87fe2) (cherry picked from commit 094a6cf77acc0a7c61a0546cfde1d8a015ed45d0) commit 58d003ac85e5075e1d78dc97b822294ffdd8cdfc Author: Jason Lowe Date: Wed Oct 15 17:50:31 2014 +0000 MAPREDUCE-5970. Provide a boolean switch to enable MR-AM profiling. Contributed by Gera Shegalov (cherry picked from commit f19771a24c2f90982cf6dec35889836a6146c968) (cherry picked from commit 025b6c13e930831c40eb07a15131b69fa625a188) (cherry picked from commit c02eaef302d2ec149e2876719c9ed3239ddb5894) commit 194effecdfac28da04bf0f7a13c0496e974f2451 Author: Jason Darrell Lowe Date: Thu Aug 7 20:29:48 2014 +0000 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 (cherry picked from commit 16c4bd1a962be5091748ef25bc9061e210682980) (cherry picked from commit c70d215c96ebedd7dd77fe9e9abfb6c159ee9d54) commit 332f353bcdaf911d1a4d3f5b8cc38e8d2bcef1f8 Author: Andrew Wang Date: Wed Nov 19 17:53:00 2014 -0800 HDFS-7409. Allow dead nodes to finish decommissioning if all files are fully replicated. (cherry picked from commit 765aecb4e127ebaf6c7b060a8b5cd40c6428e296) (cherry picked from commit 988682ac2957da0f34e9fe524d71c5931365fe95) commit 3119eb8e322b6780c428079249f2464a23f028c9 Author: Andrew Wang Date: Tue Nov 18 22:16:58 2014 -0800 HDFS-7373. Allow decommissioning of dead DataNodes. Contributed by Zhe Zhang. (cherry picked from commit 5bd048e8378034b496bacc73b470a25d855aceb1) (cherry picked from commit fbce4df71122a8e9ccba8edffa4b9ced3be885bb) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java (cherry picked from commit bc4637f66fb9bcc5d912018a730780c9eb11dd6f) commit c804224240757b7b4954be86f9248d7d9cbb839a Author: Andrew Wang Date: Tue Nov 18 22:14:04 2014 -0800 HDFS-7225. Remove stale block invalidation work when DN re-registers with different UUID. (Zhe Zhang and Andrew Wang) (cherry picked from commit 406c09ad1150c4971c2b7675fcb0263d40517fbf) (cherry picked from commit 2e15754a92c6589308ccbbb646166353cc2f2456) commit 9b6e7bd43884fa80a158cf38ef6a4a74bf622f12 Author: Andrew Wang Date: Tue Nov 18 10:47:46 2014 -0800 HADOOP-11312. Fix unit tests to not use uppercase key names. (cherry picked from commit bcd402ae380ead1234bfdfc53f485d3fb1391288) (cherry picked from commit 1e14792be673fd31fb0dd0ce14a34741e8f81ca7) (cherry picked from commit 0d639c85fd8126de1386662af2ae8a706e9ab0b3) commit 9cd159cff01621ed8524f8607626724cfd70aa26 Author: cnauroth Date: Wed Oct 29 11:18:44 2014 -0700 HADOOP-11068. Match hadoop.auth cookie format to jetty output. Contributed by Gregory Chanan. (cherry picked from commit 5c900b522e70b512498ab7689f56eb1c5e4b963f) commit dcfa03a750d0bf89b473f7f2476f6ab70132e9ff Author: Aaron T. Myers Date: Mon Nov 17 12:57:52 2014 -0800 HADOOP-11157. ZKDelegationTokenSecretManager never shuts down listenerThreadPool. Contributed by Arun Suresh. (cherry picked from commit bd8196e85e49d44de57237a59bcd7ceae4332c2e) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 83e4f50951a0ee568a6c87d86ad71b2339ef36ec Author: Juan Yu Date: Sun Nov 16 13:07:53 2014 -0800 HADOOP-10714. AmazonS3Client.deleteObjects() need to be limited to 1000 entries per call. Contributed by Juan Yu. (cherry picked from commit 6ba52d88ec11444cbac946ffadbc645acd0657de) commit 95c07992f719f082d2807214cac4e0c992bb5fc7 Author: Robert Kanter Date: Mon Nov 17 14:52:53 2014 -0800 MR1: CLOUDERA-BUILD. Adding bouncycastle dependency required for some unit tests commit 6b1bae4e0a81ba0d289d7af9a272ea4480af863a Author: Andrew Wang Date: Mon Nov 17 13:59:46 2014 -0800 HADOOP-11311. Restrict uppercase key names from being created with JCEKS. (cherry picked from commit 48d62fad80aaa13ee1a26fca14437722ed46da25) (cherry picked from commit 1deefa6cf1e1477139d93ea95421843ace52912e) (cherry picked from commit 9a274dd1707e082d7df21401446e2dfa76d0c6b5) commit d1e7a22eafb24b0948a100f05a5ded28e2bb38c4 Author: Robert Kanter Date: Fri Nov 14 15:20:00 2014 -0800 CLOUDERA-BUILD: TestApplicationHistoryClientService fails on JDK8 (equivalent to YARN-2766) commit 21b3691c02193ffa6458cef413142fb50c86b433 Author: Stephen Chu Date: Thu Nov 13 10:21:27 2014 -0800 CLOUDERA-BUILD. CDH-23226: Bump C5 Hadoop's jetty to 6.1.26.cloudera.4 (cherry picked from commit d3c8b1c5c8dbba403570ae7c5fcd85d760534aa6) commit 5ce9cf12fedf6d2b84ed03e7b4a0c403a5a89cd1 Author: cnauroth Date: Wed Nov 12 21:54:06 2014 -0800 HADOOP-11291. Log the cause of SASL connection failures. Contributed by Stephen Chu. (cherry picked from commit 7dae5b5a880205fd0125c143c44498db79c19392) commit 07bd2542322cc52e482a0016337ef2bcc2e088fb Author: Arun C. Murthy Date: Wed Nov 12 18:51:46 2014 -0800 HDFS-7391. Renable SSLv2Hello in HttpFS. Contributed by Robert Kanter. (cherry picked from commit 9f0319bba1788e4c579ce533b14c0deab63f28ee) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (cherry picked from commit 7c6f03ba20b9dc8a1b33d5405631c760a904a3bc) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 7c66be038e76ca7d5ebd25b24e8b9f0679c2c470 Author: Karthik Kambatla Date: Wed Nov 12 18:39:03 2014 -0800 HADOOP-11217. (Addendum to allow SSLv2Hello) Disable SSLv3 in KMS. (Robert Kanter via kasha) (cherry picked from commit 87818ef4e7c1a49dc3b0d6766cceb3499b07b837) (cherry picked from commit 6e6439062760fefb2aa6a94dd78950073bb4a064) commit 1edb9547a50921fc54d2aca4fe69cd2fdf824cc9 Author: Stephen Chu Date: Wed Nov 12 14:23:09 2014 -0800 CLOUDERA-BUILD. CDH-22593 Revert "svn merge -c 1580977 from trunk for HADOOP-10015. UserGroupInformation prints out excessive warnings." This reverts commit fd8a4cb1145b7f135d95927bf66ecb30cf658c4d. (cherry picked from commit 16df712cf139f04ec5ae45832fbc6097e51289de) commit 283ed271312fddc022399dcb8d79e80d44379454 Author: Jing Zhao Date: Mon Oct 13 10:27:36 2014 -0700 HDFS-7236. Fix TestOpenFilesWithSnapshot#testOpenFilesWithMultipleSnapshots. Contributed by Yongjun Zhang. (cherry picked from commit 715f222a80c906c16cb678d36c3dc9ca794e7064) (cherry picked from commit 77d64dc239b1112c8e5b104f034ad26ce062107b) commit b3a591941e1687cad3b4cab761bd6efb3079c6f2 Author: Arpit Agarwal Date: Wed Jul 30 18:38:07 2014 +0000 HDFS-6768: Merging r1614732 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614733 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f71c0e67fa62509d28d93c20f1e3b41589f1529d) (cherry picked from commit 8ed90d1e336fc83d1cef8dab29d4998345ce51f2) commit d2e363de94890b9bf7ace48b28af9497b879406c Author: Karthik Kambatla Date: Tue Nov 11 13:22:48 2014 -0800 YARN-570. Time strings are formated in different timezone. (Akira Ajisaka and Peng Zhang via kasha) (cherry picked from commit 456b973819904e9647dabad292d2d6205dd84399) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit e83cbc250a0ef6cfc1da857e443bbce65c8c91c4) commit 9c4f287f4c25bb3d701a40ee35d236bc3ab307f5 Author: Junping Du Date: Fri Jul 4 11:18:05 2014 +0000 YARN-2251. Avoid negative elapsed time in JHS/MRAM web UI and services (Contributed by Zhijie Shen) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1607833 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 4074843fea2df972ef62bae5b05613538c63fc89) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 4a3cac6235f52ac5b394bbf491ae787743c96d0e) commit dfb6c8a8bd3a68db1b85a0c7e311fef822510438 Author: Haohui Mai Date: Tue Nov 4 17:52:03 2014 -0800 HADOOP-11230. Add missing dependency of bouncycastle for kms, httpfs, hdfs, MR and YARN. Contributed by Robert Kanter. (cherry picked from commit fa92b40f0950381b99160c77d295cc997e3d2e6c) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml commit c534dd9d891a10365fae2ee6b9c47fec0066f778 Author: Haohui Mai Date: Tue Nov 4 10:52:05 2014 -0800 HADOOP-10847. Remove the usage of sun.security.x509.* in testing code. Contributed by Pascal Oliva. (cherry picked from commit 3bdfd6e58e2eded406b14b585f1465be941eda65) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/ssl/KeyStoreTestUtil.java hadoop-project/pom.xml commit eef39cdddc55723d1b5eebacb27a848abd31ea55 Author: Jing Zhao Date: Wed Oct 22 10:47:49 2014 -0700 HDFS-7228. Fix TestDNFencing.testQueueingWithAppend. Contributed by Yongjun Zhang. (cherry picked from commit 75a9c894b3e53d34341e918c70ba7868d074e0fb) (cherry picked from commit eb8d1977d8f0a1d9a192c02e8d9979ce7f743096) commit 60d62d45f592f9e12325624b8f9ddeb56d6da04d Author: Haohui Mai Date: Sun Nov 9 17:48:26 2014 -0800 HADOOP-10786. Fix UGI#reloginFromKeytab on Java 8. Contributed by Stephen Chu. (cherry picked from commit a37a993453c02048a618f71b5b9bc63b5a44dbf6) (cherry picked from commit 560763daa1462075ee186f3cf9d4ff909aa0c987) commit 3066feea5741ba98584c3f5c929404621df28e2d Author: Colin Patrick Mccabe Date: Wed Oct 29 12:31:59 2014 -0700 HDFS-7287. The OfflineImageViewer (OIV) can output invalid XML depending on the filename (Ravi Prakash via Colin P. McCabe) (cherry picked from commit d33e07dc49e00db138921fb3aa52c4ef00510161) commit a66925627159d93d4e674eb5715f5e2af4017e50 Author: Lei Xu Date: Fri Nov 7 13:33:26 2014 -0800 CLOUDERA-BUILD: Fixed mvn site:site build introduced by backporting HDFS-7278. commit cab86b0d73ecdb8121fec6337c8318e32a6eb976 Author: Harsh J Date: Tue Oct 28 12:08:26 2014 +0530 HDFS-6741. Improve permission denied message when FSPermissionChecker#checkOwner fails. Contributed by Stephen Chu and Harsh J. (harsh) (cherry picked from commit 0398db19b2c4558a9f08ac2700a27752748896fa) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSPermissionChecker.java (cherry picked from commit d69d9ef86035e3514050df7e11a74119875aa29e) commit 22fb407fd5fde626184d4d113ad7ce992c0db447 Author: Kihwal Lee Date: Tue Oct 28 14:54:05 2014 -0500 HDFS-7213. processIncrementalBlockReport performance degradation. Contributed by Eric Payne. (cherry picked from commit e226b5b40d716b6d363c43a8783766b72734e347) (cherry picked from commit 5ed24f3afd166342b2d827c5c1e9826dd6eca7c7) commit 8f3fcf6c92e67176912dbb0601b2c7d7c759b96b Author: cnauroth Date: Fri Sep 19 21:04:55 2014 -0700 HDFS-7105. Fix TestJournalNode#testFailToStartWithBadConfig to match log output change. Contributed by Ray Chiang. (cherry picked from commit 332e2e23ba6f0748a46c0bda76f426d9cad73edd) (cherry picked from commit 9ee5e26cbb7818defcf308817f87b093771469af) (cherry picked from commit 1bb69a586801b626827baac5c136560d83f774cd) commit a349c62eca046c4553481f5492388fe4b82c492a Author: Vinod Kumar Vavilapalli Date: Sat Nov 1 16:32:35 2014 -0700 YARN-2790. Fixed a NodeManager bug that was causing log-aggregation to fail beyond HFDS delegation-token expiry even when RM is a proxy-user (YARN-2704). Contributed by Jian He. (cherry picked from commit 5c0381c96aa79196829edbca497c649eb6776944) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java commit 34a55066bbcab950dac4f6c3cf3d86957da5003e Author: Vinod Kumar Vavilapalli Date: Mon Oct 27 15:49:47 2014 -0700 YARN-2704. Changed ResourceManager to optionally obtain tokens itself for the sake of localization and log-aggregation for long-running services. Contributed by Jian He. (cherry picked from commit a16d022ca4313a41425c8e97841c841a2d6f2f54) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/LogAggregationService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestDelegationTokenRenewer.java commit 543b930bd06f23fa31a080c8fa0eeb3bb3fa283b Author: Aaron T. Myers Date: Wed Nov 5 18:15:12 2014 -0800 HADOOP-11187 NameNode - KMS communication fails after a long period of inactivity. Contributed by Arun Suresh. (cherry picked from commit ef5af4f8de91fbe7891ae3471eb03397e74e1811) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit fa7cd2bd9dd2a4e0f616d93038350fb7243a897f Author: Aaron T. Myers Date: Wed Nov 5 17:47:22 2014 -0800 HADOOP-11272. Allow ZKSignerSecretProvider and ZKDelegationTokenSecretManager to use the same curator client. Contributed by Arun Suresh. (cherry picked from commit 8a261e68e4177b47be01ceae7310ea56aeb7ca38) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit d1b0a7e4ce4cdf36b322d07853afb00fd35b8bd4 Author: Haohui Mai Date: Wed Nov 5 15:25:35 2014 -0800 HADOOP-11267. TestSecurityUtil fails when run with JDK8 because of empty principal names. Contributed by Stephen Chu. (cherry picked from commit 8549fa5dc95d3e94e49c9b92734aec0509693a2a) commit 16e1b949dfc141d792531c076d051d94aee9ff90 Author: Karthik Kambatla Date: Wed Nov 5 10:12:56 2014 -0800 Fix broken download of directories (cherry picked from commit 745c9a01243b8eefc72d89d1164d7d010b80983b) (cherry picked from commit 0ddb6d673adf25452da74ff1595e03b925b2a63d) commit 822c450d878bcdc9e9d2dab2bf8682916dda456f Author: Colin Patrick Mccabe Date: Mon Oct 27 09:53:16 2014 -0700 HDFS-7278. Add a command that allows sysadmins to manually trigger full block reports from a DN (cmccabe) (cherry picked from commit baf794dc404ac54f4e8332654eadfac1bebacb8f) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSCommands.apt.vm commit b373881e1a8f75a3fdba443cfc5e294661babefe Author: Kihwal Lee Date: Thu Oct 9 12:07:51 2014 -0500 HDFS-7217. Better batching of IBRs. Contributed by Kihwal Lee. (cherry picked from commit db71bb54bcc75b71c5841b25ceb03fb0218c6d4f) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 04551c6c5f54e331b568c36378216cd66b72d56d Author: Karthik Kambatla Date: Thu Oct 23 17:04:14 2014 -0700 HADOOP-11170. ZKDelegationTokenSecretManager fails to renewToken created by a peer. (Arun Suresh and Gregory Chanan via kasha) (cherry picked from commit db45f047ab6b19d8a3e7752bb2cde10827cd8dad) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestZKDelegationTokenSecretManager.java commit efdfb0b2080ea0aa862589cb4ae9e705b8625e3b Author: Karthik Kambatla Date: Wed Oct 22 14:26:27 2014 -0700 HADOOP-11122. Fix findbugs in ZK DelegationTokenSecretManagers. (Arun Suresh via kasha) (cherry picked from commit 70719e5c62f32836914bea88e1ddd99c0ed009e1) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 0253389e072ac1a500742c14574169bfe35c0cb9 Author: cnauroth Date: Wed Sep 24 15:30:13 2014 -0700 HADOOP-11064. UnsatisifedLinkError with hadoop 2.4 JARs on hadoop-2.6 due to NativeCRC32 method changes. Contributed by Chris Nauroth. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit d5dc74660b179c8f08a05de4229b8c3fde3114a7 Author: Todd Lipcon Date: Thu Aug 28 16:44:09 2014 -0700 HDFS-6865. Byte array native checksumming on client side. Contributed by James Thomas. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 6f2f9d35cea396b5f622b4bc36f539bf885329b4 Author: Colin McCabe Date: Mon Aug 18 18:02:37 2014 +0000 HADOOP-10975. org.apache.hadoop.util.DataChecksum should support native checksumming (James Thomas via Colin Patrick McCabe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618680 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit c56358b9dd8dd72078b7368155183549b61ad42f Author: Todd Lipcon Date: Thu Aug 14 04:29:35 2014 +0000 HADOOP-10838. Byte array native checksumming. Contributed by James Thomas. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617875 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 7a7dd6cd2b68df620b03c296d4d58094e10f7c01 Author: Colin Patrick Mccabe Date: Tue Oct 28 16:41:22 2014 -0700 HDFS-7235. DataNode#transferBlock should report blocks that don't exist using reportBadBlock (yzhang via cmccabe) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java commit c661d4ee892f07b0b505124dcad7281102d1c1d1 Author: Colin Patrick Mccabe Date: Thu Oct 30 17:31:23 2014 -0700 HDFS-7035. Make adding a new data directory to the DataNode an atomic operation and improve error handling (Lei Xu via Colin P. McCabe) (cherry picked from commit ec2621e907742aad0264c5f533783f0f18565880) (cherry picked from commit a9331fe9b071fdcdae0c6c747d7b6b306142e671) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java commit bf447770c1a021f913e534d668f921e85d221ad6 Author: Colin Patrick Mccabe Date: Wed Oct 22 13:38:26 2014 -0700 HDFS-6877. Avoid calling checkDisk when an HDFS volume is removed during a write. (Lei Xu via Colin P. McCabe) (cherry picked from commit 7b0f9bb2583cd9b7274f1e31c173c1c6a7ce467b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 32611e29d003937363c23188086adf41c3a6241a Author: Colin Patrick Mccabe Date: Mon Sep 22 11:51:31 2014 -0700 HDFS-7106. Reconfiguring DataNode volumes does not release the lock files in removed volumes. (cnauroth via cmccabe) (Cherry picked from commit 912ad32b03c1e023ab88918bfa8cb356d1851545) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 16a8f53fa82087b39e6d1d60023644ed799fe65d Author: cnauroth Date: Tue Nov 4 10:27:41 2014 -0800 HADOOP-11165. TestUTF8 fails when run against java 8. Contributed by Stephen Chu. (cherry picked from commit 85da71c2d3c565a8920e47fe3925e8e0bef353a5) commit b6a002e5bb944a2a8a8c749cdd86a03d216af1f9 Author: Stephen Chu Date: Tue Oct 28 17:34:01 2014 -0700 CLOUDERA-BUILD. Disable SSLv3 in our Jetty 6 fork. (CDH-22521 continued) (cherry picked from commit 65108c165674673053c35a31e1f89014397f03c0) commit 94499feb6caeac047dba025b25979fd739608e41 Author: Stephen Chu Date: Tue Oct 28 16:47:22 2014 -0700 CLOUDERA-BUILD. Disable SSLv3 in our Jetty 6 fork. (CDH-22521) (cherry picked from commit f87c79b0df79745b6ea0263c43a22feacac19d3c) commit 882efd4b319b50993836224ac2bad89e973da1cf Author: Colin Patrick Mccabe Date: Wed Oct 22 13:27:51 2014 -0700 HDFS-7254. Add documentation for hot swaping DataNode drives (Lei Xu via Colin P. McCabe) (cherry picked from commit 66e8187ea1dbc6230ab2c633e4f609a7068b75db) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 5639365a383301a612c0d0fa82a39b5d83f88c07 Author: Arpit Agarwal Date: Thu Aug 7 19:42:09 2014 +0000 HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616575 13f79535-47bb-0310-9956-ffa450edef68 (Cherry picked from commit b98400df7b114dc393eb69f5c9496d532774bb32) Conflicts: hadoop-common-project/hadoop-common/src/site/apt/CommandsManual.apt.vm hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 850906acc13535de90c01393996319077190951d Author: Jian He Date: Fri Oct 17 10:54:24 2014 -0700 YARN-2588. Standby RM fails to transitionToActive if previous transitionToActive failed with ZK exception. Contributed by Rohith Sharmaks (cherry picked from commit a6aa6e42cacdbfcc1c2b7c19e7239204fe9ff654) (cherry picked from commit 79428e021f7f2673e77ef69f0db3f177a58fd3e0) (cherry picked from commit f83a3347fe31ebe177021e04b2a09321a8b11dcf) commit f493a72649f7dba0730c83493b4b62896d132407 Author: Andrew Wang Date: Thu Oct 30 10:21:12 2014 -0700 HDFS-7165. Separate block metrics for files with replication count 1. Contributed by Zhe Zhang. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 1156b6cf49f1671ce1a39b3d032e4099782dc171 Author: Jason Lowe Date: Tue Oct 21 17:29:22 2014 +0000 YARN-90. NodeManager should identify failed disks becoming good again. Contributed by Varun Vasudev (cherry picked from commit 6f2028bd1514d90b831f889fd0ee7f2ba5c15000) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/LogAggregationService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java commit d96a8eceeb12aa26a063fb1af1ad71463d4ffb7c Author: Karthik Kambatla Date: Mon Nov 3 15:55:22 2014 -0800 MAPREDUCE-6147. Support mapreduce.input.fileinputformat.split.maxsize. (Zhihai Xu via kasha) (cherry picked from commit ebec913e20d0081e2e30e13817e9023565e0b920) Conflicts: CHANGES.txt src/mapred/org/apache/hadoop/mapred/lib/CombineFileInputFormat.java src/test/org/apache/hadoop/mapred/lib/TestCombineFileInputFormat.java (cherry picked from commit 18f992c4e268d66704d3092bd064b1916d7948f7) commit 0c226ec93a0b40dbd282ddd596480831d61bf1c7 Author: cnauroth Date: Fri Oct 10 15:05:52 2014 -0700 HADOOP-11188. hadoop-azure: automatically expand page blobs when they become full. Contributed by Eric Hanson. commit 0a36a2620f036c28c193964e14385c8b3168cd4b Author: cnauroth Date: Wed Oct 8 14:20:23 2014 -0700 HADOOP-10809. hadoop-azure: page blob support. Contributed by Dexter Bradshaw, Mostafa Elhemali, Eric Hanson, and Mike Liddell. commit 682bc1d45ff439e6c33b22ab2f274c45657cec55 Author: Allen Wittenauer Date: Fri Sep 19 11:32:55 2014 -0700 HADOOP-10946. Fix a bunch of typos in log messages (Ray Chiang via aw) commit e47c5fa79bb6c29527c3b5804ff1844453610439 Author: Chris Nauroth Date: Thu Jul 17 05:04:53 2014 +0000 HADOOP-10840. Fix OutOfMemoryError caused by metrics system in Azure File System. Contributed by Shanyu Zhao. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611247 13f79535-47bb-0310-9956-ffa450edef68 commit 3646b6e433aa4cfa5d4c4bf327b5d1826ef67c91 Author: Chris Nauroth Date: Tue Jun 24 20:52:44 2014 +0000 HADOOP-10728. Metrics system for Windows Azure Storage Filesystem. Contributed by Dexter Bradshaw, Mostafa Elhemali, Xi Fang, Johannes Klein, David Lao, Mike Liddell, Chuan Liu, Lengning Liu, Ivan Mitic, Michael Rys, Alexander Stojanovic, Brian Swan, and Min Wei. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1605187 13f79535-47bb-0310-9956-ffa450edef68 commit 1b2c31af27bb1775a50e5c3cca8c501b5edea930 Author: Chris Nauroth Date: Fri Jun 20 18:36:11 2014 +0000 HADOOP-10690. Lack of synchronization on access to InputStream in NativeAzureFileSystem#NativeAzureFsInputStream#close(). Contributed by Chen He. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604236 13f79535-47bb-0310-9956-ffa450edef68 commit 006280164e54c28da9ea4428a9b439b428634ff0 Author: Chris Nauroth Date: Fri Jun 20 18:30:49 2014 +0000 HADOOP-10689. InputStream is not closed in AzureNativeFileSystemStore#retrieve(). Contributed by Chen He. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604233 13f79535-47bb-0310-9956-ffa450edef68 commit 722fb5c06e9eb47fd9c52b1cf1ad63bb6ec2eb51 Author: Chris Nauroth Date: Tue Jun 10 22:26:45 2014 +0000 HADOOP-9629. Support Windows Azure Storage - Blob as a file system in Hadoop. Contributed by Dexter Bradshaw, Mostafa Elhemali, Xi Fang, Johannes Klein, David Lao, Mike Liddell, Chuan Liu, Lengning Liu, Ivan Mitic, Michael Rys, Alexander Stojanovic, Brian Swan, and Min Wei. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1601781 13f79535-47bb-0310-9956-ffa450edef68 (Cherry picked from commit 81bc395deb3ba00567dc067d6ca71bacf9e3bc82) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-project/pom.xml hadoop-tools/hadoop-tools-dist/pom.xml hadoop-tools/pom.xml commit 41fb5aa034f05f888298d17c195a0cf85b4b5e5a Author: Haohui Mai Date: Tue Oct 28 16:27:28 2014 -0700 HDFS-7301. TestMissingBlocksAlert should use MXBeans instead of old web UI. Contributed by Zhe Zhang. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit cad9b3c040869a8264d6042fd8227188731a2bfc Author: Tsz-wo Sze Date: Fri Feb 10 02:05:38 2012 +0000 HDFS-2486. Remove unnecessary priority level checks in UnderReplicatedBlocks. Contributed by Uma Maheswara Rao G git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1242636 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit dc847b39fdee85b45ef26e8e7380d722ffb89e4e) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 4a8e6770bf6d2599729297503016bb7d9cf6fdc6 Author: Colin Patrick Mccabe Date: Mon Oct 20 18:33:11 2014 -0700 HDFS-7154. Fix returning value of starting reconfiguration task (Lei Xu via Colin P. McCabe) (cherry picked from commit 7aab5fa1bd9386b036af45cd8206622a4555d74a) (cherry picked from commit 8c3b007236e01c7ad4922d1bf611e68d09adcfa8) commit f40c8cf23147f6966e92b743e2d84eb2c41a18a4 Author: Colin Patrick Mccabe Date: Mon Sep 29 11:29:54 2014 -0700 HDFS-7157. Using Time.now() for recording start/end time of reconfiguration tasks (Lei Xu via Colin Patrick McCabe) (cherry picked from commit b3d5d269a73a1826ebf6f637a0dbd69f6261dbcb) (cherry picked from commit c412652820f88af042700713da0330bda4323fe0) commit f0d8478402411315abab5f4ce51d0934a9ec8a34 Author: Colin Patrick Mccabe Date: Thu Sep 25 13:10:28 2014 -0700 HDFS-6808. Add command line option to ask DataNode reload configuration. (Lei Xu via Colin McCabe) (cherry picked from commit 1861b32eb551a07d748afc6205ea9573f9503eda) (cherry picked from commit cb9283549fcda3b7fe7b567e108f8a05018f9fe5) commit fc7112d47bef73e326ac7cc00d80952832fd30e7 Author: arp Date: Fri Sep 5 10:45:54 2014 -0700 HDFS-6831. Inconsistency between 'hdfs dfsadmin' and 'hdfs dfsadmin -help'. (Contributed by Xiaoyu Yao) (cherry picked from commit 9e941d9f99168cae01f8d50622a616fc26c196d9) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java commit 2e52bd1d44b3c4bb5486ed33b4e6b306328f8b28 Author: Colin Patrick Mccabe Date: Thu Sep 18 16:46:01 2014 -0700 HDFS-6727. Refresh data volumes on DataNode based on configuration changes (Lei Xu via Colin Patrick McCabe) (cherry picked from commit fe38d2e9b5ac7e13f97cd2d3d2a984ab6bbaaf77) (cherry picked from commit d3292379906bdebc6834076e56eaa21dbc409d88) commit 49127759a92a48ed0e398e29dcad3048a22a7e0b Author: Aaron T. Myers Date: Fri Aug 29 12:59:23 2014 -0700 HDFS-6774. Make FsDataset and DataStore support removing volumes. Contributed by Lei Xu. (cherry picked from commit 7eab2a29a5706ce10912c12fa225ef6b27a82cbe) (cherry picked from commit 135315b66fba5d248a983ad5d05d7ab7da42b5fb) commit 7be053b44bd3c6a8424c6e548f39e77c66ffa6e5 Author: Aaron Myers Date: Thu Aug 7 23:01:36 2014 +0000 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 (cherry picked from commit 1fe7b048631e2787cc1a29fde785d52e81480d02) commit c20e8b6a6c8097dcd1e278b3b43aa51951d59eee Author: Aaron Myers Date: Thu Aug 7 22:53:00 2014 +0000 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 (cherry picked from commit 84d57bbfa8b62923a39e34c3a308c148430fe182) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java commit 49bb4c99ed7e13e787e51eaf6c3dd4ef0c0aa262 Author: Chris Nauroth Date: Fri Jul 18 17:17:15 2014 +0000 HDFS-6597. Merging change r1611723 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611724 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fcca9666a8c97aa870546149c4a5c29192eb0a8d) commit f521f0115269128c8bcab8c49d5278fb5f11d512 Author: Arpit Agarwal Date: Fri Aug 22 18:14:55 2014 +0000 HDFS-6829. DFSAdmin refreshSuperUserGroupsConfiguration failed in security cluster. (Contributed by zhaoyunjiong) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619882 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e6c36500705d3d756de82ee0ce9ff226f34b938f) commit ac961023527122dbc3afbd92ea2cfea1f21ed054 Author: Arun Suresh Date: Fri Oct 24 17:35:16 2014 -0700 CLOUDERA-BUILD: CDH-22694: HDFS startup script should include jar from SENTRY_HOME/lib/plugins commit b903593c9046d6fbf240f0590e048e8b6878f461 Author: Karthik Kambatla Date: Tue Oct 28 18:03:00 2014 -0700 HADOOP-11243. SSLFactory shouldn't allow SSLv3. (Wei Yan via kasha) (cherry picked from commit 3c5f5af1184e85158dec962df0b0bc2be8d0d1e3) commit 7baec5c7abf32ace435c18b903697f0a3b7cf6fc Author: Karthik Kambatla Date: Tue Oct 28 17:21:20 2014 -0700 HDFS-7274. Disable SSLv3 in HttpFS. (Robert Kanter via kasha) (cherry picked from commit 3f48493bed22f9618a9330deaaaa070734989814) (cherry picked from commit f2679ae22ebc3af49702602dfdc9ed5abe7ab051) commit ab8aa196b013cfa4ecef94063851ce684ca274af Author: Karthik Kambatla Date: Tue Oct 28 17:18:24 2014 -0700 HADOOP-11217. Disable SSLv3 in KMS. (Robert Kanter via kasha) (cherry picked from commit 1a780823384a9c4289b8bb0b3c73e6b886d78fd0) (cherry picked from commit 0aec8847048d908338de866ddae7e5a9f78d7695) commit f283b2490fb801da81b3871b80181d3c820bea96 Author: Karthik Kambatla Date: Mon Oct 27 14:24:16 2014 -0700 MR1: CDH-22440. JT HA should survive HDFS restarts (cherry picked from commit e4170054ec7389d3a04a85e5a13650f3ed473952) commit 81f6c9b1d8365acfeaa77f729ce2ad11f151875e Author: Andrew Wang Date: Thu Oct 23 12:53:01 2014 -0700 HDFS-7222. Expose DataNode network errors as a metric. (Charles Lamb via wang) (cherry picked from commit 86cad007d7d6366b293bb9a073814889081c8662) (cherry picked from commit d3b9e9be24073f83e101c6a82546b9aef3878689) commit cf1803d2ed98b852e7c2029bffa7555297cf40f5 Author: Vinayakumar B Date: Wed Aug 20 12:14:42 2014 +0000 Merged revision(s) 1617799 from hadoop/common/trunk: HDFS-6247. Avoid timeouts for replaceBlock() call by sending intermediate responses to Balancer (vinayakumarb) ........ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619084 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 12e216ad2911525ccf5c6ac74bba4f75aae0f581) commit 0b1d351f4850116d2af2db62194cdde31eab48d7 Author: Chris Nauroth Date: Wed Jul 16 18:52:41 2014 +0000 HADOOP-10839. Merging change r1611134 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611136 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 9fa9b91afe1c56bfab4b8f1393b94d49c8de2558) commit 589c9f97677f8d22552dec098b58c4f4b2fc7dc0 Author: Karthik Kambatla Date: Fri Oct 24 15:00:12 2014 -0700 YARN-2713. "RM Home" link in NM should point to one of the RMs in an HA setup. (kasha) (cherry picked from commit 683897fd028dcc2185383f73b52d15245a69e0cb) (cherry picked from commit 9af3cfc7eb64389b9e2001f60e7ad810fe260a23) commit ad0972168701f5c4d69cdccbf68750f79fcaf745 Author: Haohui Mai Date: Fri Oct 24 10:50:16 2014 -0700 HDFS-7283. Bump DataNode OOM log from WARN to ERROR. Contributed by Stephen Chu. (cherry picked from commit b3d8a642a938da9de680b479585a7c2014b8965c) commit 7af1ace70cfa043c3df630551dd1751a52cd7d28 Author: yliu Date: Fri Oct 24 11:12:18 2014 +0800 HDFS-7243. HDFS concat operation should not be allowed in Encryption Zone. (clamb via yliu) (cherry picked from commit 57dec288070f903931771485d6424317b20551aa) commit cadaf11f0c72826e0d887e81924696fdb4eeea22 Author: Haohui Mai Date: Thu Oct 23 16:52:58 2014 -0700 HDFS-7257. Add the time of last HA state transition to NN's /jmx page. Contributed by Charles Lamb. (Cherry picked from 92ad210699633d22ff199a0408b6506934b72ca9) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestHAMetrics.java Upstream review by Andrew Wang. commit b7126782d0c327396f8e351cf442149fc03b1519 Author: Lei Xu Date: Thu Oct 2 19:25:38 2014 -0700 CLOUDERA-BUILD. Build shaded hadoop-aws.jar for CDH 5.2.0 (CDH-22019) Shade all dependencies of hadoop-aws, except hadoop-common into its jar file to avoid expose conflicted jackson 2 jar to other projects. commit 0c8a9843846a5c9010c62b8e4019405e46dffedb Author: Andrew Wang Date: Wed Oct 22 14:38:47 2014 -0700 HDFS-6824. Additional user documentation for HDFS encryption. (cherry picked from commit a36399e09c8c92911df08f78a4b88528b6dd513f) (cherry picked from commit c8d0758656638b0ee238d3327d7093ad697660d2) commit f420d63fbaf88edb8ce3c3e0d5afef1e96f7b31f Author: Brandon Li Date: Tue Oct 21 11:49:10 2014 -0700 HDFS-7215.Add JvmPauseMonitor to NFS gateway. Contributed by Brandon Li (cherry picked from commit 4e134a02a4b6f30704b99dfb166dc361daf426ea) commit 91080bc0119b4e71c01047f88f7a95fa57cd935e Author: Andrew Wang Date: Tue Oct 21 12:55:18 2014 -0700 HDFS-7221. TestDNFencingWithReplication fails consistently. Contributed by Charles Lamb. (cherry picked from ac56b0637e55465d3b7f7719c8689bff2a572dc0) commit 3f4e80418b815563bfea88200a9c9f9a8b05479d Author: Chris Douglas Date: Wed Sep 3 14:32:35 2014 -0700 MAPREDUCE-6063. Correct spill size calculation for spills wrapping the circular buffer. Contributed by zhihai xu. (cherry picked from commit a18424e724982d01e0191ca7db713da1d43d1e4d) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 7ea90b5fee78a64bff85006776941bb7475af04c Author: Arpit Agarwal Date: Tue Aug 12 21:49:48 2014 +0000 HDFS-6836. HDFS INFO logging is verbose & uses file appenders. (Contributed by Xiaoyu Yao) (cherry picked from a72fba5853d0537bcdbd7851181129173e440dbb) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617603 13f79535-47bb-0310-9956-ffa450edef68 commit fdd7c7145e739767ab4f337e16f3ef05d09e4ff1 Author: Colin Patrick Mccabe Date: Mon Oct 20 18:24:53 2014 -0700 HDFS-7266. HDFS Peercache enabled check should not lock on object (awang via cmccabe) (cherry picked from commit 4799570dfdb7987c2ac39716143341e9a3d9b7d2) commit 2c29e799335ef01ee634a21ab7c8cc9dc7e187ed Author: Vinayakumar B Date: Fri Oct 17 18:03:44 2014 +0530 HDFS-7252. small refinement to the use of isInAnEZ in FSNamesystem. (Yi Liu via vinayakumarb) (cherry picked from 368743140dd076ecd5af309c1ed83c5ae2d59fc8) commit aad35e544f34b818a4c6e315ae7e6df69818eabd Author: Vinayakumar B Date: Fri Oct 17 17:48:20 2014 +0530 HDFS-7242. Code improvement for FSN#checkUnreadableBySuperuser. (Contributed by Yi Liu) (cherry picked from 1c3ff0b7c892b9d70737c375fb6f4a6fc6dd6d81) commit 48d5e54f880ced94444e1b8d154cd2e33e08e4bf Author: Jason Lowe Date: Tue Oct 7 14:10:39 2014 +0000 MAPREDUCE-6029. TestCommitterEventHandler fails in trunk. Contributed by Mit Desai (cherry picked from commit 2e789eb2261fa607489d8ae630fb77e8147d0266) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 9cfca583519147692d8230c376fe16e4678530e0 Author: cnauroth Date: Thu Oct 9 22:35:58 2014 -0700 MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2 MiniDFSCluster instances. Contributed by Chris Nauroth. (cherry picked from commit 777877d079ecb025c293deac741800800e413179) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 87e14bb191be38714d67b7fc72b5ea49a992ef77 Author: Jason Darrell Lowe Date: Mon Jul 21 21:24:15 2014 +0000 MAPREDUCE-5756. CombineFileInputFormat.getSplits() including directories in its results. Contributed by Jason Dere git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612400 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit c2174a55363e8f52acbe21319f072f6678441d47) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit b0ee2463e5c090c572a12068bc61139b4edbb75c Author: Karthik Kambatla Date: Mon Oct 13 16:23:04 2014 -0700 YARN-2641. Decommission nodes on -refreshNodes instead of next NM-RM heartbeat. (Zhihai Xu via kasha) (cherry picked from commit da709a2eac7110026169ed3fc4d0eaf85488d3ef) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceTrackerService.java commit 1985a14d7d75d5b26718c9b27cc2d623e3bdc932 Author: Karthik Kambatla Date: Mon Oct 13 16:32:01 2014 -0700 YARN-2566. DefaultContainerExecutor should pick a working directory randomly. (Zhihai Xu via kasha) (cherry picked from commit cc93e7e683fa74eb1a7aa2b357a36667bd21086a) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java commit 795b3bbf92bb61edb9bb7c110103ac3db31820a5 Author: Karthik Kambatla Date: Mon Oct 13 16:32:01 2014 -0700 YARN-2566. DefaultContainerExecutor should pick a working directory randomly. (Zhihai Xu via kasha) (cherry picked from commit cc93e7e683fa74eb1a7aa2b357a36667bd21086a) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/DefaultContainerExecutor.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java (cherry picked from commit a0bb4ed2ad107d79730437f1c6d0cca29c1bf0c4) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDefaultContainerExecutor.java commit 2115b6a1cfd2d5859b5122377ed2d1c653c92e44 Author: Tsz-Wo Nicholas Sze Date: Mon Oct 13 18:28:34 2014 -0700 HDFS-7237. The command "hdfs namenode -rollingUpgrade" throws ArrayIndexOutOfBoundsException. (cherry picked from commit f6d0b8892ab116514fd031a61441141ac3bdfeb5) commit 0a7f6e9eb31b80d29e6a153b0e6083366ced6e01 Author: Colin Patrick Mccabe Date: Wed Oct 1 14:53:44 2014 -0700 HDFS-7176. The namenode usage message doesn't include "-rollingupgrade started" (cmccabe) (cherry picked from commit dd1b8f2ed8a86871517c730a9f370aca4b763514) commit 9535003886d121e1b73cfa56f19a796e30a586ea Author: Jing Zhao Date: Thu Sep 25 17:15:33 2014 -0700 HDFS-7131. During HA upgrade, JournalNode should create a new committedTxnId file in the current directory. Contributed by Jing Zhao. (cherry picked from commit e9c37de485f8d4dcb04afb0d4cb887cc09d317c9) commit 9cb4fce9cbe32e9c4234791eda315de3bca604cb Author: cnauroth Date: Thu Sep 11 12:16:19 2014 -0700 HDFS-7042. Upgrade fails for Windows HA cluster due to file locks held during rename in JournalNode. Contributed by Chris Nauroth. (cherry picked from commit 80ac6aabcea9f808fd55504cdaef2da7b50da7f1) commit a21276b350efea67850c209a2f883f3d758b943e Author: Jason Lowe Date: Mon Oct 13 15:08:23 2014 +0000 MAPREDUCE-6125. TestContainerLauncherImpl sometimes fails. Contributed by Mit Desai (cherry picked from commit bbe80cdc7b37cae50e46eaa00e75240d4a2aac68) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit fb40a213681cd502afe52bbc3d5719f8187dc4c3 Author: Jason Lowe Date: Mon Sep 29 18:11:16 2014 +0000 MAPREDUCE-6094. TestMRCJCFileInputFormat.testAddInputPath() fails on trunk. Contributed by Akira AJISAKA (cherry picked from commit 23fbfe36c31674907a26c8ecc6fd47888dfcc1ea) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit c6ceee0a9186c92f8cf1d14513920237d4c7ba1e Author: junping_du Date: Thu Oct 2 08:02:59 2014 -0700 YARN-1979. TestDirectoryCollection fails when the umask is unusual. (Contributed by Vinod Kumar Vavilapalli and Tsuyoshi OZAWA) (cherry picked from commit c7cee9b4551918d5d35bf4e9dc73982a050c73ba) Conflicts: hadoop-yarn-project/CHANGES.txt commit 070a050afdedb6a375e3b63c46c3a77e072ed577 Author: Jian He Date: Wed Oct 8 10:58:51 2014 -0700 YARN-2649. Fixed TestAMRMRPCNodeUpdates test failure. Contributed by Ming Ma (cherry picked from commit e16e25ab1beac89c8d8be4e9f2a7fbefe81d35f3) Conflicts: hadoop-yarn-project/CHANGES.txt commit 9d25fdb77d879863cf57a3fc29da8b1e52e41c0a Author: Aaron T. Myers Date: Mon Oct 13 18:09:39 2014 -0700 HADOOP-11176. KMSClientProvider authentication fails when both currentUgi and loginUgi are a proxied user. Contributed by Arun Suresh. (cherry picked from commit 0e57aa3bf689374736939300d8f3525ec38bead7) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 790f7ad213b0bf69c1c420156797616aa64b7693 Author: Andrew Wang Date: Fri Oct 10 13:40:37 2014 -0700 HDFS-7209. Populate EDEK cache when creating encryption zone. (Yi Liu via wang) (cherry picked from commit d3d3d47202a18749eeebec22db759c19dd3e232c) (cherry picked from commit 217c0405d9a370c210056c6f2289c34c468e2d5a) commit c598ac37353078640a07b64f931d336f0b9b753c Author: Kihwal Lee Date: Wed Oct 8 15:05:13 2014 -0500 HDFS-7203. Concurrent appending to the same file can cause data corruption. Contributed by Kihwal Lee. (cherry picked from commit 853cb704edf54207313c0e70c9c375212d288b60) commit b82936d1332474da3a71d773386f7f7dded09d65 Author: Andrew Wang Date: Thu Oct 9 13:21:19 2014 -0700 HADOOP-11174. Delegation token for KMS should only be got once if it already exists. (Yi Liu via wang) (cherry picked from commit 8d941144952a77a714cd4368cba21b01904926e9) commit bdf7f29088260302057cb12737fa0e3be3305ea5 Author: Andrew Wang Date: Tue Oct 7 14:46:59 2014 -0700 HADOOP-11169. Fix DelegationTokenAuthenticatedURL to pass the connection Configurator to the authenticator. (Arun Suresh via wang) (cherry picked from commit b2f619752355d4ef6733935c020f57c8a26d82e1) (cherry picked from commit 3e897da5fc07d9e0b5402691694a9b4433a6a690) commit aba94c3aa180958aed1813bced90d3f8ff6a057b Author: Andrew Wang Date: Sun Oct 5 20:27:28 2014 -0700 CLOUDERA-BUILD. Optimistic backport of HADOOP-11161 patch v3. Expose close method in KeyProvider to give clients of Provider implementations a hook to release resources. commit 44f6e449ad51fef6854d22fe6704294fe6c31b26 Author: Karthik Kambatla Date: Thu Oct 2 23:20:29 2014 -0700 YARN-2635. TestRM, TestRMRestart, TestClientToAMTokens should run with both CS and FS. (Wei Yan and kasha via kasha) (cherry picked from commit 80d11eb68e60f88e16d7d41edecbddfc935a6b10) (cherry picked from commit b6ce0a1f69af1862f1577f5c2a0f96905d2af683) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java commit 239b0c76292151e48ebec9b90189cc3c7648ed84 Author: Jian He Date: Thu Oct 2 10:03:14 2014 -0700 YARN-2617. Fixed NM to not send duplicate container status whose app is not running. Contributed by Jun Gong (cherry picked from commit 3ef1cf187faeb530e74606dd7113fd1ba08140d7) (cherry picked from commit 61c7ceaf8246e76a5ac85730e26f5602dd841bf4) Conflicts: hadoop-yarn-project/CHANGES.txt commit 262bcfbd186a3de75b4b3fa7f7c95c8e4922253e Author: Andrew Wang Date: Thu Oct 2 19:54:57 2014 -0700 HADOOP-11151. Automatically refresh auth token and retry on auth failure. Contributed by Arun Suresh. (cherry picked from commit 2d8e6e2c4a52a4ba815b23d6d1ac21be4df23d9e) (cherry picked from commit 9ebff016c2de3410622e6da3e9963adbaa894c1a) commit 2e5276ecb899032a475fbc2e4d0cbd14ed98ea65 Author: Haohui Mai Date: Thu Oct 2 14:07:36 2014 -0700 HADOOP-11160. Fix typo in nfs3 server duplicate entry reporting. Contributed by Charles Lamb. (cherry picked from ebeb9da80c1dac9513edc066eb54bab38de52694) commit fa3c0d71ebb9bc7307d6bf7e6d1d7a91b8ce241c Author: Andrew Wang Date: Thu Oct 2 13:51:08 2014 -0700 HDFS-7181. Remove incorrect precondition check on key length in FileEncryptionInfo. (wang) (cherry picked from commit 6ac10516e7fa28384b6d3c2670f6621e2666ffdb) (cherry picked from commit 6dbba19469d698891e9c6a8513cbe58992a736b1) commit 2b6870c05bf74bbe233028a71b27dd3db8580171 Author: Lei Xu Date: Thu Oct 2 13:22:45 2014 -0700 Revert "CLOUDERA-BUILD. Build shaded hadoop-aws.jar for CDH 5.2.0 (CDH-22019)" This reverts commit d9db379c05f8838f68ef8d3e08cb677baf808459. commit 1a9a18c8cb505d1d4fab70c20491a3209f5f0c64 Author: Jason Lowe Date: Thu Oct 2 17:39:34 2014 +0000 YARN-2624. Resource Localization fails on a cluster due to existing cache directories. Contributed by Anubhav Dhoot (cherry picked from commit 29f520052e2b02f44979980e446acc0dccd96d54) (cherry picked from commit 531c1fd00add260825e00284e6868c4614f8e19f) Conflicts: hadoop-yarn-project/CHANGES.txt commit 317a080849374e5bb6990457701293b3ecdb6122 Author: Sean Mackrory Date: Thu Oct 2 10:06:07 2014 -0600 CDH-22080. Updating MR1 dependency on JackSON commit 292cbbd702758f3226fe9367f04fb1c17c40c35a Author: Karthik Kambatla Date: Wed Oct 1 15:47:40 2014 -0700 YARN-2254. TestRMWebServicesAppsModification should run against both CS and FS. (Zhihai Xu via kasha) (cherry picked from commit 5e0b49da9caa53814581508e589f3704592cf335) Conflicts: hadoop-yarn-project/CHANGES.txt commit a9cdcce0f8bcccf37dbf6d67cec4346c44b38e9b Author: Jian He Date: Wed Sep 10 12:47:34 2014 -0700 YARN-2158. Fixed TestRMWebServicesAppsModification#testSingleAppKill test failure. Contributed by Varun Vasudev (cherry picked from commit cbfe26370b85161c79fdd48bf69c95d5725d8f6a) Conflicts: hadoop-yarn-project/CHANGES.txt commit 756f841570230d88e30c8d80f4fe8c6f0d1acf29 Author: Jian He Date: Fri Aug 29 11:40:47 2014 -0700 YARN-2447. RM web service app submission doesn't pass secrets correctly. Contributed by Varun Vasudev (cherry picked from commit c686aa3533b42e1baf62a78bc1bfb0ac05be53bb) Conflicts: hadoop-yarn-project/CHANGES.txt commit f70c20bea43392982523e0c1f5728092e06cca7a Author: Andrew Wang Date: Tue Sep 30 16:39:44 2014 -0700 HADOOP-11156. DelegateToFileSystem should implement getFsStatus(final Path f). Contributed by Zhihai Xu. (cherry picked from commit d7075ada5d3019a8c520d34bfddb0cd73a449343) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit d20e7972d54474e43758c00248b67993e5a9bc9c Author: Lei Xu Date: Wed Oct 1 17:17:59 2014 -0700 CLOUDERA-BUILD. Build shaded hadoop-aws.jar for CDH 5.2.0 (CDH-22019) Shade all dependencies of hadoop-aws into its jar file to avoid expose conflicted jackson 2 jar to other projects. commit 58d7b434e31e3aef17787a4488fa024abe8794ca Author: Jian He Date: Thu Jul 17 03:28:39 2014 +0000 YARN-2219. Addendum patch for YARN-2219 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611240 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 3c193811ca36f35ccda40a4c93c91b7476db45b1) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerTestBase.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java commit 8e521c69463ebf9a578b5e9b79be3f948851612e Author: Vinod Kumar Vavilapalli Date: Thu Jul 17 00:14:56 2014 +0000 YARN-2219. Changed ResourceManager to avoid AMs and NMs getting exceptions after RM recovery but before scheduler learns about apps and app-attempts. Contributed by Jian He. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611222 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit bda23181bf1931c37d2590e03da9acdc6688ad34) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java commit 9de7541ca45acc9e651b23039585b2446883799e Author: Andrew Wang Date: Wed Oct 1 17:52:29 2014 -0700 CLOUDERA-BUILD. Optimistic backport of HDFS-7179. DFSClient should instantiate a KeyProvider, not a KeyProviderCryptoExtension. commit 92b2e7cc1350784921a16854293c769aa4d40a1d Author: Zhijie Shen Date: Wed Oct 1 15:38:11 2014 -0700 YARN-2630. Prevented previous AM container status from being acquired by the current restarted AM. Contributed by Jian He. (cherry picked from commit 52bbe0f11bc8e97df78a1ab9b63f4eff65fd7a76) commit 03aefa3693faa7b63fb8dcdef6cf7ce7ffb2afc5 Author: Andrew Wang Date: Tue Sep 30 16:46:58 2014 -0700 HADOOP-11113. Namenode not able to reconnect to KMS after KMS restart. (Arun Suresh via wang) (cherry picked from commit e25a25c5343c889d8c9e45b65082ddb55cf36d52) (cherry picked from commit 489b4008dfcca994734dc6aa37d9edbbea7faf1b) commit f4191caf0e610e190367bbacff6c6e8f9b45997f Author: Colin Patrick Mccabe Date: Wed Oct 1 11:24:01 2014 -0700 CLOUDERA-BUILD. CDH-22059. Use Jackson 1.8.8 rather than Jackson 1.9.13 Upgrading Jackson to 1.9.13 breaks Cloudera Manager and any other Hadoop clients that were depending on the previous version of Jackson that Hadoop provided. So we don't want to ugprade this in a minor release. (cherry picked from commit 408fe46fef3485e8040182375ae74c2b42908512) commit d09f200e08c2f44255feae9db8288bb4f7e6d1eb Author: Vinod Kumar Vavilapalli Date: Thu Sep 18 10:16:18 2014 -0700 YARN-1779. Fixed AMRMClient to handle AMRMTokens correctly across ResourceManager work-preserving-restart or failover. Contributed by Jian He. (cherry picked from commit a3d9934f916471a845dc679449d08f94dead550d) (cherry picked from commit 514bfeafd93ee13c0add207d7a7a3ef946a462f7) commit 2da8520ff92c3af8d9d8e5764bf6a34a71322adb Author: Jian He Date: Tue Aug 19 17:50:48 2014 +0000 YARN-2409. RM ActiveToStandBy transition missing stoping previous rmDispatcher. Contributed by Rohith git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618916 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit aeab638ce2818a264e8469c0f5c495c5e33ad094) commit 347289df34b18824a36872b123e10626bc3bcd86 Author: Jason Lowe Date: Thu Sep 18 21:34:40 2014 +0000 YARN-2561. MR job client cannot reconnect to AM after NM restart. Contributed by Junping Du (cherry picked from commit a337f0e3549351344bce70cb23ddc0a256c894b0) (cherry picked from commit d9273a95476371b01cc366251a6c67ec2c07f4c4) commit 4a5a1b87a3e0e23008c37c65db8584c4d5c0e0a6 Author: Zhijie Shen Date: Thu Aug 14 21:19:21 2014 +0000 YARN-2397. Avoided loading two authentication filters for RM and TS web interfaces. Contributed by Varun Vasudev. svn merge --ignore-ancestry -c 1618054 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618055 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit c6e240b952cc720f94d84cb87c123822218240f1) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java Resolved conflict by dropping all AHS related changes. commit 1ac13c8580b9253d34f1ac904972f52685df3e99 Author: Karthik Kambatla Date: Tue Sep 30 16:12:27 2014 -0700 YARN-2594. Potential deadlock in RM when querying ApplicationResourceUsageReport. (Wangda Tan via kasha) (cherry picked from commit 14d60dadc25b044a2887bf912ba5872367f2dffb) (cherry picked from commit 5a43b795b77cf49e27c3c662a9b195ffb1a3e74d) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java commit 09d569450be92e5527fdc237ae3e46f7e9f3261e Author: Jason Lowe Date: Tue Sep 30 22:37:28 2014 +0000 YARN-2387. Resource Manager crashes with NPE due to lack of synchronization. Contributed by Mit Desai (cherry picked from commit feaf139b4f327d33011e5a4424c06fb44c630955) (cherry picked from commit a0305ba3fcf3c7fd5285aac4117ca80538988f89) commit b4beb256a3d8f2389d26f020b2e0d3b9f47c4e12 Author: Zhijie Shen Date: Mon Sep 22 10:41:55 2014 -0700 MAPREDUCE-5279. Made MR headroom calculation honor cpu dimension when YARN scheduler resource type is memory plus cpu. Contributed by Peng Zhang and Varun Vasudev. (cherry picked from commit b8d645539d51d3337eb1c882e0f549522dbaf3cf) commit 3b32d2b061aca1869e32f5cb73649008ffdfd962 Author: Vinod Kumar Vavilapalli Date: Mon Sep 8 14:48:21 2014 -0700 YARN-2448. Changed ApplicationMasterProtocol to expose RM-recognized resource types to the AMs. Contributed by Varun Vasudev. (cherry picked from commit b67d5ba7842cc10695d987f217027848a5a8c3d8) (cherry picked from commit b4b59ef7496758bf40f49247c5d2d3bb15fb15b6) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/YarnScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java commit 84810ff961721f1daa3a7108c007ca3cb535af3c Author: Jason Lowe Date: Wed Sep 24 16:09:33 2014 +0000 MAPREDUCE-6104. TestJobHistoryParsing.testPartialJob fails in branch-2. Contributed by Mit Desai (cherry picked from commit 7af4c3888bf7be0822dc880170e5e3d09e9280f1) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 07fbe9fab0847bc34bc95b665f1c6c7624a6d7eb Author: Karthik Kambatla Date: Mon Sep 29 11:33:44 2014 -0700 YARN-2610. Hamlet should close table tags. (Ray Chiang via kasha) (cherry picked from commit f7743dd07dfbe0dde9be71acfaba16ded52adba7) Conflicts: hadoop-yarn-project/CHANGES.txt commit 808a71655fd432185ae9135c12ce28c5946ca2a5 Author: Jason Darrell Lowe Date: Mon Aug 18 18:18:22 2014 +0000 MAPREDUCE-6036. TestJobEndNotifier fails intermittently in branch-2. Contributed by chang li git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618691 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d51f81c3b6e55feece55df5e2c052b18ca2dc768) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 37071088c8e44d6179a36b9ee1fbbc3e94d04aa0 Author: Andrew Wang Date: Mon Sep 29 15:02:29 2014 -0700 HADOOP-11153. Make number of KMS threads configurable. (wang) (cherry picked from commit 64aef189656919327b11fe5e90ea680ca7ba83df) (cherry picked from commit 758fb8465a1348cc0ac9ee412eaf09c888244aec) commit 72cf94ce66abb6c9c2c271f60270d88522600366 Author: Andrew Wang Date: Mon Sep 29 14:50:28 2014 -0700 HDFS-7122. Use of ThreadLocal results in poor block placement. (wang) (cherry picked from commit d7086c563ff2847c415913ac625b2a557eeccbdd) (cherry picked from commit 47ddaee1dbe7e027218437df674ca48d45eb55e2) commit cf008b4753a3b5a132598ed5989d1788ece103de Author: Andrew Wang Date: Mon Sep 29 14:14:22 2014 -0700 HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang) (cherry picked from 7f0efe96f85704e39349f20ab6a11bfaa81c6a75) commit 90ea3f0bf7d2e47a9bca627e6485704688a49047 Author: Zhijie Shen Date: Thu Sep 25 23:45:07 2014 -0700 MAPREDUCE-5831. Make MR client ignore unknown counters received from AM. Contributed by Junping Du. (cherry picked from commit 662fc11ae7ccea9d05dfe54b2a794bb08cfd70a4) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 17e7a1a245ec3601c95a657ccc535864d339510b Author: Andrew Wang Date: Mon Sep 29 13:10:26 2014 -0700 HADOOP-11110. JavaKeystoreProvider should not report a key as created if it was not flushed to the backing file. (Arun Suresh via wang) (cherry picked from commit a78953c974e52abe73905b1901a2354696f4a5a0) commit 033be34f9237d84a071c0419f8a596ae9735e30c Author: junping_du Date: Mon Sep 22 22:45:06 2014 -0700 YARN-2584. TestContainerManagerSecurity fails on trunk. (Contributed by Jian He) (cherry picked from commit a9a55db0650b5e6b7d88afb883b88aba7a13cd44) Conflicts: hadoop-yarn-project/CHANGES.txt commit 6926fb671ea478dfdf7f869c42fd9e58be541c52 Author: Jian He Date: Wed Aug 6 18:58:50 2014 +0000 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/trunk@1616302 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 9ebeac16eb43e46dc713af5d280cf24b8d31c933) Conflicts: hadoop-yarn-project/CHANGES.txt commit db2fc9cea2ee89faa57d7b87a288ba34730b87f8 Author: Chris Nauroth Date: Fri Aug 22 04:05:56 2014 +0000 HADOOP-10989. Merging change r1619659 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619660 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit a6f5f71a126fdf131a0673a99799c23348813361) commit 5515e8976fa335e1fe08398990fcc775a30fa391 Author: Colin McCabe Date: Mon Jul 14 17:59:23 2014 +0000 HADOOP-10780. hadoop_user_info_alloc fails on FreeBSD due to incorrect sysconf use (trtrmitya via cmccabe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610472 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 6da4b7b4e64278cb52b3ad0eec70a8746bd53110) commit 04cbc5903b632aadedf8d17456c7541ce077e232 Author: Colin McCabe Date: Tue Jul 8 18:17:28 2014 +0000 HADOOP-10781. Unportable getgrouplist usage breaks FreeBSD (Dmitry Sivachenko via Colin Patrick McCabe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608871 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 96bfab8dbcba175c4eb3c9ede0550222b2ed4340) commit 0e690d2af30a76ff10e006ab2608f52623419409 Author: Allen Wittenauer Date: Fri Aug 22 18:25:57 2014 +0000 HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619888 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 64abf822428c283144f64d9daf81edcece136308) commit fcd9910eb79abaf4e3c1c673d08a3ecb1d95fcc8 Author: Colin Patrick Mccabe Date: Wed Aug 27 19:47:02 2014 -0700 HADOOP-10957. The globber will sometimes erroneously return a permission denied exception when there is a non-terminal wildcard. (cherry picked from commit 7a167311918300b1f00868a83d2f71a1ca88e918) (cherry picked from commit 66ba7b2e7ce36c2480db312db222aa09f1ea6f1d) commit ae6ada8c11ce2a19d35156e822bebd163f2a6350 Author: Andrew Wang Date: Thu Aug 28 17:39:50 2014 -0700 HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. Contributed by Lei Xu. (cherry picked from commit 7119bd49c870cf1e6b8c091d87025b439b9468df) (cherry picked from commit 7cdb619cc5932bda8fcdb91fdce73e0194cfda03) commit f5ea46702cb9b1d3ec4be9b7998dda7d2549dd22 Author: Jason Lowe Date: Tue Sep 2 18:25:03 2014 +0000 HADOOP-11012. hadoop fs -text of zero-length file causes EOFException. Contributed by Eric Payne (cherry picked from commit 01e8f056d9b7245193e6050f9830ca058db02a6e) (cherry picked from commit 0a582c77efc761bca9c388841010dd67e49b8a26) commit 9f1102990867ad9beae8ce9c6c00c270ebe6de03 Author: Colin Patrick Mccabe Date: Wed Sep 3 19:35:39 2014 -0700 HADOOP-11056. OsSecureRandom.setConf() might leak file descriptors. Contributed by Yongjun Zhang. (cherry picked from commit 8f1a668575d35bee11f4cd8173335be5352ec620) (cherry picked from commit 7b287d5ba61c4f26e110b05ff9d739542dc8f809) commit 074fcb20fcfe12e95af7128f5adb3f02c2587768 Author: Colin Patrick Mccabe Date: Mon Sep 8 12:51:22 2014 -0700 HDFS-6036. Forcibly timeout misbehaving DFSClients that try to do no-checksum reads that extend too long. (cmccabe) (cherry picked from commit cad14aa9168112ef1ceae80b94d9aae3ba293578) (cherry picked from commit bdcf5e940fa9e0ffd99c98031e9459f9554584ad) commit ab6265906c10e1bdbaab136dd513a355c64c3bb4 Author: Colin McCabe Date: Sat Jul 26 00:02:01 2014 +0000 HDFS-6750. The DataNode should use its shared memory segment to mark short-circuit replicas that have been unlinked as stale (cmccabe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613539 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit c039bccb9211be913155070ef9ef8e251432d6b0) commit 7211192a5eeb6ceb121e30c96e8f25b038f583ef Author: Chris Nauroth Date: Sat Aug 23 05:30:59 2014 +0000 HDFS-4852. Merging change r1619967 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619968 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b2d86ebf782215d0b869ee7bf70b89cd148a0733) commit a58bb75729babea9f6689562d03ef097082b163c Author: Brandon Li Date: Tue Aug 19 22:33:23 2014 +0000 HDFS-6868. Merging change r1619001 from trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619002 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 388d6cffe5e3e83b22782553f2ee2882bef3fbe8) commit ee69f38d36c29505cae8d5ec68a4e0d14f2ded98 Author: Andrew Wang Date: Thu Jul 17 00:44:50 2014 +0000 HDFS-6690. Deduplicate xattr names in memory. (wang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611227 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit af13d4e18c773e21333d2ad12f313f6c6dbbe8c9) commit f64e0a8beb01332c93b9f9f1ffb53ef52c3f01bc Author: Andrew Wang Date: Thu Jul 3 17:14:18 2014 +0000 HDFS-6613. Improve logging in caching classes. (wang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607698 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7cb89369bb194b302b0d10b554a23006fdae0265) commit 81a1303f2c2b64f89eabca54bef3fdcb27ff3753 Author: Arpit Agarwal Date: Fri Aug 1 01:15:04 2014 +0000 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 (cherry picked from commit 5be502add3dc84a36fc289bb34a098d7e853195e) (cherry picked from commit 5a7630ece17bd5fa25078a24f315b57f6dc29839) commit 0d64db1e2756b3a03fa1ae546884c09d822ddbf0 Author: Colin Patrick Mccabe Date: Wed Aug 27 13:49:31 2014 -0700 HDFS-6902. FileWriter should be closed in finally block in BlockReceiver#receiveBlock() (Tsuyoshi OZAWA via Colin Patrick McCabe) (cherry picked from commit b6b95ff66700e4db1d8d59a31c3048cb10504262) (cherry picked from commit 01b2c9b15f812872f2797aec0fe38cc2e1e488fe) commit b2b1c33b7ef9d6df8c71162216415dde9a86bcdb Author: Andrew Wang Date: Thu Jul 3 20:11:18 2014 +0000 HDFS-6511. BlockManager#computeInvalidateWork() could do nothing. Contributed by Juan Yu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607736 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e6e54171346fe20e8820e0e32d79c8661cbae7ca) (cherry picked from commit 22ac2c87ad75671a058f07cc5e4a3ed1e2410035) commit 885d317b55d4d100e7e52ecb0aacd767b9663e5a Author: Jenkins slave Date: Fri Sep 26 09:26:29 2014 -0700 Preparing for CDH5.3.0 development commit e0bd2e4d2b3505eff13f2e91934dc022bba5422f Author: Andrew Wang Date: Thu Sep 25 22:06:23 2014 -0700 CLOUDERA-BUILD. Fix up HDFS-6826 because of HDFS-7077 changes to ClientProtocol. commit 1795885f4d0f264cd79df31b0d636bd8d9cb1df2 Author: Andrew Wang Date: Thu Sep 25 21:56:26 2014 -0700 HADOOP-11140. hadoop-aws only need test-scoped dependency on hadoop-common's tests jar. Contributed by Juan Yu. (cherry picked from commit 4ea77efa3ab4160498fec54d4824321921c15124) (cherry picked from commit 0eaa4ba02679d1a67e21b82c6c26963c1fac4d45) commit 40c30345682f0d9ecfc81a2072e4355b4e7a1c75 Author: Andrew Wang Date: Thu Sep 25 18:40:40 2014 -0700 HDFS-7077. Separate CipherSuite from crypto protocol version. (wang) (cherry picked from commit e96ce6f3e3e549202ce3c48d4733ba34098870ad) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (cherry picked from commit 3f71a158137940f2f3b985a7e72450705953352c) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java commit 9962def5eeffa21e74547b48cf6138a363c3fe4a Author: Zhijie Shen Date: Thu Sep 18 21:56:56 2014 -0700 YARN-2568. Fixed the potential test failures due to race conditions when RM work-preserving recovery is enabled. Contributed by Jian He. (cherry picked from commit 6fe5c6b746a40019b9a43676c33efec0f971c4b9) Conflicts: hadoop-yarn-project/CHANGES.txt commit 9d292cc542107f0585c8517444b3505ea77fb270 Author: Karthik Kambatla Date: Thu Sep 25 17:42:47 2014 -0700 YARN-2608. FairScheduler: Potential deadlocks in loading alloc files and clock access. (Wei Yan via kasha) (cherry picked from commit f4357240a6f81065d91d5f443ed8fc8cd2a14a8f) commit 7c22ef51b0d5a4d0e57055777988c8c0ecb5242b Author: Allen Wittenauer Date: Thu Sep 25 11:32:35 2014 -0700 MAPREDUCE-6093. minor distcp doc edits (Charles Lamb via aw) (cherry picked from 7ffb636a54d665dba3a2ced959d5cfa0958980cc) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm commit 09d49fb5f049382f5740a7b7fd2f8715cd067906 Author: Allen Wittenauer Date: Thu Sep 25 11:28:50 2014 -0700 MAPREDUCE-6109. Fix minor typo in distcp -p usage text (Charles Lamb via aw) (cherry picked from afde00a0f5f8311f292eaeba3ece8d4e44c46285) commit 916d95bb6d8eae7742f0f2c4beded1b50d17d60a Author: Jian He Date: Mon Sep 22 10:30:53 2014 -0700 YARN-1372. Ensure all completed containers are reported to the AMs across RM restart. Contributed by Anubhav Dhoot (cherry picked from commit 0a641496c706fc175e7bf66d69ebf71c7d078e84) (cherry picked from commit 3ce97a9efd5d17365f78d8122b751dc4607edf77) Conflicts: hadoop-yarn-project/CHANGES.txt commit 9ac550d7c8a7f8942eb8d7623e1ebc25bd6fcaab Author: Vinod Kumar Vavilapalli Date: Thu Sep 18 11:03:12 2014 -0700 YARN-2001. Added a time threshold for RM to wait before starting container allocations after restart/failover. Contributed by Jian He. (cherry picked from commit 485c96e3cb9b0b05d6e490b4773506da83ebc61d) (cherry picked from commit d24ef142b7e460bba22c21fc08011a21b15e638c) Conflicts: hadoop-yarn-project/CHANGES.txt commit 9149588c7083fd4722d511fee50d3edae5f866e9 Author: Jian He Date: Wed Sep 17 15:12:17 2014 -0700 YARN-2558. Updated ContainerTokenIdentifier#read/write to use ContainerId#getContainerId. Contributed by Tsuyoshi OZAWA. (cherry picked from commit f4886111aa573ec928de69e8ca9328d480bf673e) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 3746b1e9053cf73ae1b6edc8d7aa0c4b38496fce) Conflicts: hadoop-yarn-project/CHANGES.txt commit 6bfb947312eaf676a7316d7542a848ba04743603 Author: Vinod Kumar Vavilapalli Date: Sat Sep 13 18:04:05 2014 -0700 YARN-611. Added an API to let apps specify an interval beyond which AM failures should be ignored towards counting max-attempts. Contributed by Xuan Gong. (cherry picked from commit 14e2639fd0d53f7e0b58f2f4744af44983d4e867) (cherry picked from commit 5cdb24d4b17632036a5369f791068ee8f53ff63e) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/TestHistoryFileManager.java hadoop-yarn-project/CHANGES.txt commit 211bfb5b34fe52e599b1fc030d432340b515eb8c Author: XuanGong Date: Fri Sep 12 15:24:02 2014 -0700 YARN-2456. Possible livelock in CapacityScheduler when RM is recovering apps. Contributed by Jian He (cherry picked from commit add5ac6a73aa29712ec935d47e22158f96789aab) Conflicts: hadoop-yarn-project/CHANGES.txt commit d21bad6f1724eed0a0b06f8c323a98a3cb18a1f4 Author: Jian He Date: Fri Sep 12 10:33:33 2014 -0700 YARN-2229. Changed the integer field of ContainerId to be long type. Contributed by Tsuyoshi OZAWA (cherry picked from commit 3122daa80261b466e309e88d88d1e2c030525e3f) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/preemption/CheckpointAMPreemptionPolicy.java (cherry picked from commit f21a5236e5716f2f78bccb45b1428a679780f05a) Conflicts: hadoop-yarn-project/CHANGES.txt commit 9524a8a1826fe1778fd8fe99fd4e6bf75a37e0a9 Author: Jian He Date: Wed Sep 10 18:19:53 2014 -0700 YARN-415. Capture aggregate memory allocation at the app-level for chargeback. Contributed by Eric Payne & Andrey Klochkov (cherry picked from commit 83be3ad44484bf8a24cb90de4b9c26ab59d226a8) (cherry picked from commit ceae7be6b281df2c1d4ec4e14a3dd8d5f11ef3fa) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/RMStateStoreTestBase.java commit 9b4b299eed6afca8149790ad883313d8f7974b40 Author: Jian He Date: Sun Sep 7 18:25:44 2014 -0700 YARN-2515. Updated ConverterUtils#toContainerId to parse epoch. Contributed by Tsuyoshi OZAWA (cherry picked from commit 0974f434c47ffbf4b77a8478937fd99106c8ddbd) (cherry picked from commit c17810a84c98c808403fe4caf4532efa1e781221) Conflicts: hadoop-yarn-project/CHANGES.txt commit 04da2c8e7c1aefbe691c589396e70e104b3c1df4 Author: Jian He Date: Fri Aug 29 23:05:51 2014 -0700 YARN-1506. Changed RMNode/SchedulerNode to update resource with event notification. Contributed by Junping Du (cherry picked from commit 5c14bc426b4be381383018ebc2236be83eef15cd) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 38853c97c2da1e66eb211235b0dfa73b2a9ebbdf) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java commit 23a72599e7529cb68d776d6ca7352315120f9e70 Author: Jian Date: Thu Aug 28 21:47:26 2014 -0700 YARN-2406. Move RM recovery related proto to yarn_server_resourcemanager_recovery.proto. Contributed by Tsuyoshi OZAWA (cherry picked from commit 7b3e27ab7393214e35a575bc9093100e94dd8c89) (cherry picked from commit 518ba11843f389205308409dd3a9054d27132b64) commit b416a79f7cc94dfbfa17583139c7f8956db3a931 Author: Xuan Gong Date: Fri Aug 8 21:37:35 2014 +0000 YARN-2212 ApplicationMaster needs to find a way to update the AMRMToken periodically. Contributed by Xuan Gong git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616891 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 4365c4530b1cfb4ac938809da3b0718e85cb0022) Conflicts: hadoop-yarn-project/CHANGES.txt commit d0aad37f60c18c2ce136bfaa0b559f40d5cdf8a4 Author: Aaron T. Myers Date: Wed Sep 24 18:22:40 2014 -0700 CLOUDERA-BUILD. EXPERIMENTAL. Commit version 7.6 of HDFS-6826. commit 0b4692da85cc7b2f4bc46de5c83ff701a10ae1e0 Author: Tsz-wo Sze Date: Thu Jul 10 06:17:55 2014 +0000 svn merge -c 1609401 from trunk for HDFS-6643. Refactor INodeWithAdditionalFields.PermissionStatusFormat and INodeFile.HeaderFormat. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609402 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 52a07f1a39fb412518dd9102f000177f657b8ef1) commit 3fa3ee84be46666878abf2f2118f94220778eacb Author: Haohui Mai Date: Tue Jul 8 00:08:18 2014 +0000 HDFS-6609. Use DirectorySnapshottableFeature to represent a snapshottable directory. Contributed by Jing Zhao. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1608631 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b68818c4f085f6657f96c10e975c2b1f27362108) commit dbbdd46e948e36f0597f6e77f5270dc4022bdc69 Author: Karthik Kambatla Date: Wed Sep 24 15:23:31 2014 -0700 YARN-2596. TestWorkPreservingRMRestart fails with FairScheduler. (kasha) (cherry picked from commit 39c87344e16a08ab69e25345b3bce92aec92db47) (cherry picked from commit 30165d4cdd88f191a98f8bb0594669585d75ae81) commit cd5286376375c183addcd8c6eec28c8e17e9c168 Author: Zhijie Shen Date: Fri Jul 11 08:49:54 2014 +0000 MAPREDUCE-5956. Made MR AM not use maxAttempts to determine if the current attempt is the last retry. Contributed by Wangda Tan. svn merge --ignore-ancestry -c 1609649 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609650 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit bba266610cbdae66e0af8eb3ae4c8e308c0e2603) commit fb7541ec45594ac5979367f3f2298752f1cbb3ac Author: Jason Lowe Date: Thu Sep 18 20:13:16 2014 +0000 YARN-2363. Submitted applications occasionally lack a tracking URL. Contributed by Jason Lowe (cherry picked from commit 9ea7b6c063c0bdd4551962e21d0173f671e9df03) (cherry picked from commit 44c22c3d8d9966e72e5f350c933c5d3ea9eb9465) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java commit 87d3b52a6370b9e231fcb5d5a9c9aa15752ac7c6 Author: Jian He Date: Thu Sep 11 21:31:09 2014 -0700 YARN-2541. Fixed ResourceManagerRest.apt.vm table syntax error. Contributed by Jian He (cherry picked from commit 5633da2a018efcfac03cc1dd65af79bce2f1a11b) (cherry picked from commit f580586ab7572b16ba8ac5b47e90b96c8766f2cd) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm commit c2cc5a3420484462ee47e2cc26956614b6d495dd Author: XUAN Date: Wed Sep 10 11:51:57 2014 -0700 YARN-2459. RM crashes if App gets rejected for any reason and HA is enabled. Contributed by Jian He (cherry picked from commit b91ef0c502d2d0c98d8c66fa1a4e37cde5f07d24) commit f82a796710b0399863d54d2ee2bbbc96d139db6f Author: Andrew Wang Date: Wed Sep 24 16:40:20 2014 -0700 HDFS-7139. Unit test for creating encryption zone on root path. (Zhe Zhang via wang) (cherry picked from commit 63198bfba7b899b33f26c079bc8241dad1bdbc57) (cherry picked from commit a17544e5e38d0462e788669e50d34b88d5cc4c33) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 6de9d4d45583b70e21742e7b7f7baae58e4f37cf Author: Andrew Wang Date: Wed Sep 24 12:04:22 2014 -0700 HDFS-6987. Move CipherSuite xattr information up to the encryption zone root. (Zhe Zhang via wang) (cherry picked from commit 3cf28210ecf3ff550d1c4ded8a71bac80d919175) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit c1e02a6996827c5c1adb1622110da950ce424c5d Author: Andrew Wang Date: Wed Sep 24 16:45:29 2014 -0700 HDFS-7138. Fix hftp to work with encryption. (clamb via wang) (cherry picked from 835ade7064ec54f840cc069a642462cf11be8beb) commit fc5d03864ee29dec432de6bf8ab184b04b1d7e58 Author: Karthik Kambatla Date: Wed Sep 24 15:54:47 2014 -0700 CLOUDERA-BUILD. Revert "Merge -c 1584954 from trunk to branch-2 to fix YARN-1898. Addendum patch to ensure /jmx and /metrics are re-directed to Active RM." This reverts commit 8a8afe468b1e488b9d6e1736d05076df7d1ece61. commit c905d3468330d71230eb7b865e3456e25f8656c0 Author: Colin Patrick Mccabe Date: Tue Sep 23 14:56:51 2014 -0700 CDH-21635. CLOUDERA BUILD. Rolling upgrade fix for QJM clusters. commit 65d32356ffcbb5fa4e4490159fc06ee94ead5558 Author: Haohui Mai Date: Wed Sep 24 12:05:19 2014 -0700 HDFS-7049. TestByteRangeInputStream.testPropagatedClose fails and throw NPE on branch-2. Contributed by Juan Yu. (cherry picked from commit 53c2288dc649c0b9d021c81998a33e0bd687d896) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 91007d2020e671bc9f1cdbf78b7a480093c974c0 Author: Yongjun Zhang Date: Tue Sep 23 13:38:03 2014 -0700 CLOUDERA-BUILD. Relax HDFS-6776 requirement so user doesn't need to upgrade insecure cluster commit ceb206ce879a7154a4dc80b7f16033fb9df54109 Author: Sean Mackrory Date: Fri Jul 25 15:51:09 2014 -0700 CLOUDERA-BUILD. Embedding internal git repo hash in Hadoop commit 2a5a3d6afe7a03fdbbd13b1d80a17d91cdcd6dbd Author: Dave Wang Date: Tue Sep 23 22:11:22 2014 -0700 CDH-21785 CLOUDERA.BUILD Add hadoop-aws dependency to hadoop-client commit 92ec359ff54cc3e5223e7d138afda14a76029e48 Author: Karthik Kambatla Date: Sun Sep 21 23:13:45 2014 -0700 YARN-2453. TestProportionalCapacityPreemptionPolicy fails with FairScheduler. (Zhihai Xu via kasha) (cherry picked from commit 9721e2c1feb5aecea3a6dab5bda96af1cd0f8de3) Conflicts: hadoop-yarn-project/CHANGES.txt commit 195873cd846c3afc19b1296931f3c5664c699180 Author: Karthik Kambatla Date: Tue Sep 23 17:07:32 2014 -0700 HADOOP-11017. Addendum to fix RM HA. KMS delegation token secret manager should be able to use zookeeper as store. (Arun Suresh via kasha) (cherry picked from commit ef784a2e08c2452026a85ae382a956ff7deecbd0) (cherry picked from commit b34858c1f88969a74accb7b45f63fd18da01b432) commit 5e781e055f6683fd638626264c55a9dad4f8604c Author: Jason Lowe Date: Thu Sep 18 21:56:46 2014 +0000 MAPREDUCE-5891. Improved shuffle error handling across NM restarts. Contributed by Junping Du (cherry picked from commit 2c3da25fd718b3a9c1ed67f05b577975ae613f4e) (cherry picked from commit 44c711313311bc2c38adc66bca11a100bd7ce4d0) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 7c882948629d0c8f08d86112d2c456ffc068f0ef Author: Zhijie Shen Date: Mon Aug 18 17:59:32 2014 +0000 MAPREDUCE-6024. Shortened the time when Fetcher is stuck in retrying before concluding the failure by configuration. Contributed by Yunjiong Zhao. svn merge --ignore-ancestry -c 1618677 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618679 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 570183a4375f48c3e12be381d450c41b2a6c8031) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 240071f97e12ffe2eb181fa968566c4d388deae6 Author: Jing Zhao Date: Wed Aug 6 19:15:04 2014 +0000 HDFS-6791. A block could remain under replicated if all of its replicas are on decommissioned nodes. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616311 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 5c7571fa3f9a76631d602ef8773e5290bb4c269e) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 0692ecd1901cede23aff52e5107f668e5457c2a3 Author: Andrew Wang Date: Tue Sep 23 14:10:02 2014 -0700 HDFS-7132. hdfs namenode -metadataVersion command does not honor configured name dirs. Contributed by Charles Lamb. (cherry picked from f48686a1ad81823000534665a76264bba51182f4) commit 1ec6ba49b3d9916872ef49aef4dade74c3001980 Author: Colin McCabe Date: Wed Jul 23 20:59:39 2014 +0000 HDFS-6114. Block Scan log rolling will never happen if blocks written continuously leading to huge size of dncp_block_verification.log.curr (vinayakumarb via cmccabe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612943 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit b770a69f619afb7882b8978715f47ef022e2a86b Author: Karthik Kambatla Date: Mon Sep 22 23:49:39 2014 -0700 YARN-1959. Fix headroom calculation in FairScheduler. (Anubhav Dhoot via kasha) (cherry picked from commit 568d3dc2bbe43b7d2833d5da2b0e6d75eb86e5dd) (cherry picked from commit 8ba8521de5bc8ddefd60196eda814d2e59432b2f) Conflicts: hadoop-yarn-project/CHANGES.txt commit d43b4ed4c811138f1f949f74242477e9e41427e1 Author: Karthik Kambatla Date: Tue Sep 23 00:03:16 2014 -0700 YARN-2252. Intermittent failure of TestFairScheduler.testContinuousScheduling. (Ratandeep Ratti and kasha via kasha) (cherry picked from commit f5578207d2d20aa71adf12aa9f6c37b00ee9b8dc) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java commit ec16a051a939868791f7e57fd821429fc3004311 Author: Karthik Kambatla Date: Sun Sep 21 13:14:01 2014 -0700 YARN-2452. TestRMApplicationHistoryWriter fails with FairScheduler. (Zhihai Xu via kasha) (cherry picked from commit c50fc92502934aa2a8f84ea2466d4da1e3eace9d) commit e7e86919faecb61d66bc425d186546d2c5be406e Author: Jian He Date: Thu Jul 10 20:03:35 2014 +0000 YARN-2181. Added preemption info to logs and RM web UI. Contributed by Wangda Tan git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1609561 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit c9fb040c87423acb754fb7c3605d38dcf07b22ee) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairSchedulerTestBase.java commit 6d73a4e0778376cbe104df4773a68c5830fd8c0d Author: Karthik Kambatla Date: Mon Sep 22 16:09:52 2014 -0700 YARN-2539. FairScheduler: Set the default value for maxAMShare to 0.5. (Wei Yan via kasha) (cherry picked from commit 43efdd30b52f4ee8967a03dac4d548095d6cafdb) commit fd8d4ff4c6ddf5e9997e382717886d33a597cceb Author: Karthik Kambatla Date: Mon Sep 22 15:40:47 2014 -0700 YARN-2540. FairScheduler: Queue filters not working on scheduler page in RM UI. (Ashwin Shankar via kasha) (cherry picked from commit 23e17ce0ffba11a08c033b753573a756532cd1c2) commit 929507f8ec30570ce8c81e8abb13e572236236f1 Author: Karthik Kambatla Date: Thu Aug 28 23:21:37 2014 -0700 YARN-2405. NPE in FairSchedulerAppsBlock. (Tsuyoshi Ozawa via kasha) (cherry picked from commit fa80ca49bdd741823ff012ddbd7a0f1aecf26195) commit 39e3f0ffc13573570e1f7e44856e2f58c6795b68 Author: Andrew Wang Date: Thu Sep 11 10:32:20 2014 -0700 HDFS-6621. Hadoop Balancer prematurely exits iterations. Contributed by Rafal Wodjdyla and Benjamin Bowman. (cherry picked from commit d1dab6cc63abf5d44533ad9b39e32c582327627b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 20409a5a1cb6f845ccdca088a67e70195a7cfc8a Author: Alejandro Abdelnur Date: Tue Sep 9 22:16:42 2014 -0700 HDFS-6776. Using distcp to copy data between insecure and secure cluster via webdhfs doesn't work. (yzhangal via tucu) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit ca3e119f48afbe92b301751f2de4e2bd532806fd Author: Colin Patrick Mccabe Date: Wed Sep 3 19:30:30 2014 -0700 HDFS-6959 Make the HDFS home directory location customizable. Contributed by Yongjun Zhang Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml commit bba7867dcff4d62e62afdb7f0514195c03d2eaa6 Author: Jing Zhao Date: Mon Aug 11 18:02:57 2014 +0000 HDFS-6837. Merge r1617337 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617338 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit f5cf51138308c6ea54c6f9e2b0788f25d1b1a9f9 Author: Jing Zhao Date: Fri Aug 8 21:35:44 2014 +0000 HDFS-6828. Merge r1616889 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616890 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit b7b1b22ac3bd0398fc9be23cd848d20e4b2e51bc Author: Tsz-wo Sze Date: Thu Aug 7 07:23:06 2014 +0000 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 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit df8fb2c795e171ebb7f89ee3b0c45b5eb559dbbb Author: Tsz-wo Sze Date: Fri Aug 1 14:15:57 2014 +0000 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 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 4965876776cbf0d57c58a2bd82651b06c4a82cbe Author: Arpit Agarwal Date: Fri Aug 1 07:12:59 2014 +0000 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 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 3f74a00fa43e2ec6e1eed2974ee3bb4e8d8ee93a Author: Tsz-wo Sze Date: Fri Aug 1 01:12:24 2014 +0000 svn merge -c 1615015 from trunk for HDFS-6685. Balancer should preserve storage type of replicas. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615016 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 35a19a241945fb0d4bb65ad3d4630a7eabf5ca41 Author: Arpit Agarwal Date: Thu Jul 31 06:52:56 2014 +0000 HDFS-6441: Merging r1614812 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614815 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit e3d40bb624a783f943a34aa201ac91e466874e67 Author: Arpit Agarwal Date: Thu Jul 31 06:44:48 2014 +0000 HDFS-3482. Merging r1358812 from trunk to branch-2 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614814 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit d4b5987d0513fd41f7502f967f05929597be0896 Author: Colin Patrick Mccabe Date: Thu Sep 18 11:42:23 2014 -0700 HDFS-7047. Expose FileStatus#isEncrypted in libhdfs (cmccabe) (cherry picked from commit 570b8b468e1a75ad29c674699f0f4fe34d919ed9) (cherry picked from commit 2b1c9c62100454ec8b7a8cc0f8268d9c5ba4ee51) commit b2820d9ac17f9b97dc931bb2cd05af99746b0cac Author: Chris Nauroth Date: Fri Aug 8 16:29:07 2014 +0000 HDFS-573. Merging change r1616814 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616817 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 97dd53a6089b285cde2ef0017e9dd97e499c3be5) commit 6f841e6b0db9538f31b9ba1f063a3bbae6a71319 Author: Colin Patrick Mccabe Date: Fri Sep 19 09:16:05 2014 -0700 HDFS-7096. Fix TestRpcProgramNfs3 to use DFS_ENCRYPTION_KEY_PROVIDER_URI (clamb via cmccabe) (cherry picked from commit 25fd69a8f9defb21a5c0e3b7243657d9e8080319) (cherry picked from commit 5520ca6ec3b366d9fbece1fc5b9e35c6383b94df) commit 2c4fa9acef335209c40855fa330f2cddb1b7d5f6 Author: Andrew Wang Date: Thu Sep 18 14:57:25 2014 -0700 HDFS-7003. Add NFS Gateway support for reading and writing to encryption zones. (clamb via wang) (cherry picked from commit 70be56d093022de9953e14a92dfa1a146bd9a290) (cherry picked from commit 47c9dcfe8eb425ad77b72900c69df56f39fd1889) commit 216c41b0e2d7c86fa130c6819d92898ceba52fb6 Author: Haohui Mai Date: Tue Sep 2 16:22:18 2014 -0700 HDFS-6942. Fix typos in log messages. Contributed by Ray Chiang. (cherry picked from 786b43c7a33f4a89fb5fcf65d6745c56253b1dac) commit 7120ded4e8c4e07362d22d7fa4ee0730de6b2e11 Author: brandonli Date: Wed Aug 27 11:06:01 2014 -0700 HDFS-6892. Add XDR packaging method for each NFS request. Contributed by Brandon Li (cherry picked from commit cd9182d8b5f60428f6c91b0eb0b2e61d52a07020) (cherry picked from commit 99d8434511faf1dec61a0528c8b6600e642ef454) commit 01618ec10a9553a5404f0961344b36b245772514 Author: Brandon Li Date: Thu Aug 21 18:03:55 2014 +0000 HDFS-6890. Merging change r1619500 from trunk (cherry picked from d887700240caaea9c7ca1026860754611cba8ccc) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619501 13f79535-47bb-0310-9956-ffa450edef68 commit 7397c8956aefa0e59af1012b3d5dccad795c73bb Author: Brandon Li Date: Mon Aug 11 21:38:33 2014 +0000 HDFS-6582. Merging change r1617366 from trunk (cherry picked from afa125ccfd6f0d30405237885274da8dc585503d) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617369 13f79535-47bb-0310-9956-ffa450edef68 commit d21304a4e494cf75ca9b4ec5337a7805f5b14100 Author: Brandon Li Date: Mon Aug 4 17:44:45 2014 +0000 HDFS-6451. Merging change r1615702 from trunk (cherry picked from 225febccc1a810e7647052c0c181c305d56a6548) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615708 13f79535-47bb-0310-9956-ffa450edef68 commit 8bc013fdd6e6ead91bb5b569b2c064fdea0bffba Author: Brandon Li Date: Wed Jul 23 21:37:55 2014 +0000 HDFS-6455. Merging change r1612947 from trunk git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612949 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from 4a8ac2184144e387e194e398b7577e4c30019cfb) commit 684675201a48b2039479d51136c867c7cf5c31b8 Author: Kihwal Lee Date: Fri Sep 19 17:07:06 2014 -0500 HDFS-7046. HA NN can NPE upon transition to active. Contributed by Kihwal Lee. (cherry-picked from 9e355719653c5e7b48b601090634882e4f29a743) commit 1b0b27743f744f84a62d2c687577e6b485dc4819 Author: Alejandro Abdelnur Date: Sat Sep 20 08:20:34 2014 -0700 HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-project/pom.xml commit 2250a9a4f6aea17a449d2ffd12c5beca1ac66801 Author: Andrew Wang Date: Fri Sep 19 17:42:00 2014 -0700 HADOOP-11112. TestKMSWithZK does not use KEY_PROVIDER_URI. (tucu via wang) (cherry picked from commit b6ceef90e52c05fd95bfb40bff61fa7e1802787f) (cherry picked from commit eec927f3fcce172aee82a6c51f358fec86e6ba47) commit e59d621d8497aa54d2a4265670f909099896d7fb Author: Karthik Kambatla Date: Fri Sep 19 11:58:57 2014 -0700 MAPREDUCE-6088. TestTokenCache tests should use their own JobConf instances. (Zhihai Xu via kasha) (cherry picked from commit c7926058050bb679ab8891110e874df54c989e9a) Conflicts: CHANGES.txt src/test/org/apache/hadoop/mapreduce/security/TestTokenCache.java commit 64beac098c3ec6ab0321d17e654ac751a7e6be0d Author: Alejandro Abdelnur Date: Tue Sep 9 22:19:42 2014 -0700 HADOOP-9989. Bug introduced in HADOOP-9374, which parses the -tokenCacheFile as binary file but set it to the configuration as JSON file. (zxu via tucu) (cherry picked from commit b100949404843ed245ef4e118291f55b3fdc81b8) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 1a12fd32c522d1f9f3171b6e09cce224521539c1 Author: Karthik Kambatla Date: Thu Sep 11 12:06:06 2014 -0700 YARN-2534. FairScheduler: Potential integer overflow calculating totalMaxShare. (Zhihai Xu via kasha) (cherry picked from commit c11ada5ea6d17321626e5a9a4152ff857d03aee2) Conflicts: hadoop-yarn-project/CHANGES.txt commit 1000a064b621f9bac237763e08ed27cdce68ea03 Author: Karthik Kambatla Date: Thu Sep 18 15:41:55 2014 -0700 MAPREDUCE-6086. mapreduce.job.credentials.binary should allow all URIs. (Zhihai Xu via kasha) (cherry picked from commit 52945a33cc3fcb3b961cce0e7e3ca01291f2a223) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 8ca23d3c6d816ad30f2673966798329ff0b74b19 Author: Andrew Wang Date: Fri Sep 19 14:54:37 2014 -0700 HADOOP-10970. Cleanup KMS configuration keys. (wang) (cherry picked from commit adf0b67a7104bd457b20c95ff78dd48753dcd699) (cherry picked from commit ee508c1b32c7b885fd45df0407c3b7deea734381) commit 8b1d66a89a7214e040d2ca557e17c24404241a3a Author: Aaron T. Myers Date: Thu Sep 18 17:59:36 2014 -0700 HADOOP-11109. Site build is broken. Contributed by Jian He. (cherry picked from commit 0e2b64f2029cabbbf05a132625244427f8bf9518) (cherry picked from commit 71e6a4a735222c25bd0be7f6811863613ece3114) commit ec7a5b0f6204bcb1d8a10b3b69cb290491a64a2d Author: Colin Patrick Mccabe Date: Mon Sep 15 14:47:27 2014 -0700 HDFS-6912. SharedFileDescriptorFactory should not allocate sparse files (cmccabe) (cherry picked from commit 8008f0e8191b1c7adbed96ed4c380208e3a37692) (cherry picked from commit b4d9aca066a09f3536d2df2de21744e02cbed0dd) commit 529d8160ac51bed319f232c4566c474e0d471997 Author: arp Date: Mon Sep 8 21:20:55 2014 -0700 HDFS-6981. Fix DN upgrade with layout version change. (Arpit Agarwal) (Cherry picked from commit f949f6b54825dac61511a5761837e2fd14437239) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolSliceStorage.java commit 29b326491ccac2e47771179a65e1017d4831bb5b Author: Brandon Li Date: Mon Aug 18 21:23:08 2014 +0000 HDFS-6569. OOB message can't be sent to the client when DataNode shuts down for upgrade. Contributed by Brandon Li git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618742 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit d1339100c62e31175b98c6a0c7bfdda765453c27 Author: Kihwal Lee Date: Fri Sep 19 09:01:27 2014 -0500 HDFS-7065. Pipeline close recovery race can cause block corruption. Contributed by Kihwal Lee. (cherry picked from commit bf27b9ca574592ef603e126bacb9b6a37c9eb5c6) (cherry picked from commit 35fccfda3ebc9f7b7c271e7897f666f5aa980ea7) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 1cd51f58b137e993f17b39191fe2751987fc0215 Author: Andrew Wang Date: Thu Sep 18 17:49:17 2014 -0700 HDFS-6840. Clients are always sent to the same datanode when read is off rack. (wang) (cherry picked from commit 8e73084491c9f317bc8cc3590f93ca67a63687a8) (cherry picked from commit 58d9cc0914f3648f387057e9880a3cb7b09cc4f5) commit e1d29e11aa9f1590add7741756d1ee2bc1b84b65 Author: Andrew Wang Date: Fri Aug 15 05:52:28 2014 +0000 HADOOP-10964. Small fix for NetworkTopologyWithNodeGroup#sortByDistance. Contributed by Yi Liu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618104 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit a09f101b1bcfb33ef30480bd18e873fef7604169) commit 1d7bc205fe6c80a000588525ce0879dd867895a0 Author: Andrew Wang Date: Thu Sep 18 17:35:24 2014 -0700 HDFS-6970. Move startFile EDEK retries to the DFSClient. (wang) (cherry picked from commit 20a076bafce548298729bab4fb81d12f829e8f7e) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (cherry picked from commit ef693b541cc541bd048783c2acbe4751e45806f3) commit fb1a23e7836335e462de26f134ded1b44249fc87 Author: Jian He Date: Thu Jul 17 19:01:27 2014 +0000 Merge r1611434 from trunk. MAPREDUCE-5910. Make MR AM resync with RM in case of work-preserving RM-restart. Contributed by Rohith git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611436 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 99805f5eacd33155fcf8b0c119b6cb38732606b0) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit d99b3ec0c37274cb2f93d7d497c099f3632f3b92 Author: Alejandro Abdelnur Date: Thu Sep 18 16:03:38 2014 -0700 KMS: Support for multiple Kerberos principals. (tucu) (cherry picked from commit fad4cd85b313a1d2378adcf03cad67e946a12cd5) (cherry picked from commit 22f4ef4fa9c3820797eed050d48a2780ddfa659a) commit b4f62f114eccb60eb0dab47d5f67575ddb878089 Author: Jason Lowe Date: Thu Sep 18 21:00:53 2014 +0000 MAPREDUCE-6090. mapred hsadmin getGroups fails to connect in some cases. Contributed by Robert Kanter (cherry picked from commit 1cf31980474bf9ac28e51b6f014eae09eda9e15f) (cherry picked from commit 4b4e44a8aade35df406fa0ded020a357c92f1e73) commit 4cc495d7c9fc604a8b5296032e7cef8eeb2f6b89 Author: Andrew Wang Date: Thu Sep 18 14:51:08 2014 -0700 HADOOP-11106. Document considerations of HAR and Encryption. (clamb via wang) (cherry picked from commit fe2f54d4cbd4b02bc3b8f642d0689b17dbfe169b) commit 5ec16e1af4454392bf724efac2a7463679fac308 Author: Andrew Wang Date: Wed Sep 17 21:28:05 2014 -0700 HDFS-7078. Fix listEZs to work correctly with snapshots. (wang) (cherry picked from commit 0ecefe60179968984b1892a14411566b7a0c8df3) (cherry picked from commit 008e2f68f1a929f6fcaa5ae71ccd0eeac8ecdf95) commit 4f65697948f5f0249ae1d15d9ba97408aff497d2 Author: Andrew Wang Date: Wed Sep 17 20:14:40 2014 -0700 HDFS-7004. Update KeyProvider instantiation to create by URI. (wang) (cherry picked from commit 10e8602f32b553a1424f1a9b5f9f74f7b68a49d1) (cherry picked from commit b477d30e63bfb4ce9a660f5ffe88801758e7a985) commit 91ee585abd798ccd2d135159566e7d3093230e64 Author: Andrew Wang Date: Wed Sep 17 17:58:56 2014 -0700 HADOOP-11040. Return value of read(ByteBuffer buf) in CryptoInputStream is incorrect in some cases. (Yi Liu via wang) (cherry picked from commit 47e5e19831a363aa4d675fd23ab0d06e86809094) (cherry picked from commit a3aab30d6fefd9493248d9b37dd9097f4c628f9a) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 3e852f8b8bddf32c16944013cd3c38baa007f0ab Author: cnauroth Date: Sun Sep 7 08:39:20 2014 -0700 HDFS Credential Provider related Unit Test Failure. Contributed by Xiaoyu Yao. (cherry picked from commit a23144fd8a1e399e431f2f272388ec109df37ab1) (cherry picked from commit b87d1d7d0abd73da2a2bf548404a517a53ac9eb0) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java commit 094842e5003e799e95e27d788ce7a06d8a6ffb02 Author: Jing Zhao Date: Fri Sep 5 10:40:02 2014 -0700 HDFS-6376. Distcp data between two HA clusters requires another configuration. Contributed by Dave Marion and Haohui Mai. (cherry picked from commit a074342b4c9c192f419e159301ed378d2e0e7ca6) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 23a96c027db8272ebb8c1509c692c9e1cbaf4606 Author: Brandon Li Date: Wed Aug 6 01:13:36 2014 +0000 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 (cherry picked from commit 5e3640eb4ff5a297d11c7ef6b578f7314701baff) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 138d22e5b739c60e75319a1c8798ef391abb3c34 Author: Alejandro Abdelnur Date: Wed Sep 17 14:27:35 2014 -0700 HADOOP-11016. KMS should support signing cookies with zookeeper secret manager. (tucu) (cherry picked from commit 123f20d42f6acffcde05392d689acd91a82462db) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 128b4dcb34079718522bddedcfea323c1d44ca70 Author: Alejandro Abdelnur Date: Tue Sep 16 21:29:09 2014 -0700 HADOOP-11099. KMS return HTTP UNAUTHORIZED 401 on ACL failure. (tucu) (cherry picked from commit e4ddb6da15420d5c13ec7ec99fed1e44b32290b0) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit de528769f2d436567bcb305e92b177a27fa1bf71 Author: Colin Patrick Mccabe Date: Wed Sep 17 14:27:32 2014 -0700 HDFS-7075. hadoop-fuse-dfs fails because it cannot find JavaKeyStoreProvider$Factory. (cmccabe) (cherry picked from commit f23024852502441fc259012664e444e5e51c604a) (cherry picked from commit 0ad613c369bb7ee7f23c2294799483b9eff58b30) commit 243ed831af9469cddc07a5d849e5247f2b615599 Author: Colin Patrick Mccabe Date: Wed Sep 17 12:55:35 2014 -0700 HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe) (cherry picked from commit e3803d002c660f18a5c2ecf32344fd6f3f491a5b) commit 09bee171f7d7bb9c83bd214f5eece957eb07eee4 Author: Robert Kanter Date: Wed Sep 17 11:43:24 2014 -0700 MR1: CLOUDERA-BUILD. A new simple fix to allow native libs to build on Ubuntu 14.04 (CDH-20987) commit 6ebb82e205c80a992a11b2a64104bae4ef1865f4 Author: Andrew Wang Date: Wed Sep 17 11:23:47 2014 -0700 HDFS-6705. Create an XAttr that disallows the HDFS admin from accessing a file. (clamb via wang) (cherry picked from commit ea4e2e843ecadd8019ea35413f4a34b97a424923) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java commit 2ce7ac3b076a4aa182b0e70b7f5e103d290a81d2 Author: Andrew Wang Date: Tue Sep 16 16:29:35 2014 -0700 HDFS-6851. Refactor EncryptionZoneWithId and EncryptionZone. (clamb via wang) (cherry picked from commit 33ce887c20ec806ace02063e42599c3db76b536a) commit c13f75e21d8879af088e73edd98e5498072f408e Author: Andrew Wang Date: Tue Sep 16 17:02:06 2014 -0700 HDFS-6789. TestDFSClientFailover.testFileContextDoesntDnsResolveLogicalURI and TestDFSClientFailover.testDoesntDnsResolveLogicalURI failing on jdk7. Contributed by Akira Ajisaka. (cherry picked from commit a044407b5c3a2914a055812cb570218f69edae9b) (cherry picked from commit fcd181bde19f4b690880b60da6438e6a2bab4bdc) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 744ee4c89fe2829c4c4e2f5d8101a497eb4ab8f0 Author: Alejandro Abdelnur Date: Tue Sep 16 23:36:10 2014 -0700 HADOOP-11062. CryptoCodec testcases requiring OpenSSL should be run only if -Pnative is used. (asuresh via tucu) Conflicts: hadoop-hdfs-project/hadoop-hdfs/pom.xml (cherry picked from commit 1c847fdd61414f7f564de2cc477621edac8164b5) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/pom.xml commit bea9eb0b3bc64006bde3d66fa982a36b788e73d5 Author: Alejandro Abdelnur Date: Tue Sep 16 21:47:55 2014 -0700 HADOOP-11097. kms docs say proxyusers, not proxyuser for config params. (clamb via tucu) (cherry picked from commit 75bd79231ca30cb7a16107101c175c5b6fa06f56) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 4c58b8783f06a0cdabf5e1b42a750483c3b0f67e Author: Alejandro Abdelnur Date: Tue Sep 16 14:32:49 2014 -0700 HADOOP-11096. KMS: KeyAuthorizationKeyProvider should verify the keyversion belongs to the keyname on decrypt. (tucu) (cherry picked from commit 94a1e68aa5aa3ea633b3af7b09aa2b9012498101) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 057f137fa2ad309617bce1ca25c2530fcea8b88c Author: Andrew Wang Date: Tue Sep 16 17:15:23 2014 -0700 HADOOP-10922. User documentation for CredentialShell. Contributed by Larry McCay. (cherry picked from commit b6d3230e41c78750b6dfd679f24852f22947b5a5) (cherry picked from commit aeac86bc8adc54380309cb3383666b7e936dd970) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit b2210393b7cd1cae379eb9408c995e228b55c1d4 Author: Alejandro Abdelnur Date: Tue Sep 16 12:39:17 2014 -0700 HDFS-7006. Test encryption zones with KMS. (Anthony Young-Garner and tucu) (cherry picked from commit 5d897026e426737d792ef7922052872e869d6785) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/pom.xml hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java commit 17baaad36e90117977870b48ae77f973b331c9ce Author: cnauroth Date: Fri Sep 12 14:50:07 2014 -0700 HADOOP-11088. Unittest TestKeyShell, TestCredShell and TestKMS assume UNIX path separator for JECKS key store path. Contributed by Xiaoyu Yao. (cherry picked from commit 957414d4cb57cb8172070cc53530b7da78b8c9ca) (cherry picked from commit 5afc3f1dad5749540b287d1e53ff146fcfb167a8) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 87c2a940d4851f828aaab39d538d20deafca2fac Author: Andrew Wang Date: Tue Aug 5 00:26:06 2014 +0000 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 (cherry picked from commit 1fafce595f20165ccf61804c874f33cbdd3329dd) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 5f729339637d22a34699717e706194fa4957e6e6 Author: Andrew Wang Date: Fri Aug 1 17:43:34 2014 +0000 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 (cherry picked from commit f3db1ad3cc8ac9acacd1b0657ffc9642248e283d) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 9c5d4846a0d4205a789b8078200edf93723a928c Author: Owen O'Malley Date: Thu Jul 17 18:12:45 2014 +0000 HADOOP-10733. Fix potential null dereference in CredShell. (Ted Yu via omalley) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611421 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d157d7fb812f6049a24e0d386e1bd0796379c211) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 537167ae20fec56c4c28abaea9c44ecfec9a4267 Author: Alejandro Abdelnur Date: Tue Sep 9 22:18:03 2014 -0700 HADOOP-11077. NPE if hosts not specified in ProxyUsers. (gchanan via tucu) (cherry picked from commit d0e211650244516abdef6ee212303af135167e39) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit f51d23f73bfa797fdf7f955dce856e31aa603f9f Author: Uma Maheswara Rao G Date: Wed Sep 3 18:53:51 2014 +0530 HDFS-2975. Rename with overwrite flag true can make NameNode to stuck in safemode on NN (crash + restart). (Yi Liu via umamahesh) (cherry picked from commit 3425ae5d7eaa27b2526d0e0c07bdfea9440359f8) (cherry picked from commit 3f9c31c8738e6c6b857c2f8492ad00d34b1ec0ad) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 72d58f719b58d2943800fe5e04783d639cc9b3a0 Author: Jing Zhao Date: Wed Aug 20 18:14:43 2014 +0000 HDFS-6870. Merge r1619192 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619193 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f87e8dc4b864019745bdedb0e0cd41073e0e7e6a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 951bd3777eae96d5d541d06d8c269d9d466c8be3 Author: Alejandro Abdelnur Date: Mon Sep 15 19:39:12 2014 -0700 HADOOP-10868. Addendum (cherry picked from commit 1023196ceaa600f92f328cfe67a8bccac3445a64) commit 8d3aa072335cb605db048f549fa8fe8c4271e829 Author: Alejandro Abdelnur Date: Mon Sep 15 17:10:43 2014 -0700 HADOOP-10868. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) (cherry picked from commit e59f6771e89ded737cc91698763a02f6ebf23c61) Conflicts: hadoop-project/pom.xml commit 47081c8a5c5a0582c13a2319183cc977127a0961 Author: Alejandro Abdelnur Date: Tue Aug 5 21:25:22 2014 +0000 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 (cherry picked from commit 0c27c13d897bedd8d6b4c592dc6cacefa9aa9b20) commit 715816d87463878849e21fd5776ee1f52a32b32d Author: Andrew Wang Date: Wed Jul 30 05:53:20 2014 +0000 HDFS-6665. Add tests for XAttrs in combination with viewfs. Contributed by Stephen Chu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614545 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 12241908ad5b9a38068241a22d3d29e4a9184e98) commit 51ef61a2ea779eed798775f635429c07e2c509ce Author: Chris Nauroth Date: Wed Jul 16 16:27:38 2014 +0000 HDFS-5624. Add HDFS tests for ACLs in combination with viewfs. Contributed by Stephen Chu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611068 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 43fe48d9e269fb49927df6b3a782d430c20d5434) commit 1184eb4a59386637f07f463420d1a16643b5bff1 Author: Jing Zhao Date: Thu Jul 10 05:01:41 2014 +0000 HDFS-6645. Add test for successive Snapshots between XAttr modifications. Contributed by Stephen Chu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1609388 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 36492f084b3b965b386630ce5bf8f913e8627beb) commit a50904234c80f7513b0f4eb39bc23246518bcfb0 Author: Kihwal Lee Date: Tue Sep 16 09:04:54 2014 -0500 HDFS-6965. NN continues to issue block locations for DNs with full disks. Contributed by Rushabh Shah. (cherry picked from commit 0c26412be4b3ec40130b7200506c957f0402ecbc) commit 0a37a1047245975da74993e5667a17366a642d92 Author: Aaron Myers Date: Thu Jul 17 21:58:07 2014 +0000 HADOOP-10610. Upgrade S3n s3.fs.buffer.dir to support multi directories. Contrbuted by Ted Malaska. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611490 13f79535-47bb-0310-9956-ffa450edef68 commit 7bc7688a3b3df7d6ae6866abfb60947bcf40c55a Author: Colin Patrick Mccabe Date: Mon Sep 15 16:49:15 2014 -0700 HADOOP-11091. Eliminate old configuration parameter names from s3a (dsw via cmccabe) commit 93b02901a2d313ec968a35b1942e996edb04f13b Author: Junping Du Date: Tue Aug 12 11:02:38 2014 +0000 Merge r1617448 from trunk: YARN-1337. Recover containers upon nodemanager restart. (Contributed by Jason Lowe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617450 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e8d20ad77cfdadd19a2f4dde769ce791fb039dcc) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java commit df061c073c4334423aff165ed4a5232a01021b14 Author: Jason Lowe Date: Thu Sep 4 21:11:27 2014 +0000 YARN-2431. NM restart: cgroup is not removed for reacquired containers. Contributed by Jason Lowe (cherry picked from commit 3fa5f728c4d6944302621965d6a0376827af5b51) (cherry picked from commit 04d325afffd3696fd1d932b1aee47856164b916f) Conflicts: hadoop-yarn-project/CHANGES.txt commit 1c57967e37994cc655f38e67c817db1bc4792795 Author: Junping Du Date: Tue Jul 22 03:04:22 2014 +0000 Merget r1612449 from trunk: YARN-2013. The diagnostics is always the ExitCodeException stack when the container crashes. (Contributed by Tsuyoshi OZAWA) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612450 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f6b932fe484fa13473b180b4e483185b69c05519) Conflicts: hadoop-yarn-project/CHANGES.txt commit 082c7f57a132a7511f8a78549721c7fcb897126d Author: Xuan Gong Date: Thu Jul 31 21:29:01 2014 +0000 YARN-1994. Expose YARN/MR endpoints on multiple interfaces. Contributed by Craig Welch, Milan Potocnik and Arpit Agarwal git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615010 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 3c2c7e1797444cfd30cdcf6ad2c847ff06df706c) Conflicts: hadoop-mapreduce-project/CHANGES.txt hadoop-yarn-project/CHANGES.txt commit 6e9c549bb0a0162569711c49886e3cc10764dd4c Author: Junping Du Date: Mon Aug 4 13:35:49 2014 +0000 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 (cherry picked from commit c4d4d6f388f4fa07d977b9efb30370d56f545b60) Conflicts: hadoop-yarn-project/CHANGES.txt commit ae35d39e737b2c12dcad880331f3b72d9587e36f Author: Karthik Kambatla Date: Sat Jul 19 00:20:16 2014 +0000 YARN-2244. FairScheduler missing handling of containers for unknown application attempts. (Anubhav Dhoot via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611841 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 9b72197e401dfe301a3fac89d6b0e094879f71dd) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java commit bb3ee9499335e936fef125904fdf43eab45ca876 Author: Zhijie Shen Date: Thu Jul 31 09:31:22 2014 +0000 YARN-2347. Consolidated RMStateVersion and NMDBSchemaVersion into Version in yarn-server-common. Contributed by Junping Du. svn merge --ignore-ancestry -c 1614838 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614839 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 170ef7657aca92f71cdfd9190bab0a30c575e1e8) Conflicts: hadoop-yarn-project/CHANGES.txt commit 14a88b9896badb17156d2e374156a9807430f91f Author: Jian He Date: Fri Jul 25 20:44:30 2014 +0000 Merge r1613515 from trunk. YARN-2211. Persist AMRMToken master key in RMStateStore for RM recovery. Contributed by Xuan Gong git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613516 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fb86bce6f602f08e50239b2223522736ca2cfade) Conflicts: hadoop-yarn-project/CHANGES.txt commit 7d09a3e56825c4ae9a981509ec0c2246cde6c70f Author: Devarajulu K Date: Thu Jul 24 05:02:46 2014 +0000 YARN-1342. Recover container tokens upon nodemanager restart. Contributed by Jason Lowe. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612997 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 19854f93138bb267901b057613582200c50a4a38) Conflicts: hadoop-yarn-project/CHANGES.txt commit 7e2cf32aa14153c39be0e4274738eaf6ef01a061 Author: Jason Darrell Lowe Date: Tue Jul 22 19:38:11 2014 +0000 svn merge -c 1612652 FIXES: MAPREDUCE-5963. ShuffleHandler DB schema should be versioned with compatible/incompatible changes. Contributed by Junping Du git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612654 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 00df26490ca0ab3646e32a14741acc9debd05bac) Conflicts: hadoop-mapreduce-project/CHANGES.txt commit 0992a865ecadcf28f496d99daf7b695bd80062a7 Author: Jason Darrell Lowe Date: Mon Jul 21 14:49:38 2014 +0000 svn merge -c 1612285 FIXES: YARN-2045. Data persisted in NM should be versioned. Contributed by Junping Du git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612289 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 4fcf231321e8c1e18210aec81304eb04fea92395) Conflicts: hadoop-yarn-project/CHANGES.txt commit 34333778ceee551dd07a6513f4ca332d590f84db Author: Xuan Gong Date: Fri Jul 18 21:44:40 2014 +0000 YARN-2208. AMRMTokenManager need to have a way to roll over AMRMToken. Contributed by Xuan Gong git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611819 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit dfd6412cd35e3f75783b6af05c879c799bae4738) Conflicts: hadoop-yarn-project/CHANGES.txt commit d3af056ad010152a05a6a80c5d1e40d5cc18a44d Author: Junping Du Date: Thu Jul 17 23:38:36 2014 +0000 Merge r1611512 from trunk: YARN-1341. Recover NMTokens upon nodemanager restart. (Contributed by Jason Lowe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611514 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit c0d5b903c0119bea28583c99718f6c2eb1662dee) Conflicts: hadoop-yarn-project/CHANGES.txt commit 05eb74c189d0b40ece2244c9498429066a62783e Author: Aaron T. Myers Date: Mon Sep 15 08:30:42 2014 -0700 HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. commit 2a936a18231fcacc481e587e4c23ebc5727dd2f5 Author: Robert Kanter Date: Mon Sep 15 13:26:31 2014 -0700 MR1: CLOUDERA-BUILD. Reverts "MR1: CLOUDERA-BUILD. Add flag to not fail on unused-result warning (CDH-20987)" This reverts commit 044201a3e5097bb85713f85c186c8b4d4e2016a1. commit 516bc2611aa31cf9fcd976a4eb79696b74a384e3 Author: Andrew Wang Date: Mon Sep 15 10:23:57 2014 -0700 HDFS-7032. Add WebHDFS support for reading and writing to encryption zones. Contributed by Charles Lamb. (cherry picked from 43b03030084839db041d0337013806aaeef12aaa) commit cf60691bc870c30cf43175e6a734e0b644eab816 Author: Brandon Li Date: Tue Jul 22 22:33:14 2014 +0000 HDFS-6731. Run "hdfs zkfc-formatZK" on a server in a non-namenode will cause a null pointer exception. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612718 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 64f9ab07d3aebec890d85a5a1e56019b68a56990) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 044201a3e5097bb85713f85c186c8b4d4e2016a1 Author: Robert Kanter Date: Thu Sep 11 15:33:14 2014 -0700 MR1: CLOUDERA-BUILD. Add flag to not fail on unused-result warning (CDH-20987) commit 6fc3c963e3fe1b0c3685888533376e921e28f486 Author: Andrew Wang Date: Sun Sep 14 23:48:24 2014 -0700 HDFS-7061. Add test to verify encryption zone creation after NameNode restart without saving namespace. Contributed by Stephen Chu. (cherry picked from commit fc741b5d78e7e006355e17b1b5839f502e37261b) commit 86375ddc4cc58aeaf0f7d35af3b9148f9457f5de Author: Andrew Wang Date: Thu Sep 11 10:26:13 2014 -0700 HDFS-6966. Add additional unit tests for encryption zones. Contributed by Stephen Chu. (cherry picked from commit bf64fce78c5474f4d6ead839c4de18c8401a54d6) commit bb7e2a385da18d252b7103ef40676cdb6cf40e10 Author: Andrew Wang Date: Fri Aug 1 17:13:37 2014 +0000 HADOOP-10902. Deletion of directories with snapshots will not output reason for trash move failure. Contributed by Stephen Chu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615171 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 0d66f1f19ce176885120de1666cce12801b1f9b7) commit b0074405af0efc38b7cd8ce61128f2dea4275cef Author: Colin Patrick Mccabe Date: Wed Sep 10 16:14:08 2014 -0700 HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe) (cherry picked from commit 5ec7fcd9dd6bb86858c6e2583321bb9a615bd392) commit 4d2a1ca1a5821c71a5defc2dcb7c2f4c199bf1f5 Author: Steve Loughran Date: Mon Sep 1 18:20:47 2014 +0100 HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel) (cherry picked from commit 59384dfb710f42d2a419c1b7db5a1a62a39be5f3) commit 20f22d53676a67385d891bc54fd41e30ba4a3d78 Author: Steve Loughran Date: Tue May 7 17:21:14 2013 +0000 HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations for Unit testing. Hari git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1479985 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fa56ccfd530565e33323cac7b5ebecef73703d12) commit d2fa5332a65a5501887b32f98324e8396a569da7 Author: Jian He Date: Wed Aug 27 10:02:45 2014 -0700 YARN-2182. Updated ContainerId#toString() to append RM Epoch number. Contributed by Tsuyoshi OZAWA (cherry-picked from commit e2d0ff364a84a4de10e7b11fe83cd3dab155a571) (cherry picked from commit 5c63482aaae57d0dc8a22fd550412151e1d82d90) Conflicts: hadoop-yarn-project/CHANGES.txt commit 70d1a8ec185dbbff31fc221ef18f04c032254cd5 Author: Jason Darrell Lowe Date: Thu Aug 21 22:45:35 2014 +0000 svn merge -c 1619614 FIXES: YARN-2434. RM should not recover containers from previously failed attempt when AM restart is not enabled. Contributed by Jian He git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619616 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fab20109ae0e061b7999f58ee924688d787f7804) Conflicts: hadoop-yarn-project/CHANGES.txt commit f73832c8207c066717f006955f7098f20bd869e7 Author: Zhijie Shen Date: Tue Aug 19 20:40:37 2014 +0000 YARN-2249. Avoided AM release requests being lost on work preserving RM restart. Contributed by Jian He. svn merge --ignore-ancestry -c 1618972 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618973 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 400f6131d44e450f60ae7d3e37bc3d7ca43cde29) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AbstractYarnScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java commit 53fcef74f67d554bc76230a9d9533a2960935888 Author: Karthik Kambatla Date: Wed Aug 13 01:45:07 2014 +0000 YARN-1370. Fair scheduler to re-populate container allocation state. (Anubhav Dhoot via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617647 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e6799af4d37250cb015c244435cd2196deb490b1) Conflicts: hadoop-yarn-project/CHANGES.txt commit 3783bfd132c102daa934c1d8400ee28814a59cf1 Author: Vinod Kumar Vavilapalli Date: Mon Jul 14 23:32:36 2014 +0000 YARN-2260. Fixed ResourceManager's RMNode to correctly remember containers when nodes resync during work-preserving RM restart. Contributed by Jian He. svn merge --ignore-ancestry -c 1610557 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610559 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 66af4bf54f67f143a4c4b53a28ed22aa6dca7450) Conflicts: hadoop-yarn-project/CHANGES.txt commit b5b35db2b74fc2d1294806d6167438555443087a Author: Jian He Date: Wed Jul 9 18:28:00 2014 +0000 Merge r1609254 from trunk. YARN-1366. Changed AMRMClient to re-register with RM and send outstanding requests back to RM on work-preserving RM restart. Contributed by Rohith git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609255 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b05080053efa862f41a488588daa9b4562ebf4dd) commit 941439da3786dd00f003b31b7cd245b7503110eb Author: Jian He Date: Mon Jul 7 04:40:36 2014 +0000 Merge r1608334 from trunk. YARN-1367. Changed NM to not kill containers on NM resync if RM work-preserving restart is enabled. Contributed by Anubhav Dhoot git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608336 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 77a94b73b2641a3f7f544c3da0207d00c7eb9a6e) Conflicts: hadoop-yarn-project/CHANGES.txt commit c53605524c8a5292cd8e9c19661e6d2edeb84dff Author: Alejandro Abdelnur Date: Fri Aug 8 05:55:48 2014 +0000 HADOOP-10771. Addendum, default realm correction to common test krb5.conf file. (tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616682 13f79535-47bb-0310-9956-ffa450edef68 commit 7cfbffa33bce434d964c64f3b52f41009d3e1ada Author: Robert Kanter Date: Fri Sep 12 11:36:18 2014 -0700 MR1: CLOUDERA-BUILD. Simple fix to allow native libs to build on Ubuntu 14.04 (CDH-20987) commit 556ec2996d12b2392157cdda3bbb0f3f7dd5dd81 Author: arp Date: Fri Aug 29 00:26:13 2014 -0700 HDFS-6800. Support Datanode layout changes with rolling upgrade. (Contributed by James Thomas) (Cherry picked from commit 4ae8178c5626d188b137e3f806e56fd8661c4970) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 37e342cc680c9bf56e74be007811aa1ceef91108 Author: Colin McCabe Date: Fri Aug 1 20:41:05 2014 +0000 HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via Colin Patrick McCabe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615223 13f79535-47bb-0310-9956-ffa450edef68 (Cherry picked from commit 1ba3f8971433cdbc3e43fd3605065d811dab5b16) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java commit 080d56d6e05202bd423989c4414ca214e69291aa Author: Alejandro Abdelnur Date: Thu Sep 11 13:53:31 2014 -0700 HADOOP-11083. After refactoring of HTTP proxyuser to common, doAs param is case sensitive. (tucu) (cherry picked from commit c656d7d6e53436bf082f76e5988e39d8e18ed64f) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit f10d5ebaaf65a30a2506c86aa9f11b88c9670ca7 Author: Brandon Li Date: Tue Jul 15 20:35:07 2014 +0000 HDFS-6456. NFS should throw error for invalid entry in dfs.nfs.exports.allowed.hosts. Contributed by Abhiraj Butala git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1610840 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fb1f5bc618f4e006971bdb982cfa8adad71a4e32) commit ee8f2b3b3219258446c2f9982c8610e7e7216a62 Author: Andrew Wang Date: Thu Sep 11 10:59:09 2014 -0700 HDFS-7045. Fix NameNode deadlock when opening file under /.reserved path. Contributed by Yi Liu. (cherry picked from commit 1e684995d7ac20d1c27ca1c1bef37dd2ee00e630) (cherry picked from commit 6151c2bea7bcd9e458b09a5bf5b1798ed6c0def9) commit 56298815cc1be6ba3428f04fec63dc6f6f74bb24 Author: Andrew Wang Date: Mon Sep 8 16:59:30 2014 -0700 HDFS-6951. Correctly persist raw namespace xattrs to edit log and fsimage. Contributed by Charles Lamb. (cherry picked from commit 04915a08141bbe71bdef26e3f539aa8b76f89ac7) commit f9bd9823bb905148de1ca150a2628b61b271a862 Author: Jing Zhao Date: Thu Sep 4 18:54:38 2014 -0700 HDFS-6886. Use single editlog record for creating file + overwrite. Contributed by Yi Liu. (cherry picked from commit 6104520369045dfaa4b543cbad21236ed322249b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 5c5ead69fc5ffa39a7653bd1189e7c49fe769634 Author: Brandon Li Date: Wed Jul 16 18:52:03 2014 +0000 HDFS-6689. NFS doesn't return correct lookup access for direcories. Contributed by Brandon Li git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611135 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e896de98f2dba9fbd58024b8da35c8b72a404724) commit 904854668daf4a1ed0204b0fc597c50121cfa118 Author: Karthik Kambatla Date: Wed Sep 10 08:26:14 2014 -0700 YARN-1458. FairScheduler: Zero weight can lead to livelock. (Zhihai Xu via kasha) (cherry picked from commit 3072c83b38fd87318d502a7d1bc518963b5ccdf7) Conflicts: hadoop-yarn-project/CHANGES.txt commit ecdd8223887c1417e42d305dae6ab5afd8cdd6d6 Author: Karthik Kambatla Date: Tue Sep 9 15:13:07 2014 -0700 YARN-2526. SLS can deadlock when all the threads are taken by AMSimulators. (Wei Yan via kasha) (cherry picked from commit 28d99db99236ff2a6e4a605802820e2b512225f9) commit 7b98f15f8046643f6af89bd715aa32e7a6336e20 Author: Alejandro Abdelnur Date: Wed Sep 10 14:26:15 2014 -0700 HADOOP-10758. KMS: add ACLs on per key basis. (tucu) (cherry picked from commit b02a4b40610e93eef6559db09a11d287e859446d) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit aa9eb5d7d0d7a8f65995acf7bf56c175390cad96 Author: Alejandro Abdelnur Date: Mon Sep 8 10:12:16 2014 -0700 HADOOP-11071. KMSClientProvider should drain the local generated EEK cache on key rollover. (tucu) (cherry picked from commit df8c84cba8512058f5097c6faeedf4b65cab3806) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit a0d728d57ebde8a872800bb1640e2d5b8913f6eb Author: Sean Zhong Date: Sat Sep 6 11:46:07 2014 +0800 MAPREDUCE-6077. native-task: Remove CustomModule examples in nativetask (seanzhong) (cherry picked from commit 52a8b4db92a35598006103c59a2ff93afc5312ee) commit 3cf530fdcc6fda8135022202463a268fadeb4fac Author: Todd Lipcon Date: Fri Sep 5 13:41:18 2014 -0700 MAPREDUCE-6074. native-task: Fix release audit warnings (cherry picked from commit 7c91f9b1484d487e792dca051fbd418697049422) commit 28fcdb50900923cf4067ad0e1b82d0f37ced3983 Author: Karthik Kambatla Date: Thu Aug 21 17:37:34 2014 +0000 MAPREDUCE-5974. Allow specifying multiple MapOutputCollectors with fallback. (Todd Lipcon via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619492 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 549ad6ad74b89fcc530525f793a6cfb056971865) commit b2b07bb1129ab9c74eb61133294bd2d158bb38aa Author: Todd Lipcon Date: Wed Sep 3 13:07:24 2014 -0700 MAPREDUCE-6069. Lint/style fixes and removal of unused code. Contributed by Todd Lipcon. (cherry picked from commit 683987be7c160e67ddb8534eeb3c464bbe2796dd) commit f5b86ef833af4f79b7a391808d1e1e414dad4ab2 Author: Binglin Chang Date: Fri Sep 5 14:20:39 2014 +0800 MAPREDUCE-6067. native-task: fix some counter issues (Binglin Chang) (cherry picked from commit 00322161b5d4d54770c2f0823e036537edecf5bf) commit 2f1a08dd31251d6d795a274648b421b9f915cb7b Author: Todd Lipcon Date: Wed Sep 3 12:02:47 2014 -0700 MAPREDUCE-6055. native-task: findbugs, interface annotations, and other misc cleanup (cherry picked from commit 1081d9cee23aa661d7c9165bc9855865a38b528e) commit 820feb3cae68c7e861a9cc09ed6743c17b845bdb Author: Binglin Chang Date: Tue Sep 2 16:26:09 2014 +0800 MAPREDUCE-6056. native-task: move system test working dir to target dir and cleanup test config xml files (Manu Zhang via bchang) (cherry picked from commit 7ade9b04ea0a46a51564d23c8d715ddb1b9ca6d0) commit 2bad78ff98f927d9500bcab8afb6ac877675e2c6 Author: Binglin Chang Date: Tue Sep 2 11:00:48 2014 +0800 MAPREDUCE-6058. native-task: KVTest and LargeKVTest should check mr job is sucessful (Contributed by Binglin Chang) (cherry picked from commit 17cd0faaceb8f9ce00b8c2c200e810f78f36c671) commit 40e5d5b8a44baf00ac97339749373b42aa513f87 Author: Todd Lipcon Date: Wed Aug 27 12:25:07 2014 -0700 MAPREDUCE-6054. native-task: Speed up tests. Contributed by Todd Lipcon. (cherry picked from commit bfd1d75d875b6ba261fdb1825d0f151b026c2d24) commit e064142e0bfa366e256873267d0475b1b62bc880 Author: Todd Lipcon Date: Wed Aug 27 12:23:03 2014 -0700 MAPREDUCE-5977. Fix or suppress native-task gcc warnings. Contributed by Manu Zhang. (cherry picked from commit fad4524c85848b8efe27dcf4a3e3a9ac1725bd2a) commit f6d3cf21108629b3d9c90b6f7865659e29ce4d8e Author: Sean Zhong Date: Fri Aug 15 08:55:49 2014 +0000 MAPREDUCE-6025: distribute nativetask.so to right folder (Manu Zhang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1618120 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 6d39367f6a95383b634d79b6df35a278e0d89fe0) commit 9e1d6acd4b540e916fbec5f58bb611ce70f970a2 Author: Todd Lipcon Date: Thu Aug 14 04:56:43 2014 +0000 MAPREDUCE-6035. native-task: sources/test-sources jar distribution. Contributed by Manu Zhang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1617879 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit eace4dd50b1214a8842e47c522da258e1746386a) commit a98494ed9c516eeda8299f1a54eb41b9eac5fa04 Author: Todd Lipcon Date: Thu Aug 14 04:53:36 2014 +0000 MAPREDUCE-6026. native-task: fix logging. Contributed by Manu Zhang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1617878 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 808bf8bac1d4bdf83fb3bdf6e096b4038c9567ce) commit b083ed0f125b65755380bcd717c04f8de68a2972 Author: Todd Lipcon Date: Thu Aug 14 04:47:20 2014 +0000 MAPREDUCE-6006. native-task: add native tests to maven and fix bug in pom.xml. Contributed by Binglin Chang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1617877 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 886338ff80438b2daea3755f165cc411e39ef560) commit d5d82b2498fa1100c5913d72fc8df6b038dbd8f5 Author: Sean Zhong Date: Wed Aug 6 07:40:24 2014 +0000 MAPREDUCE-5978. native-task: remove test case for not supported codec Bzip2Codec and DefaultCodec (Manu Zhang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1616116 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 4d4fb1723fd825df4ad2488e4ecde0c69359e83a) commit 8fa857e66a928323a0c38de50b1baa0a6b59f60c Author: Sean Zhong Date: Wed Aug 6 07:32:49 2014 +0000 MAPREDUCE-5976. native-task: should not fail to build if snappy is missing (Manu Zhang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1616115 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 432f641bc2f6c7fdb67da578233cbe07fdfbf1ea) commit cde34f65c97553899a105ec36f2ef2f79ba8f399 Author: Binglin Chang Date: Wed Aug 6 06:01:12 2014 +0000 MAPREDUCE-5984. native-task: Reuse lz4 sources in hadoop-common. Contributed by Binglin Chang git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1616105 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7ecaa81d2746a805b9937fcd134ceaa8607ed7b5) commit 943e27e3022243ecf7cb32d46e2b0ed773069a81 Author: Binglin Chang Date: Mon Aug 4 06:19:51 2014 +0000 MAPREDUCE-6005. native-task: Fix some valgrind errors (Binglin Chang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1615489 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 83a396733ea43564beee928f41041a341e26db05) commit a66271c9a225515d3a246a37e1c4f2a4829337d0 Author: Todd Lipcon Date: Sun Jul 27 19:04:14 2014 +0000 MAPREDUCE-5995. native-task: Revert changes to Text internals. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613828 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 78d86a983960f231f51e47579c0b1ae73f9645fd) commit f907ab23abbeb078c5db5c79343d90d5b9a12779 Author: Binglin Chang Date: Thu Jul 24 11:44:09 2014 +0000 MAPREDUCE-5991. native-task should not run unit tests if native profile is not enabled. Contributed by Binglin Chang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613072 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit ea9e5b7baae34c7ba660681d1e5aceb9c1047e6f) commit f9a50a38dddbb9ebb855d9625393a7d484ef78b9 Author: Todd Lipcon Date: Thu Jul 24 08:24:05 2014 +0000 MAPREDUCE-6000. native-task: Simplify ByteBufferDataReader/Writer. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613036 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 663518032449940f136ae8a9f149ed453837a8d8) commit 00825a89919301d054d78bb1f2fa4d9052edb9c8 Author: Todd Lipcon Date: Thu Jul 24 08:20:25 2014 +0000 MAPREDUCE-5997. native-task: Use DirectBufferPool from Hadoop Common. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613034 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 77acc70df5d64055ea809222f3d2f0d66c611196) commit 5e9717b9506404af453a66ccda38274fb733cc72 Author: Todd Lipcon Date: Thu Jul 24 06:17:33 2014 +0000 MAPREDUCE-5996. native-task: Rename system tests into standard directory layout. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613004 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b2cba48f36c96f190f6a25e65291873be7aee322) commit cd27d5e2e9bc717a450cf2b8bc91ea8fd8f935a8 Author: Todd Lipcon Date: Thu Jul 24 06:14:27 2014 +0000 MAPREDUCE-5994. Simplify ByteUtils and fix failing test. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1613003 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d468a9244740fcdeacf23b3aa08ab1c457e050ca) commit 07a26696fcc8e54e01b4cf4ad7cbf9d93fe49247 Author: Todd Lipcon Date: Tue Jul 22 19:55:03 2014 +0000 MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by Binglin Chang git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1612659 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e788e8b6eeafc1d20b5d51f5e2374610bc37304b) commit dc6dad4be56bc9fb560d267c9ab6e29f4f8a4ba6 Author: Todd Lipcon Date: Thu Jul 17 17:44:55 2014 +0000 Import initial code for MAPREDUCE-2841 (native output collector) Contributed by: Binglin Chang Yang Dong Sean Zhong Manu Zhang Zhongliang Zhu Vincent Wang Yan Dong Cheng Lian Xusen Yin Fangqin Dai Jiang Weihua Gansha Wu Avik Dey Cloudera modification: fixed nativetask poms to use the Cloudera version string git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2841@1611413 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b2551c06a09fb80a9e69adbc01c4c34b93ad0139) commit 311fc317d9dfe0419f548cd6b0b177c2b284050b Author: Todd Lipcon Date: Wed Jul 23 00:28:57 2014 +0000 HADOOP-10855. Allow Text to be read with a known Length. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612731 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d6172be8d3a11d5137a40212a1253ea868ce246d) commit bf9446f7ef55a6222ba186e4d82f00bd0f3585f8 Author: Todd Lipcon Date: Thu Jul 24 06:22:02 2014 +0000 HADOOP-10882. Move DirectBufferPool into common util. Contributed by Todd Lipcon. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613006 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 154c97df4e33cfe40b4d5248bc6f22c5a24ecc6f) commit cac02cd55cdda52232adcad4806f430528dcb2d3 Author: Alejandro Abdelnur Date: Fri Aug 29 14:21:58 2014 -0700 HADOOP-10994. KeyProviderCryptoExtension should use CryptoCodec for generation/decryption of keys. (tucu) (cherry picked from commit 5889f4d5f33015ff0c57cc4fc319b2c113b36fe5) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit bd601cca12658d5d7fceb8a3a6c3f3328610cc96 Author: Alejandro Abdelnur Date: Fri Sep 5 22:33:48 2014 -0700 HDFS-6986. DistributedFileSystem must get delegation tokens from configured KeyProvider. (zhz via tucu) (cherry picked from commit 035112f25133343a55f9c65e0577a2230954dae8) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit ff79b5c5944be970c2f0e397ce7e060b9c469c5d Author: Karthik Kambatla Date: Fri Aug 29 15:55:25 2014 -0700 HADOOP-11030. Define a variable jackson.version instead of using constant at multiple places. (Juan Yu via kasha) (cherry picked from commit 9ad413b19d98352e4ae848a945ab1f72ababa576) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 7d5b2923adaf039a5e117b7ed79131a4a1bb9495 Author: Andrew Wang Date: Tue Sep 2 14:02:29 2014 -0700 HDFS-6634. inotify in HDFS. Contributed by James Thomas. (cherry picked from commit faa4455be512e070fa420084be8d1be5c72f3b08) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 29d339f551b31c9e50b59669d86dae134ca9b912 Author: Andrew Wang Date: Fri Aug 29 14:44:37 2014 -0700 HADOOP-11021. Configurable replication factor in the hadoop archive command. Contributed by Zhe Zhang. (cherry picked from commit ea1c6f31c2d2ea5b38ed57e2aa241d122103a721) (cherry picked from commit 075bb9e380994a267ecba15b7e410f147dcfc35a) commit f2a79048510e3195977ab003dd56e526013ec5cc Author: Alejandro Abdelnur Date: Fri Sep 5 10:04:07 2014 -0700 HADOOP-11069. KMSClientProvider should use getAuthenticationMethod() to determine if in proxyuser mode or not. (tucu) (cherry picked from commit 8bf2a0de69547ac50b6e8c36ff7f13b028525641) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 9d55ae84a2b2998b1aa6ba68f1ac1d8fcfe0fc0d Author: Alejandro Abdelnur Date: Fri Sep 5 14:09:22 2014 -0700 HADOOP-11070. Create MiniKMS for testing. (tucu) (cherry picked from commit e98c244730337477c0fe7c19c984ee4581ff567f) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 44f52eeeb9e2fb3d7a140784e70163a9bd42dc6d Author: cnauroth Date: Thu Sep 4 11:47:18 2014 -0700 HADOOP-11063. KMS cannot deploy on Windows, because class names are too long. Contributed by Chris Nauroth. (cherry picked from commit b44b2ee4adb78723c221a7da8fd35ed011d0905c) (cherry picked from commit c035365338d1d6ca32f3912f5ebb70f8d1304f1a) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 90136a26f7cae2082a98763f10da51072ff6d4ca Author: Jing Zhao Date: Fri Jul 11 01:28:47 2014 +0000 HDFS-6640. Syntax for MKDIRS, CREATESYMLINK, and SETXATTR are given wrongly in WebHdfs document (missed webhdfs/v1). Contributed by Stephen Chu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1609603 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b90dfe0b499e9ff25b3beeb4c79d6f068e80baa9) commit 39186e85e558b1f1b2cd52fc2523058ea96131e4 Author: Jing Zhao Date: Thu Sep 4 16:12:44 2014 -0700 HDFS-6996. SnapshotDiff report can hit IndexOutOfBoundsException when there are nested renamed directory/file. Contributed by Jing Zhao. (cherry picked from commit f7df24bb1b4278d27f5c2b7fecf7b69be4302c7a) commit 942968f24c296e270a043cbeed524b711084b5d0 Author: Andrew Wang Date: Mon Sep 8 12:44:23 2014 -0700 HADOOP-11035. distcp on mr1(branch-1) fails with NPE using a short relative source path. Contributed by Zhihai Xu. (cherry picked from commit 4ca5ce88d5e88fd7368fa94b4886231b1ae9bb26) Conflicts: CHANGES.txt src/test/org/apache/hadoop/fs/TestCopyFiles.java src/tools/org/apache/hadoop/tools/DistCp.java (cherry picked from commit 70dd4fff90eb4e686fbe03abcb8814354b21f771) commit cc6aab11f9d196c3100549da9f68f1b2b4c51ba7 Author: Kihwal Lee Date: Mon Sep 8 14:41:44 2014 -0500 HDFS-7005. DFS input streams do not timeout. Contributed by Daryn Sharp. (cherry picked from commit 6a84f88c1190a8fecadd81deb6e7b8a69675fa91) commit d66b18c614786d914c451f281810ee8c0bd636ba Author: Andrew Wang Date: Fri Aug 1 18:56:06 2014 +0000 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/trunk@1615190 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java commit c6f3922001b3554a37f86f8c0d8ed81d5c12b09f Author: Colin Patrick Mccabe Date: Tue Sep 2 15:14:33 2014 -0700 HDFS-4257. The ReplaceDatanodeOnFailure policies could have a forgiving option. Contributed by szetszwo. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 08c49b0859aec3dc5d7c6f2d82f6c211a7bbc4e6 Author: Andrew Wang Date: Tue Sep 2 14:22:20 2014 -0700 HDFS-6954. With crypto, no native lib systems are too verbose. Contributed by Charles Lamb. (cherry picked from commit a0ccf83dfd6bff81944d6855652eae7f7f7b0ba9) commit 7c9a0f6e896e40fe5f834c83ce4ce26ba5677ce2 Author: Colin Patrick Mccabe Date: Wed Aug 27 13:39:40 2014 -0700 HDFS-4486. Add log category for long-running DFSClient notices. Contributed by Zhe Zhang. (cherry picked from commit 225569ece229cec32f852f831fd337a139c44b1e) commit 8eb1f261cc0411823fa6a7344ed07d82eb76db84 Author: Karthik Kambatla Date: Wed Sep 3 10:27:36 2014 -0700 YARN-2394. FairScheduler: Configure fairSharePreemptionThreshold per queue. (Wei Yan via kasha) (cherry picked from commit 1dcaba9a7aa27f7ca4ba693e3abb56ab3c59c8a7) commit 34bbb7dca189240e7d804011fecbae452e7dc098 Author: Karthik Kambatla Date: Sat Aug 30 01:17:13 2014 -0700 YARN-2395. FairScheduler: Preemption timeout should be configurable per queue. (Wei Yan via kasha) (cherry picked from commit 0f34e6f3873aee0f4932740ca790c6dd2a13b5d9) commit 3f591ec2b5e64d2b17af8d6292c20a3c2cadca6b Author: Karthik Kambatla Date: Fri Aug 29 17:15:38 2014 -0700 YARN-2360. Fair Scheduler: Display dynamic fair share for queues on the scheduler page. (Ashwin Shankar and Wei Yan via kasha) (cherry picked from commit 270a271f53f52a1f33e63a0520ae6032536dd4c6) Conflicts: commit e3caf4f4c5d0481135d25f502f7b71091df212e2 Author: Karthik Kambatla Date: Fri Aug 22 15:44:47 2014 +0000 YARN-2393. FairScheduler: Add the notion of steady fair share. (Wei Yan via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619845 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 0097b15e2150f95745f64179a0ef4644e96128f5) Conflicts: hadoop-yarn-project/CHANGES.txt commit 4bd37782b15951357c24d9e93145165596cda752 Author: Karthik Kambatla Date: Tue Aug 12 21:43:27 2014 +0000 YARN-2399. FairScheduler: Merge AppSchedulable and FSSchedulerApp into FSAppAttempt. (kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617600 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 486e718fc1f5befd231494e2ec06bb360484f191) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java commit ecd869a95fd33292f4ea45c85d56aa235b8e864c Author: Karthik Kambatla Date: Tue Aug 12 22:51:57 2014 +0000 YARN-2399. Delete old versions of files. FairScheduler: Merge AppSchedulable and FSSchedulerApp into FSAppAttempt. (kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617619 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 4239695588f0e133bd514955c3404d3301eac6ce) commit 1eee6710647d533558eac29f2ccdaa49e3ab5630 Author: Karthik Kambatla Date: Fri Jul 25 16:13:07 2014 +0000 YARN-2214. FairScheduler: preemptContainerPreCheck() in FSParentQueue delays convergence towards fairness. (Ashwin Shankar via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613459 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 1e553858f930e43fac62986549a178cdcf39384c) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java commit cae68ed8ac2f3ef67371cb80c7adffcdcc7fe8c0 Author: Jing Zhao Date: Wed Aug 27 10:26:22 2014 -0700 HDFS-6908. Incorrect snapshot directory diff generated by snapshot deletion. Contributed by Juan Yu and Jing Zhao. (cherry picked from commit 6b441d227a8806e87224106a81361bd61f0b3d0b) (cherry picked from commit c8b254d70eb79b27700881118daaf259ff294ece) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 46d2651c75af2b963f0aee436380f8c5faf3a270 Author: Alejandro Abdelnur Date: Fri Aug 22 05:17:22 2014 +0000 HDFS-6905. fs-encryption merge triggered release audit failures. (clamb via tucu) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 99be533e3e12f64acbd2feddd1c0377c2041050b Author: Alejandro Abdelnur Date: Thu Sep 4 09:22:00 2014 -0700 HADOOP-11060. Create a CryptoCodec test that verifies interoperability between the JCE and OpenSSL implementations. (hitliuyi via tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit d8e17e9900d4fc35d9cc180c597b2e08e43788fa Author: Alejandro Abdelnur Date: Thu Sep 4 09:11:10 2014 -0700 HADOOP-11015. Http server/client utils to propagate and recreate Exceptions from server to client. (tucu) (cherry picked from commit 70b218748badf079c859c3af2b468a0b7b49c333) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit c21ec1689be9a9c7cf5a51dc11d636fdd9f7537d Author: Alejandro Abdelnur Date: Thu Sep 4 09:08:31 2014 -0700 HADOOP-11054. Add a KeyProvider instantiation based on a URI. (tucu) (cherry picked from commit 41f1662d467ec0b295b742bb80c87482504fbf25) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 8b25733376fb2a24e8144fe3ccf27c4117119bce Author: Karthik Kambatla Date: Sat Aug 9 02:10:00 2014 +0000 YARN-2026. Fair scheduler: Consider only active queues for computing fairshare. (Ashwin Shankar via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616915 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit a7643f4de7e0ac8eeb00f74cf73bd83137944e3f) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java commit 0474f44632449a0b719557d7a7471aea393ca5f2 Author: Alejandro Abdelnur Date: Wed Sep 3 15:08:55 2014 -0700 HADOOP-10863. KMS should have a blacklist for decrypting EEKs. (asuresh via tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java commit ee975d5d3f31b318218620d4425fe27eaf9395dd Author: Alejandro Abdelnur Date: Tue Aug 26 11:55:50 2014 -0700 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2 commit e5b5ef9f659e69de2af12bf3e7b760768894b22b Author: Alejandro Abdelnur Date: Tue Aug 26 10:38:28 2014 -0700 HDFS-6134 and HADOOP-10150 subtasks. (cherry picked from commit c77bd85b621e23738855628230bf8db1bc5d007d) commit a87130c500a50218ed8b9335af9541a390725119 Author: Suresh Srinivas Date: Tue Sep 25 00:11:56 2012 +0000 HADOOP-8815. RandomDatum needs to override hashCode(). Contributed by Brandon Li. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1389661 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 3ede27f4557c9e90430a7a3f385b8be243e89688) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 631dea88d8a89f03e1643b2c9179c775ee4112f2) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 00588ef3ae5b80f3caeece8e4ba495fb56a3e5b2 Author: Arpit Agarwal Date: Thu Aug 21 01:14:14 2014 +0000 HDFS-6758: Merging r1619275 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619276 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f7e3b6e761e215d8c6412d43a4262880d4dc6fed) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit abb4986cd0ae28f5babffac668a4e353523998fa Author: Chris Nauroth Date: Wed Aug 20 22:49:38 2014 +0000 HDFS-6858. Merging change r1619256 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619258 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fd50cd91502541fb64251c26770be911bf644fac) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 5d378decd12474e434e22e96f49ab258a5e96626 Author: Andrew Wang Date: Mon Aug 18 18:10:50 2014 +0000 HDFS-6825. Edit log corruption due to delayed block removal. Contributed by Yongjun Zhang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618689 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 9b38a6ab2330117ab36862be6c2c26a716120893) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit b9c81e51d9d9ef1319b8397c5366ea1c12a2c149 Author: Haohui Mai Date: Wed Aug 13 17:47:28 2014 +0000 HDFS-6567. Merge r1617779 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617780 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e9bd4578d6f1b29303734129eb508a88830d9a94) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit c9116cc0795755b79c88e39de18fd4ab537e242e Author: Haohui Mai Date: Mon Aug 11 21:30:17 2014 +0000 HDFS-6838. Merge r1617361 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617363 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit bee0c9b615ac510ffac6df9e4f76060a7d95da09) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 5bc49af3486d41ee35352ef93456028f17430f5f Author: Arpit Agarwal Date: Fri Aug 8 05:42:00 2014 +0000 HDFS-6772: Merging r1616680 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616681 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 8d73cbb8d892390c4f39ce6ac6db9617a6a7badc) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit e80da57b5b8b13802eeb5ee2f23faeeca60ba2fc Author: Arpit Agarwal Date: Fri Aug 1 17:35:14 2014 +0000 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 (cherry picked from commit 1b4f028385d5eba1622db83af4b9177551208255) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 4f1ab40875b49b2395af865759da195ff92c67a7 Author: Chris Nauroth Date: Wed Jul 30 17:54:35 2014 +0000 HDFS-6570. Merging change r1614723 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614726 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 9df555d193a0263cfdbd2613fc53920d945ec523) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 7364f1b9b468122d5517bf76eb41534ea2ee6f34 Author: Andrew Wang Date: Wed Jul 30 05:58:23 2014 +0000 HDFS-6778. The extended attributes javadoc should simply refer to the user docs. Contributed by Charles Lamb. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614548 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 1bd3b2bf9abf508462a831ae0272afc36578423d) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 11cc5bf03d16f9903dfdc3a7d7f3d611df07b0fa Author: Tsz-wo Sze Date: Mon Jul 28 23:46:03 2014 +0000 svn merge -c 1614215 from trunk for HDFS-6739. Add getDatanodeStorageReport to ClientProtocol. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614217 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 8155f7c6ebb2721b6557c4d0e3ab3f6d6e175746) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit f573d23694d171ce46ba6e2a8f5d41c738c49f16 Author: Chris Nauroth Date: Sat Jul 26 04:21:16 2014 +0000 HDFS-6749. Merging change r1613561 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613562 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f1d0db87cdf2436ebf51fbdaa51dd9af93e53b9b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 192c1f4821c4f8bb2229d0f2983b7ef674e3860e Author: Colin McCabe Date: Fri Jul 25 22:13:03 2014 +0000 HDFS-6755. There is an unnecessary sleep in the code path where DFSOutputStream#close gives up its attempt to contact the namenode (mitdesai21 via cmccabe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613523 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 70a179d29ff495445e06ef7f1098faedbd5a1d78) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 13eafa3ba8e88c7ad68d9ebdcd1fba0ba13b2d27 Author: Jing Zhao Date: Thu Jul 24 18:30:22 2014 +0000 HDFS-6715. Merge r1613237 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613239 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 51c861d3cc6d6cdfdb15b1b84da41ec858d92bc1) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit b6c80709b36d63f88c5f5b53a8d67d92856344ea Author: Andrew Wang Date: Wed Jul 23 21:43:16 2014 +0000 HADOOP-10887. Add XAttrs to ViewFs and make XAttrs + ViewFileSystem internal dir behavior consistent. Contributed by Stephen Chu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612953 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f364269fa097d2f12fae083bd1a22f1ac0933336) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 61a22c49ac2c7c149720c7c4ee97b0fc9b49671e Author: Andrew Wang Date: Tue Jul 22 17:50:08 2014 +0000 HDFS-6701. Make seed optional in NetworkTopology#sortByDistance. Contributed by Ashwin Shankar. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612627 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit c4537871dc1f56e530ef37aaeda9508071b96cdd) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit c8be5d40f7fb6ad4712c27a4c69a59135b14f308 Author: Tsz-wo Sze Date: Tue Jul 22 07:43:58 2014 +0000 svn merge -c 1612493 from trunk for HDFS-6702. Change DFSClient to pass the StorageType from the namenode to datanodes and change datanode to write block replicas using the specified storage type. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612494 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d0b9bf11ab35bae709bd00dda59c8892ccc6da82) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 52438c5ec72aff17e0891b91362a2d337dd8e2df Author: Tsz-wo Sze Date: Fri Jul 18 18:21:18 2014 +0000 svn merge -c 1611750 from trunk for HDFS-6616. Add exclude-datanodes feature to WebHDFS redirection so that it will not redirect retries to the same datanode. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611751 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 965da8312eb6321280e4a08e31078aa4c72ee045) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit fc14c25200d450b8bba9c16f7eaf130af0f1a1f8 Author: Tsz-wo Sze Date: Fri Jul 18 17:51:39 2014 +0000 svn merge -c 1611731 from trunk for HDFS-6700. BlockPlacementPolicy shoud choose storage but not datanode for deletion. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611734 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 9462e9e0e93d62cf389dd297f874d98b379e48ee) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 1387a1c1c22408dfc1a9ddd872ab25aa91d96a1c Author: Jing Zhao Date: Thu Jul 17 17:39:54 2014 +0000 HDFS-6478. Merge r1611410 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611412 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 27e2008484d6b77215cb982919ad5630fe26af2a) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit a52a9096e71c3640106d916797415dfaedeee768 Author: Chris Nauroth Date: Wed Jul 16 05:19:57 2014 +0000 HADOOP-10845. Merging change r1610911 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610912 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fa2c9e82cb27e759c52e80b41de26495768ac5cc) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 33eb29deba9e6c033063dc75ed0b1f1cb75b09a6 Author: Jing Zhao Date: Tue Jul 15 23:12:20 2014 +0000 HADOOP-10673. Merge change r1610879 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610881 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 32d9fd2ca3e6ecd190d056d40d6c9c70e50b03f7) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit b52728d083261fb6e0bb25eb5e174366c574ac74 Author: Chris Nauroth Date: Mon Jul 14 18:28:02 2014 +0000 HDFS-2856. Merging change r1610474 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610479 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit ea8da4b8c006d155253186f869fc27d9f74c4a53) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit af658342e1ef188dd5d731d55fd50aa01f15ecd8 Author: Chris Nauroth Date: Fri Jul 11 22:21:30 2014 +0000 HDFS-3851. Merging change r1377372 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609857 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 357fbc1dd232e1567262951ec7bf2b593c5ee154) commit f2de1f0a91804965bce403ec47eaee4e4053395d Author: Chris Nauroth Date: Fri Jul 11 21:55:48 2014 +0000 HDFS-2976. Merging change r1298495, r1298507 and r1298508 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609848 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 6916cdabbabb606e08e0c3c18bdc4b4e11e04040) commit 634853606589d94ce903701295d902c84f6c311a Author: Juan Yu Date: Wed Sep 3 15:34:43 2014 -0700 MR1: fix mr1 compile issue in unit test. commit fb3fd746f4340142978596c1997a7bfb19007e69 Author: Harsh J Date: Sat Apr 20 08:19:28 2013 +0530 MR1: CLOUDERA-BUILD. Add in user-class-takes-preference API of CDH3/MR1's JobConf to CDH4-MR2's JobConf class, to not break API. Porting this to CDH5 to not break compatibility. Reason: API Compatibility Ref: CDH-4212 Author: Harsh J, port to CDH5 by Sandy Ryza Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java (cherry picked from commit 7bd71f3d4c8c9471bfb4bdc0baa004d78647ff76) commit fdca02abf6bd87f747b1d52f738d9c3a0a965ca7 Author: Benoy Antony Date: Sat Aug 30 12:49:19 2014 -0700 HADOOP-10833. Remove unused cache in UserProvider. (Benoy Antony) (cherry picked from commit 258c7d0f53fbdf4b0b9cae901701176e3e70c4fe) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit aa971e7815a73ad0c241b3d51250fce2ea2ea812 Author: Alejandro Abdelnur Date: Fri Aug 29 11:06:51 2014 -0700 HADOOP-10911. hadoop.auth cookie after HADOOP-10710 still not proper according to RFC2109. (gchanan via tucu) (cherry picked from commit 6040810df82669f140033d3c6366892640798671) Conflicts: hadoop-project/pom.xml (cherry picked from commit 54202383a9627415c822bddd2947a1a179b6319f) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 721a6c383294f81d167d06f042917be2e873055f Author: Alejandro Abdelnur Date: Thu Aug 28 14:45:40 2014 -0700 HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) (cherry picked from commit d1ae479aa5ae4d3e7ec80e35892e1699c378f813) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit d8dc0cb367e760848cd81e7d91992b5203ae04aa Author: Alejandro Abdelnur Date: Fri Jul 18 19:43:38 2014 +0000 HADOOP-10817. ProxyUsers configuration should support configurable prefixes. (tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611781 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 94595ee840844086c9340ea60d3e689f86d8e238 Author: Owen O'Malley Date: Thu Jul 17 15:52:58 2014 +0000 HADOOP-10607. Create an API to separate credentials/password storage from applications. (Larry McCay via omalley) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611391 13f79535-47bb-0310-9956-ffa450edef68 commit 2ebbbaa75373f5301cc9ba763b95a9b4120b78bd Author: Alejandro Abdelnur Date: Thu Aug 21 19:00:08 2014 +0000 HADOOP-10488. TestKeyProviderFactory fails randomly. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619554 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 5fa2142c41396ffd919fadf5d2c33126ae015d8c Author: Alejandro Abdelnur Date: Thu Aug 21 19:00:06 2014 +0000 HADOOP-10698. KMS, add proxyuser support. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619552 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 6d8cae3c3255b2f23e36ef3553eeb7df7a18d540 Author: Alejandro Abdelnur Date: Thu Aug 21 19:00:03 2014 +0000 HADOOP-10967. Improve DefaultCryptoExtension#generateEncryptedKey performance. (hitliuyi via tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619551 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 5d6e76f5f33645ace384e62cdfd291613494fea0 Author: Alejandro Abdelnur Date: Thu Aug 21 19:00:01 2014 +0000 HADOOP-10770. KMS add delegation token support. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619550 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit db6945c87420a673357b27156f8a8a23fba5c32b Author: Alejandro Abdelnur Date: Wed Aug 13 20:27:50 2014 +0000 HDFS-6849. Replace HttpFS custom proxyuser handling with common implementation. (tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617831 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt commit 02f38d59969bb3760b26ac3b1a2b3757a5bff972 Author: Alejandro Abdelnur Date: Tue Aug 12 00:10:15 2014 +0000 HADOOP-10835. Implement HTTP proxyuser support in HTTP authentication client/server libraries. (tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617384 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 55b22ffa6b1ee0a7ba17f343e3560e52e11f6800 Author: Alejandro Abdelnur Date: Fri Aug 8 04:58:58 2014 +0000 HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616672 13f79535-47bb-0310-9956-ffa450edef68 commit 2d7ad023c54c6ea867e90543688f7186fc9d483f Author: Alejandro Abdelnur Date: Fri Aug 8 04:55:38 2014 +0000 HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 1. (tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616671 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 5ba541a4509fe07c704e18b714f69f617d8caca2 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:56 2014 +0000 HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting underlying store. (asuresh via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619549 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d21ee8f68ae0dd0fb39075bc6b5cb0906e115c4a) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 92f1819a96d36aa07dc9816e710ce16cf0239fae Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:54 2014 +0000 HADOOP-10862. Miscellaneous trivial corrections to KMS classes. (asuresh via tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619548 13f79535-47bb-0310-9956-ffa450edef68 Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit c5a7577fe9bc71bd95aa537c560ae251a09cf3e5 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:52 2014 +0000 HADOOP-10939. Fix TestKeyProviderFactory testcases to use default 128 bit length keys. Contributed by Arun Suresh. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619547 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 5b72db99c7dbc9958add195ce92f893f7e6dd56d) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 4e416ecb0c406396305cf902dfc862d0370ff4b1 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:51 2014 +0000 HADOOP-10918. JMXJsonServlet fails when used within Tomcat. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619546 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 363244d57e7cfff2e330f645c5b799c4e86606da) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 7514932c554fb2fd740ef536eab3a2a0a16ad748 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:48 2014 +0000 HADOOP-10936. Change default KeyProvider bitlength to 128. (wang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619545 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 65ca56e8fc2b5c5bfd8ed624670e35ebf31d2843) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 7f6cb7d1a85e99f0b8379956aa4607f66c21cf3c Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:46 2014 +0000 HADOOP-10937. Need to set version name correctly before decrypting EEK. Contributed by Arun Suresh. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619544 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 8986cf769c4757f9ab0efd33670f3435e57d67e8) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 57a4b7b77dc46df2bbd91a3a4bba0159a13177bf Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:44 2014 +0000 HADOOP-10920. site plugin couldn't parse hadoop-kms index.apt.vm. Contributed by Akira Ajisaka. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619543 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b3ac808c13ead6513af5d1bd92b3cf8c9dc67a57) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 073ee60d6123b99f9faa16247f97d5619e47f91d Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:43 2014 +0000 HADOOP-10793. KeyShell args should use single-dash style. (wang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619542 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7fe5320e1511faee72df051df3f7d6a0f8b0beca) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit fae2eecbbb356c0419a0784c49f81acf8badf7da Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:41 2014 +0000 HADOOP-10756. KMS audit log should consolidate successful similar requests. (asuresh via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619541 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit de2daadbe0d8856d21e978a10c402f594d40711b) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 5528e9e0fc05f44b87a3e25381b9330f8ba873a3 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:38 2014 +0000 HADOOP-10891. Add EncryptedKeyVersion factory method to KeyProviderCryptoExtension. (wang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619540 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 9fd189825a147e293881b5327ea114b744768887) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 9c309f5d197391ecdc7ee6112ad63b1e7e05cd98 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:36 2014 +0000 HADOOP-10881. Clarify usage of encryption and encrypted encryption key in KeyProviderCryptoExtension. (wang) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619539 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 46481892efbd809527b32a1f7e2c4d6021399b93) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit e6638ca48ff34afe4faa4f654ab232dbbab333f0 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:34 2014 +0000 HADOOP-10826. Iteration on KeyProviderFactory.serviceLoader is thread-unsafe. (benoyantony viat tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619538 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit a74ca2601b1ac52b8967c1a658f08d9943589ef0) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit c76654eb514ac78e3f67eb6cce65fa480ac7b8e8 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:32 2014 +0000 HADOOP-10720. KMS: Implement generateEncryptedKey and decryptEncryptedKey in the REST API. (asuresh via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619537 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit c486ab4e4ecdf64c9772156b879c2a9989921ae5) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 532c0263ed977899f457f4ef19e88f52c9b8d799 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:29 2014 +0000 HADOOP-10750. KMSKeyProviderCache should be in hadoop-common. (asuresh via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619536 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b6ec141aa7273f8cc12b17e41dd0ef9890a7a67b) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit bd7df75a61cd980f83a82d10beec8dde858310a0 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:25 2014 +0000 HADOOP-10842. CryptoExtension generateEncryptedKey method should receive the key name. (asuresh via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619535 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f2d243b063ee0bdbb39c890a054ef6f2a2444475) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit bf98fccfaa6c772d1cf432c442fa58fdffa64e47 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:24 2014 +0000 HADOOP-10841. EncryptedKeyVersion should have a key name property. (asuresh via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619534 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b34b83d1e7e1b86cac3ba995b3417de40713b512) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 4faafc039acd5a68e25a7d4035d65b4c87738db0 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:21 2014 +0000 HADOOP-10816. KeyShell returns -1 on error to the shell, should be 1. (Mike Yoder via wang) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619532 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e2f4807d26ea5e91bb9fd11f6d6112e5c885257f) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 58ad0100b9ae7512fe026c579d8e44b17c367c74 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:19 2014 +0000 HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via umamahesh) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619531 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit bdc5ad570eaf18c00b19e1c393daa44f1df1bc40) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 0af2af0d218c7a188ebbd9767bd734a96978f052 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:18 2014 +0000 HADOOP-10736. Add key attributes to the key shell. Contributed by Mike Yoder. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619530 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7e130bd8767af031ac5dcfef6ea90a520d8821ad) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 154ce628c52dd86786b12c18bfc43b9a8d6f5c4e Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:16 2014 +0000 HADOOP-10812. Delegate KeyProviderExtension#toString to underlying KeyProvider. (wang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619529 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 1b6202dca2038c2df34b54064ac6be8810c28791) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit e397743a58bf6006bdadd9aba608b2db2f9ee2c9 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:15 2014 +0000 HADOOP-10769. Create KeyProvider extension to handle delegation tokens. Contributed by Arun Suresh. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619528 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 258bd6d7cf0153fe864c034ee0359224a8c77c5e) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 7810204db6d38c3d3c5a74442c0420038e67f50e Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:13 2014 +0000 HADOOP-10719. Add generateEncryptedKey and decryptEncryptedKey methods to KeyProvider. (asuresh via tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619527 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 870d09857c4aac7afd27d96479e7483fc23f1852) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 8597f7e7a0caf55dd68e0cfd16c08a0a648b88b7 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:11 2014 +0000 HADOOP-10757. KeyProvider KeyVersion should provide the key name. (asuresh via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619526 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fcb05adeeb4cda9562d21fef2279f71bbeb237cc) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit d726d6d5c5cf4e9e31b335849ea17edd2149eab9 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:09 2014 +0000 HADOOP-10695. KMSClientProvider should respect a configurable timeout. (yoderme via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619525 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit eea33e879a3a0835eff8f2b4d2a09cc72a8c2cec) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 35f965cb4d5d4f891c5f2f4471c3f8859dc3665e Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:07 2014 +0000 HADOOP-10696. Add optional attributes to KeyProvider Options and Metadata. (tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619524 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 24cdd0890bce6b6edb30db783f26cf8066e3fc69) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit ec4cc9328372ed9bf631d6fcb0109075d82be527 Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:03 2014 +0000 HADOOP-10607. Addendum, bringing in changes, KMS related, which were left out in the original merge. Conflicts: hadoop-common-project/hadoop-common/src/main/bin/hadoop hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/JavaKeyStoreProvider.java hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/alias/TestCredShell.java git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619523 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 113e15b3fb7f688a419da17dd517de1b871621cc) commit 651cd20909f4e2bec5d0d8c58dab8548f5067c6a Author: Alejandro Abdelnur Date: Thu Aug 21 18:59:02 2014 +0000 HADOOP-10611. KMS, keyVersion name should not be assumed to be keyName@versionNumber. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619522 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit bb400cbca73a3d1c70983f75503529329767d70e) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit c802eb9f3260c0e1a1b11861d8583fb02d751d5e Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:59 2014 +0000 HADOOP-10645. TestKMS fails because race condition writing acl files. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619521 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 07771f7a5ae5acd8c711ee77bbd64b122bfaaded) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 9ba7f63e834fc271b76ca4b6881f2454a93dc22e Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:57 2014 +0000 HADOOP-10586. KeyShell doesn't allow setting Options via CLI. (clamb via tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619520 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 54638188e1b7c4d33a2cc4ea773d2cf6a1948355) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 341dd9be7bff4b0d987840eacb1a629d5d24fb59 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:55 2014 +0000 HADOOP-10583. bin/hadoop key throws NPE with no args and assorted other fixups. (clamb via tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619519 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 0312fe3c1a6107ed18737309c1a12a491d0c1e58) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 6db5ac903dffe7bc6ecdf368385e10138fd03fb8 Author: Alejandro Abdelnur Date: Wed Sep 3 10:51:54 2014 -0700 CLOUDERA-BUILD. Updating version in hadoop-kms POM commit ca170df7c51ebcd0b408baf0e7076f10f9889318 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:53 2014 +0000 HADOOP-10433. Key Management Server based on KeyProvider API. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-project/pom.xml git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619518 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 2b9abba3e9fb96268f5da83effddca5ac12c41ee) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 9441294d748b5c00c2f4883320447f45b188c5f8 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:45 2014 +0000 HADOOP-10534. KeyProvider getKeysMetadata should take a list of names rather than returning all keys. (omalley) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619517 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 509260e7028f1192fb58ccdf9fe243e16b0bfeda) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 54275ddcc2284e5c244747db826bfc91a65a67f8 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:43 2014 +0000 HADOOP-10431. Change visibility of KeyStore.Options getter methods to public. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619516 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit ab7ed6d9b4572f3ac7024efea07c0ffa175922d6) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 334a2107b37aed82802d3f357f471d5fa03168b3 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:42 2014 +0000 HADOOP-10430. KeyProvider Metadata should have an optional description, there should be a method to retrieve the metadata from all keys. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619515 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit ff1f973264bb0f0c61955e689a27736f643d6240) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit eb55b77ff17fc7d0c3d4aaaf80c5907598c3fa1e Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:40 2014 +0000 HADOOP-10244. TestKeyShell improperly tests the results of delete (Larry McCay via omalley) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619514 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 4706e736dca8eb1f5de5544c1ed7dff5f048a286) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit d8adb19df3f800fa842326664e5055a9f0bccb81 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:39 2014 +0000 HADOOP-10428. JavaKeyStoreProvider should accept keystore password via configuration falling back to ENV VAR. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619513 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e589bc9f0212da11ba1a9a581534ea8e03293270) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 48ed40fef88036251ce70dac06b638da18660b82 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:37 2014 +0000 HADOOP-10427. KeyProvider implementations should be thread safe. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619512 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 3a8b2d0f1bb35f81891e4a79d29012e7bcb6e45e) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 4ee542a9ae54cbaf1106072b10dc133f2f1fc5d5 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:35 2014 +0000 HADOOP-10429. KeyStores should have methods to generate the materials themselves, KeyShell should use them. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619511 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 98fc3ff2448fd3de858671861af8d0de55373ceb) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit db73fe163cb4767c107a79f41369204934617ce0 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:33 2014 +0000 HADOOP-10432. Refactor SSLFactory to expose static method to determine HostnameVerifier. (tucu) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619510 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7edb93c74155af0402bccfe0f689670e210553eb) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 721f9e7b0b64811a0a68931b08bb1ab478ff78b9 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:32 2014 +0000 HADOOP-10237. JavaKeyStoreProvider needs to set keystore permissions correctly. (Larry McCay via omalley) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619509 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b8b84c961b2f6e8b6500e1e3367a320d21378555) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit e92a2dc937229d265fb61652bd23831c3b16a1c2 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:29 2014 +0000 HADOOP-10177. Create CLI tools for managing keys. (Larry McCay via omalley) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619508 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 89f565bd4a2c3a5dbe3b00961bda89bb28fca3fa) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 983ae6d19fd15115ee13834b476b35f050e8e639 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:27 2014 +0000 HADOOP-10201. Add listing to KeyProvider API. (Larry McCay via omalley) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619507 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 337d7e2aae0459e187b575c12d317b830698407d) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 7b04446e9a870e36e306e3e8b00fefd85a29d8f2 Author: Alejandro Abdelnur Date: Thu Aug 21 18:58:24 2014 +0000 HADOOP-10141. Create KeyProvider API to separate encryption key storage from the applications. (omalley) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619506 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit a6143c7f47861307cc6c27a46688beca57186799) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit d30ad3d7bffa845988a2d413343ea92c6068474b Author: Ray Chiang Date: Mon Aug 25 15:00:59 2014 -0700 MAPREDUCE-5130. Fix git annotations left over in mapred-default.xml (cherry picked from commit 1e1706602267f834ab6ec9f1ae92ea441da2e4c2) commit 98365442aa70b158f06c88e2fd71d0b0d02079ab Author: Sanford Ryza Date: Thu Aug 21 23:28:44 2014 +0000 MAPREDUCE-5130. Add missing job config options to mapred-default.xml (Ray Chiang via Sandy Ryza) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619626 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit cd9622f0117c1fd04135bab2180e7419978d8dbf) Conflicts: hadoop-mapreduce-project/CHANGES.txt hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml (cherry picked from commit aa4fc08a7eb7c7901e4aff1e136e99a292d69d7f) commit 2db30fe4bd382089a3aec3d847fa7140f89bba9d Author: Juan Yu Date: Tue Sep 2 18:13:43 2014 -0700 MR1: CLOUDERA-BUILD update cdh version for packaging. commit 101e94a7fee25674d62f6e15fa48bd0a202a1f2c Author: Juan Yu Date: Tue Sep 2 18:10:51 2014 -0700 MR1: CLOUDERA-BUILD, update jackson version to 1.9.13 (cherry picked from commit da097ec56e0534454b907343fac9a060af49e25a) commit 5d61ab0323ef495929a6f3483cfa61ed19e6951e Author: Juan Yu Date: Wed Aug 27 16:29:40 2014 -0700 MR1: CLOUDERA-BUILD. Fix build failure due to upstream change (code cleanup, remove deprecated methods, etc.) List of upstream JIRAs that causes MR1 build failure. Hadoop-10386 Log proxy hostname in various exceptions being thrown in a HA setup Hadoop-10448 Support pluggable mechanism to specify proxy user settings HDFS-6168 Remove deprecated methods in DistributedFileSystem commit a804b339cc9edee39dbd008db0378ee46eb0cbe9 Author: Robert Kanter Date: Wed May 14 13:25:07 2014 -0700 MR1: CLOUDERA-BUILD. MR1 no longer compiles because of changes to HttpConfig in YARN-1553 (CDH-19117) (cherry picked from commit bf87244f585255d39fc6acbff6b196d02cfa7bb0) commit 080682f0cbc5a621ede9fda80dc257208ef092c2 Author: Mark Grover Date: Wed Dec 19 17:54:39 2012 -0800 MR1: CLOUDERA-BUILD. CDH-8545: Package Job Tracker High Availability (cherry picked from commit 8fca711ea5add34ca61c08579beb62959ab4504b) (cherry picked from commit fe42ed33cbcee884839d91ca91d3d44cb4adf7da) commit 9ffb5c5ec96066f541ed8cb29be86a489bae0094 Author: Karthik Kambatla Date: Fri Aug 8 14:40:46 2014 +0000 YARN-2352. FairScheduler: Collect metrics on duration of critical methods that affect performance. (kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616785 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 88a51c1e74d8d6568c9fb2a804357212e37143dd) commit db2c3fd18ededc2a14511598f75e23cc179db2c2 Author: Karthik Kambatla Date: Tue Jul 29 17:46:58 2014 +0000 YARN-2328. FairScheduler: Verify update and continuous scheduling threads are stopped when the scheduler is stopped. (kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614435 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 835f682cc83f1456159caa45517f4fe4c8f8a8e6) commit 510282b33b54e773f81aad7090a89d9001c8165c Author: Juan Yu Date: Wed Aug 20 15:27:21 2014 -0700 CLOUDERA-BUILD Revert "HADOOP-10535. Make the retry numbers in ActiveStandbyElector configurable." This reverts commit 659f3b228d8752f4066ec86c7a0def154b452571. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java commit 9047f29072ac74f300bf04464e936863ddf53464 Author: Juan Yu Date: Wed Aug 20 15:15:41 2014 -0700 CLOUDERA-BUILD Revert "HADOOP-10451. Remove unused field and imports from SaslRpcServer." This reverts commit 8ae3acb5d23ea1dfadc2e0d5439a4fde61a60d70. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt commit 0067065d8bf17d348471093d7c255f8f9b14bf55 Author: Sandy Ryza Date: Mon Aug 12 10:49:48 2013 -0700 CLOUDERA-BUILD. Revert "svn merge -c 1507259 from trunk for HADOOP-9756. Remove the deprecated getServer(..) methods from RPC." This reverts commit a004a2812d9109d995d9a7870b772c24a21e69ba. Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java (cherry picked from commit 561241771c52496b78b38460443fc80b34c534ec) (cherry picked from commit 12c785414fb08d3005831d82ac979deebf7718ec) Conflicts: hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java commit 7782b1e796541793f7bd55fe4394e7261e6bf2e2 Author: Sanford Ryza Date: Wed Jul 23 05:00:52 2014 +0000 YARN-2313. Livelock can occur in FairScheduler when there are lots of running apps (Tsuyoshi Ozawa via Sandy Ryza) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612769 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 107786343281e5594e064e2088cbc5bb93e97f70) Conflicts: hadoop-yarn-project/CHANGES.txt commit 88787fb44d670bf5b833ab1e5a30a73710a6e705 Author: Karthik Kambatla Date: Tue Jul 22 22:44:38 2014 +0000 YARN-2273. NPE in ContinuousScheduling thread when we lose a node. (Wei Yan via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612720 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 17a47c189460dc5183582ceb370b3f3f226fb1ae) Conflicts: hadoop-yarn-project/CHANGES.txt commit 8ec18acc86ec1d3a19cc5be016310ae4c90ceff4 Author: Juan Yu Date: Mon Aug 18 15:58:11 2014 -0700 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/trunk@1616375 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit eeeddf3cc59aae21bc458cd1989756962bc5b124) Conflicts: hadoop-yarn-project/CHANGES.txt commit b152506e4e73717284c6bcbb36c6ce27830488e3 Author: Juan Yu Date: Mon Aug 18 15:52:39 2014 -0700 YARN-2274. FairScheduler: Add debug information about cluster capacity, availability and reservations. (kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610542 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit c43e7cb7605574d312ee45b3d164374734c3cf83) (cherry picked from commit f03192ba62f91360ce293d1c65f98d72864169f1) commit f4c49ef80a8ad781f5838f7c1f7f9417ab744fbc Author: Karthik Kambatla Date: Mon Aug 11 01:42:26 2014 +0000 YARN-2361. RMAppAttempt state machine entries for KILLED state has duplicate event entries. (Zhihai Xu via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617190 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7895e8bc71d241e2020a2cc1af57817f7f268594) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 751eb04f7e5a9522df58202f35da1ce773799d5b) commit e9b58e9a6745da14856eedd3caaef63d6ee3c719 Author: Karthik Kambatla Date: Mon Aug 11 00:13:27 2014 +0000 YARN-2337. ResourceManager sets ClientRMService in RMContext multiple times. (Zhihai Xu via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617183 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 2dc8937afb6c4b26bd8e57c8d871b24aedbe4ef5) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 9dd526c171543ce6563247c3b4ea81cb936efa6c) commit e0a01fe802b191337913e23bfc88000ef8fd862a Author: Andrew Wang Date: Tue Aug 12 17:46:31 2014 +0000 HADOOP-10820. Throw an exception in GenericOptionsParser when passed an empty Path. Contributed by Alex Holmes and Zhihai Xu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617542 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 056d8673d0702ddea59d261eb0fb423e3d0ee0ad) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 1c5e00e626d521e6831804eb3995eb3c48539d33) commit 50e1bf577ebddea37d9c392914f8a9d5991e9b49 Author: Colin McCabe Date: Tue Jul 15 18:17:35 2014 +0000 HDFS-5809. BlockPoolSliceScanner and high speed hdfs appending make datanode to drop into infinite loop (cmccabe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610791 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d7f256a7cad46e6147e84b10fdf9cd18bb6e3851) (cherry picked from commit 26633fd39dee0ec18c643d43ccfe358549ef2772) commit ceddcfb9c9ca3b8f4c53001ddd6a6814050ffeb1 Author: Zhihai Xu Date: Tue Aug 5 12:36:09 2014 -0700 MAPREDUCE-5968. Work directory is not deleted when downloadCacheObject throws IOException (cherry picked from commit 50a40e8cf8fdadf4adeb71291bb75883a3801c24) commit 2a451fa1bf9aa20cbe3f62cdbe9ef0f131cd3831 Author: Karthik Kambatla Date: Tue Jul 22 18:11:43 2014 +0000 YARN-2131. Addendum2: Document -format-state-store. Add a way to format the RMStateStore. (Robert Kanter via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612635 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 24e4c4243c350d843870e3533e6589e9e936c156) (cherry picked from commit 6c578db3f9bcdef2e3aa8ff81ad66aac72114934) commit 2b87d43080c431665c6b3d464fd4ea559f19665d Author: Karthik Kambatla Date: Tue Jul 22 01:33:17 2014 +0000 YARN-2131. Addendum. Add a way to format the RMStateStore. (Robert Kanter via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612444 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b0dcf77e9524910abba24c23abc05e941f1915e2) Conflicts: hadoop-yarn-project/hadoop-yarn/bin/yarn (cherry picked from commit 0aead9084ea57edb2e96075daa2d612ea1e3171b) commit 867d70fe2ddf331417a5465ebbb95735c7bad91a Author: Karthik Kambatla Date: Wed Jul 9 20:03:18 2014 +0000 YARN-2131. Add a way to format the RMStateStore. (Robert Kanter via kasha) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609280 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 8da2e85960a1444938cf8e47992d4ad1e0dfe4ee) Conflicts: hadoop-yarn-project/hadoop-yarn/bin/yarn (cherry picked from commit c6b2e84973fb1ec0076de9f4fc442b334cceaf4b) Conflicts: hadoop-yarn-project/hadoop-yarn/bin/yarn commit 81d4b9098698e41df12a88e8ee656b922930c78f Author: Juan Yu Date: Tue Jul 29 09:26:09 2014 -0700 HADOOP-10507. FsShell setfacl can throw ArrayIndexOutOfBoundsException when no perm is specified. Contributed by Stephen Chu and Sathish Gurram. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1609503 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f96a69d22d5e57b521dfb02c4fcd58881af63fe6) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit 0bcf1f5b508d093c7dd7f8023fac554e33350db8) commit b3a998af2029db4c21904ad078da9251f964506b Author: Andrew Wang Date: Mon Jul 21 21:52:17 2014 +0000 HADOOP-10755. Support negative caching of user-group mapping. Contributed by Lei Xu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612408 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit ae81f76ba949f2d7c9e86153576a447f65023366) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commit b6769e0df0c3be52f750e38b45f53f0e7b79cf35) commit b6b0be2ebf8d8652bb06abe00127e76769fe2703 Author: Robert Kanter Date: Fri Feb 28 16:06:03 2014 -0800 CLOUDERA-BUILD. JobHistoryServer has no information about failed MR applications (CDH-13222) and fix test failure (cherry picked from commit 4a000726db6596a532661c585118eabcae7d47de) (cherry picked from commit 5adb0731b23ed512565b3752b1cc25bd97d9f1f9) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java commit 4189cc67eb18becb682534638077167f1d1130d9 Author: Robert Kanter Date: Tue Jun 24 14:49:29 2014 -0700 CLOUDERA-BUILD. Fix trivial test failure introduced by CLOUDERA-BUILD CDH-13222 (CDH-19994) (cherry picked from commit 2577048baa35a47b7fb98210ce8285c426c41b50) commit d3812d9d23631598a104e5846df3594f0fa7542c Author: Robert Kanter Date: Mon Jun 2 13:58:01 2014 -0700 CLOUDERA-BUILD. CDH-19529 Precommit version of MAPREDUCE-5875 Make Counter limits consistent conf across JobClient, MRAppMaster, and YarnChild (cherry picked from commit 7abf3862ee87142935df8be7e58ec020355a8840) commit 8ba202b957f82df0623a86aca99c9f5d1c95625a Author: Mike Mellenthin Date: Fri Feb 28 16:20:17 2014 -0800 CLOUDERA-BUILD. Use a more calm color in the Hadoop web UI. (cherry picked from commit 275e44425b7c7c39265837f3da5cd1af3c042b20) commit c02e10273577f91f36cd70ed657e4bc3c4c9a875 Author: Naren Koneru Date: Fri Feb 21 15:39:36 2014 -0800 CLOUDERA-BUILD Disable virtual memory check for containers. Please look at CDH-17484 for more details. (cherry picked from commit a48ba7ac066b4d50ee4c8757ff1f2fe2269ccc3e) commit c30e354e4e7f4d54ad2050db6469723573c3da2d Author: Andrew Wang Date: Thu Jan 16 16:36:32 2014 -0800 CLOUDERA-BUILD. Restore .gitattributes file after rebase. (cherry picked from commit 07222bf2967bb09b112407e651d1c16c457615e2) Conflicts: .gitattributes (cherry picked from commit 74b09e4b1bac90253538e14a680a90b180768421) commit 20e993ac67c33959b8c3af1517f6f3ef10c40258 Author: Alejandro Abdelnur Date: Fri Jan 3 13:50:58 2014 -0800 CLOUDERA-BUILD. CDH-16529 Support containers with zero CPU or MEM when cgroups and memory monitoring is enabled (cherry picked from commit c33e9e44c7cb52d055481c8a5cb2bfc3b5feea34) (cherry picked from commit 0e5e45ce76bab505f1033646c7de707b7e27f61c) commit 44e4a0bc145c76932be27607e4e03f9ed08a7730 Author: Juan Yu Date: Mon Aug 18 11:14:08 2014 -0700 CLOUDERA-BUILD. Update poms for 5.2.0 - version: 2.5.0-cdh5.2.0-SNAPSHOT commit 7ff64d5c8eb2233d07b299fdb4d216533bc613cf Author: Karthik Kambatla Date: Thu Jun 13 19:41:23 2013 -0700 CLOUDERA-BUILD. Revert "CLOUDERA-BUILD. Revert "HADOOP-8912. Merging changes 1397437 and 1397438 from trunk"" IOW. Reapply HADOOP-8912 This reverts commit 0f1a867b5d7b122f90698f341aec44f46d592e81. (cherry picked from commit 680a6f4fc34ff7d3fba9ad05e5beb025493d5563) (cherry picked from commit 24f0893ac458ba8e0bcb04f1796bbd8a4c07b069) (cherry picked from commit c6675f69300b5550f50270a9d4a2315436ffe534) commit e3ec2519ad912f3318a6458e0b73a03ffe3fabf1 Author: adhoot@cloudera.com Date: Mon Jul 28 14:30:23 2014 -0700 MR1: MAPREDUCE-5966. MR1 FairScheduler use of custom weight adjuster is not thread safe for comparisons. (Anubhav Dhoot via kasha) (cherry picked from commit e43ed1748cee4599ff5c93b4c78abd9efb08fa8e) commit 28b04851c589ac4d1ea6d6f9441eeeb13dabd21d Author: adhoot@cloudera.com Date: Mon Jul 28 11:32:48 2014 -0700 MR1: MAPREDUCE-5979. FairScheduler: zero weight can cause sort failures. (Anubhav Dhoot via kasha) (cherry picked from commit 399503ffee5e8c4da801368d45713486a07277f3) commit 89420fcfb12a8a54a368e66547f584f9bcadc6af Author: Zhihai Xu Date: Fri Jun 20 12:35:05 2014 -0700 MR1: MAPREDUCE-5375. Delegation Token renewal exception in jobtracker logs (cherry picked from commit 3ebccb3d42edcfd031fea342f0975fcae2748478) commit 731cc2c0543f8182f8f834db01e2a8af3bc99c99 Author: Gilad Wolff Date: Tue Jan 21 14:35:48 2014 -0800 MR1: CLOUDERA-BUILD. Preliminary version of MAPREDUCE-5707. ApplicationClientProtocolPBClientImpl (and JobClient) does not allow to set rpcTimeout This commit adds the ability to enable rpc timeout for the job client. The approach taken was to add a new configuration parameter "mapreduce.jobclient.rpc.timeout". By default it is set to -1 (no timeout) to maintain backword compatibility. If set to some positive integer it will be used as the rpcTimeout in the underlying ipc Client. Testing done: New unit-tests. TestRpcTimeout hanged forever before this commit and now passes. (cherry-picked from commit 3167c63e253e502b16cfb27079d3bd825e96f4be) (cherry picked from commit 7901f25f833a93b17fb079e94f4f8ac57ee060d8) commit ccf8b6a4c5ae0108b7b83bfe20d70597debe574b Author: Zhihai Xu Date: Thu Jun 19 19:02:56 2014 -0700 MR1: MAPREDUCE-5777. Support utf-8 text with BOM (byte order marker) (cherry picked from commit 507af07fcd86498f84e00382fc8e650cffaef6f3) commit 38f3cdd2cd769c6e4ecd8c231b9f9144fa86370c Author: bc Wong Date: Mon Mar 24 21:41:47 2014 -0700 CLOUDERA-BUILD. CDH-17140. JT HA IPC timeout (cherry picked from commit 6ede546173b585c10a7be90d2b44832bf7442b3d) commit 2adc80e82c4ded19d8098f13700faa748d0091e9 Author: Ray Chiang Date: Thu May 22 13:12:41 2014 -0700 MR1: CLOUDERA-BUILD. CDH-19247. jobhistory.jsp does not show correct histroy after JT restart. Fix provided by Wilfred Spiegelenburg. (cherry picked from commit 0d6c51fdaa72845861fa75ae7a61fbf4794b7822) commit 36720350e9c3544eae5159731b2f8e7348a12321 Author: bc Wong Date: Tue Apr 29 00:16:18 2014 -0700 MR1: CLOUDERA-BUILD. MAPREDUCE-5862. Line records longer than 2x split size aren't handled correctly (cherry picked from commit 6519104ee5ccf6820beee90bf672b9ad5aa37085) commit 50a69572e849addf9d9d208aeab483a26b7b20fb Author: Robert Kanter Date: Wed Apr 23 16:53:40 2014 -0700 MR1: CLOUDERA-BUILD. CDH-18781. Counter limits always use defaults even if JobClient is given a different Configuration (cherry picked from commit 3f3e218704089ac83f7b993a7079406e3bd52884) commit c2fa761d6bd7e8b62465224698c78781a7cff538 Author: Karthik Kambatla Date: Fri Apr 4 18:02:38 2014 -0700 MR1: CLOUDERA-BUILD. CDH-16752. JT HA race on task launch timeout (cherry picked from commit 0c760be0b52d3452a8c565edea0eb28a04ba33c6) (cherry picked from commit 777e3b9b69dbea6b29a89552c2aa1f9c1777f3e1) commit 533a29b47dfdefec02e06ffa1dd2877c67e301f5 Author: Karthik Kambatla Date: Fri Feb 14 15:46:33 2014 -0800 MR1: CLOUDERA-BUILD. Update version to 2.3.0-mr1-cdh5.0.0-SNAPSHOT (cherry picked from commit 526a8f43dedb63692745aedd44e9326f2adc7c94) commit b66182379bf81ae3eccf40b1c85b85b6445575b5 Author: Sean Mackrory Date: Mon Jan 13 11:42:27 2014 -0800 CLOUDERA-BUILD. Harmonizing commons-logging version to 1.1.3 (cherry picked from commit 0df9cab9e4648ec734ece60c7498cf1be43b585f) (cherry picked from commit 2461cc419a9a696572c284c8555923f1f49201fe) commit c962830d81525b672fc2d321d27ee79a6d95a964 Author: Yongjun Zhang Date: Tue Jan 7 10:29:06 2014 -0800 HDFS-5685. DistCp will fail to copy with -delete switch. Contributed by Yongjun Zhang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1556082 13f79535-47bb-0310-9956-ffa450edef68 Reason: Bug reported by customer Ref: CDH-16041 (cherry picked from commit 16a89b78359994241c392afbe8bac2f8eedbdb02) (cherry picked from commit d1b8d14465acb5df1341b103526406ac397b6023) commit 4d1741e804659dddd25b2079fd092e4b3f889b31 Author: Konstantin Shvachko Date: Fri Sep 30 19:16:54 2011 +0000 MR1: MAPREDUCE-2779. JobSplitWriter.java can't handle large job.split file. Contributed by Ming Ma. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177783 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit ccb3b5595a234c9894c115d65f7054064798f852) (cherry picked from commit 61a7e586697e4d5ce3382570df0c23f8572e8409) commit c9093f6b9277841f28e0db42061bb4a822eb466d Author: bc Wong Date: Mon Feb 3 21:58:25 2014 -0800 MR1: CLOUDERA-BUILD: CDH-17151. Fix hadoop-core's TokenRenewer provider list (cherry picked from commit 8a3986348c0f8cde7c14c011dc2fb50c88f65d0e) (cherry picked from commit 781f933cb87c2cc1269993f4649205e66e457747) commit 7a4a94ff2a5b0a49581066d38048d6ea4da57b14 Author: Colin Patrick Mccabe Date: Thu Nov 21 13:26:10 2013 -0800 MR1: CLOUDERA-BUILD. Backport HDFS-5511 to MR1. (cherry picked from commit d5ef8b6157d4d414d7961c27a79e0e405e793af0) (cherry picked from commit 837acf49c3bde43057572392655ed1237cc261be) commit 72a669c7d8e2d9aee296326c767c458940d5bdd8 Author: Todd Lipcon Date: Wed Oct 2 10:46:33 2013 -0700 MR1: CLOUDERA-BUILD. Update MR1 to ZK 3.4.5 dependency version This harmonizes the version number with Hadoop 2, which depends on 3.4.5 due to recently-committed HADOOP-8315. (cherry picked from commit 150bcf14d754c52f75be236c0f50b3c9a548ef04) (cherry picked from commit a08ee4a9dc4aad199d2d044033f117e08b792026) Conflicts: hadoop-project/pom.xml commit 4bc41264a68eeff84cf2c5b47d8951dade481631 Author: Karthik Kambatla Date: Tue Feb 11 14:19:54 2014 -0800 MR1: MAPREDUCE-2324. Job should fail if a reduce task can't be scheduled anywhere (cherry picked from commit f1ace2953b28b97b89779cd8d369c5b678d1f949) (cherry picked from commit 3fac7c42755f26952da062908dceaec8c7c65e3a) commit 1f81a2f0fe9566d8d710dabb6f960749ab267a2d Author: Andrew Wang Date: Mon Jan 20 15:12:02 2014 -0800 MR1: CLOUDERA-BUILD. Remove unnecessary imports for HftpFileSystem causing compile errors. (cherry picked from commit fcb10c34d32cdb65b9e48e2c7ac1433293cb180d) (cherry picked from commit da36dfd0afe994ce1abfe775e3a10263231f89ad) commit 311ccaf94a9a12cbaa3d23d16636436129270f5a Author: Sandy Ryza Date: Mon Jan 13 10:20:36 2014 -0800 MR1: MAPREDUCE-5651. Backport Fair Scheduler queue placement policies to branch-1 (Ted Malaska via Sandy Ryza) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1556404 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 608ca7f6cfef3d5e1c7d8042b134b9da24989873) (cherry picked from commit 4f3bcedbaeacc25706568595885510e17f131b99) commit fd3dd50b776e51c4987391bdcd5100bcdd55a1d8 Author: Alejandro Abdelnur Date: Mon Jan 6 15:40:21 2014 -0800 MR1: MAPREDUCE-3310. Addendum fixing javadocs warnings (tucu) (cherry picked from commit 820a059a60f6eb42887db77df0286a8d2695b6b4) (cherry picked from commit 2c035f344f5d36e1c17b1445021844f7623c78e1) commit 9376b5f094c82f8b9e8162e836625141e5c1a7dc Author: Alejandro Abdelnur Date: Mon Jan 6 11:29:16 2014 -0800 MR1: MAPREDUCE-3310. Custom grouping comparator cannot be set for Combiners (tucu) (cherry picked from commit a3001f9ebccaf587ac312d563ce2f445080f4982) (cherry picked from commit 25405ee8d4a1f3598a763cc4dcdaaaa80ed26f48) commit fe6ba872dddcec3304c42f63c990a5f329f9afe9 Author: Karthik Kambatla Date: Tue Dec 31 14:11:37 2013 -0800 MR1: MAPREDUCE-3169. Create a new MiniMRCluster equivalent which only provides client APIs cross MR1 and MR2 (ahmed via tucu) (cherry picked from commit 4eea0e8cfa16d058339b1bf85848b15ba622f117) (cherry picked from commit 67485626e70cfeb19006d0bfed8a83de4d5af0a7) commit 09c20486c432d0f02c0dc245f0ea08e8af7ba65f Author: Karthik Kambatla Date: Tue Dec 31 13:08:26 2013 -0800 MR1: Backport MAPREDUCE-5702. Remove spurious closing HTML tags from TaskLogServlet. (rkanter via kasha) (cherry picked from commit ee68b5ba9bddac3a89c4163a328051e3542d407b) (cherry picked from commit 8a38e725db090cab73ffe951dd3ae5d7cc7095ed) (cherry picked from commit 3e3615e32b3b50a76e8c3d4bf3af6a93611c6950) commit 2fc09d943de6b55a881631c6f419aaac7022c07d Author: Karthik Kambatla Date: Sat Nov 16 02:40:56 2013 +0530 MR1: CLOUDERA-BUILD. Add JobTokenIdentifier as a provider for TokenIdentifier (cherry picked from commit 98d1bf08e6ce42df9fc3194c2d1037bc259707cf) (cherry picked from commit b6053867acec2854547ffe87fd8887ddc624e662) (cherry picked from commit 937d0b19d30f7377bb29ee18cde83f0833655217) commit 5579d17abd49c9a102596c5015822002a4c687b1 Author: Robert Kanter Date: Wed Nov 6 15:13:49 2013 -0800 MR1: MAPREDUCE-5609. Add debug log message when sending job end notification. (rkanter via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1539476 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 53a47c415600ae0216f9fe529650e26c72579118) (cherry picked from commit 9a52ec86c24b4614bedbf2a0fa91a3720c484898) (cherry picked from commit 0f3d8773451dcec87d1a89fbfbe63bc7ae262176) commit c7f545b9d841988fec81094af9040d5abc853328 Author: Karthik Kambatla Date: Tue Nov 5 16:45:17 2013 +0530 MR1: CLOUDERA-BUILD. CDH-15148. Fix MR1 scripts to work in a consolidated tarball. (cherry picked from commit 455d2fa9f2a44b2c178d4a51c8466566abeba90b) (cherry picked from commit 4b006486a6996a0e5b053e294dcc0c70c26cab04) (cherry picked from commit 01abda3b4699e12cd8cca6ca69e701f48d72623d) commit 91088fc06645418d01e45e9d65029044435bfe61 Author: Robert Kanter Date: Mon Nov 4 11:12:41 2013 -0800 MR1: CLOUDERA-BUILD. CDH MR1 equivalent of MAPREDUCE-4383 (HadoopPipes.cc needs to include unistd.h) (cherry picked from commit 5e65db28ddd8c985c37df737da9f3e9359ab8feb) (cherry picked from commit 4ed8f701bde3a253b13edbab4f32bdc121aa7327) commit 80fdec50f74efb22e33c93142ff482ca4de66255 Author: Karthik Kambatla Date: Mon Oct 28 14:52:19 2013 -0700 MR1: MAPREDUCE-5206. JT can show the same job multiple times in Retired Jobs section Reason: Fixes a JT pseudo-leak reported in CDH-9823 Ref: CDH-9823 (cherry picked from commit 1e3313c17a39c682689814391cb7b972408a4cbf) (cherry picked from commit 9d1fecec93e5ce13a3eb44b2fedf437147a43ab5) (cherry picked from commit 16275098f3eb9be386d4df7b1367075049bea24e) commit df6988eb2d4fa7e480dc6cec3f76cded033f536f Author: Sandy Ryza Date: Mon Oct 7 11:49:26 2013 -0700 MR1: MAPREDUCE-5508. JobTracker memory leak caused by unreleased FileSystem objects in JobInProgress#cleanupJob. Contributed by Xi Fang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1525774 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 5673cad674fa56a2150ec235f6dc08dcb36c3a0f) (cherry picked from commit 2f05caf22241613b3a8df538316c2c2c88596beb) (cherry picked from commit 9c6ba84caea0e973e8262b5f9c2679a9dd4dcd0d) commit 59d29a30d5fe086dbb38c9c41227363664c446cc Author: Arun Murthy Date: Sat Apr 20 19:21:02 2013 +0000 MR1: MAPREDUCE-5066. Added a timeout for the job.end.notification.url. Contributed by Ivan Mitic. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1470218 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 9f722d0de306b1d40f17e4cb6b7f55ffa4650971) (cherry picked from commit 17047da787f06613c899fcaf57232a986b2ab08e) (cherry picked from commit 894948bb9c88b93bb6b108a7992a1d943e637c71) (cherry picked from commit 10e88c510d9185e2a76e1e51bcac981663cd160e) commit 35dd7c700b1044e37808dc54119448136e876ec1 Author: Robert Kanter Date: Fri Jan 3 15:23:25 2014 -0800 CLOUDERA-BUILD: MR1: toBeDeleted parent directories aren't being cleaned up This will go in upstream as MAPREDUCE-5706 Ref: CDH-16311 (cherry picked from commit f7ec5520f52ea583f34c157b354079fc75a59eae) (cherry picked from commit dac29d6dacf3e6ecdc743f087a24183feff10e99) commit 3b2b673e695305a5326bfef28c0e032e156d0866 Author: Sandy Ryza Date: Mon Nov 4 17:04:33 2013 -0800 CLOUDERA-BUILD. MR1: Dump stacks on task timeout. This will go in upstream as MAPREDUCE-5592. Ref: CDH-492 Reason: Request from support (cherry picked from commit 272ee449e05ff6bd06d9243fbe835d744cb2170c) (cherry picked from commit 0e2eebdc81b72f460a5caa151d4d5a79881fddff) commit 30f3c1547ed237918d382686ee2a6a8bd6a69a07 Author: Sandy Ryza Date: Tue Oct 15 23:55:41 2013 -0700 MR1: CLOUDERA-BUILD. Update versions from 2.1.0 to 2.2.0 (cherry picked from commit fb1d354e6f688a53bda27928b2cd3ea0b288e079) (cherry picked from commit 2eb2309ca2ff6fdc16293ec85591ed9e4ef79b16) commit e47c688e44f39b6fcabe4292a49991a144847d41 Author: Colin Patrick Mccabe Date: Tue Oct 15 11:05:57 2013 -0700 MR1: CLOUDERA-BUILD. fix-git-line-ending-confusion-in-mapreduce1-project (cherry picked from commit d23d5387b8f4de4c698c50a756bb200af6b56345) (cherry picked from commit 7a67c3b6c9c6d9e2a372a62d44401d242cec0825) commit 9497e6605a201494666d1b5da0f955fc39d753a1 Author: Robert Kanter Date: Fri Oct 4 15:44:17 2013 -0700 MR1: CLOUDERA-BUILD. Updating TestDistCh to work with HDFS changes (CDH-14763) (cherry picked from commit d208cf4cb6972d25d778d7bf32470d8b5d63ad18) (cherry picked from commit d825b9c80284d280f1d1a6b75bea7645e6a4d842) commit 901f3e421c4649392c3875de745eb007d443e62a Author: Robert Kanter Date: Thu Oct 3 18:24:29 2013 -0700 MR1: CLOUDERA-BUILD. Update TestDelegationTokenRenewal to use new location of FakeRenewer provider (CDH-14653) (cherry picked from commit 1439d69bc8e53c8237a3d6b711cc0f5185921c3c) (cherry picked from commit 634c04b6efaca60e31783178bf655d951aac8109) commit cdb95cdc872c4f4b7ea369e527a4f3e4ee5926ce Author: Robert Kanter Date: Thu Oct 3 15:33:20 2013 -0700 MR1: CLOUDERA-BUILD. Fixing TestStreamingStatus failure (CDH-14655) (cherry picked from commit 2f6b654fb2858f4cab77c7dd0bcca40cf3e0d647) (cherry picked from commit 60f7255f4900ef8ade1c43d2a2b1d6ba350ba053) commit ad4bb22413186bd8004c1adb9e930f90c523184a Author: Robert Kanter Date: Wed Oct 2 13:50:12 2013 -0700 MR1: CLOUDERA-BUILD. Reverting: "Commenting out some failing MR1 tests for cdh5b1 (CDH-14666)" This reverts commit b36c566b24f6fcea46c43311276532f30b8ca5d1. (cherry picked from commit 7644b4ef6767bdf11df04afbe62e6e060796627e) (cherry picked from commit bd1688c56fa0ab2db642bd68241f3bab2d7e0c79) commit 05df9f46f09987895f99d529bd83276f852211e7 Author: Robert Kanter Date: Wed Oct 2 11:08:37 2013 -0700 MR1: CLOUDERA-BUILD. Add ability to exclude multiple MR1 tests from being executed (CDH-14677) (cherry picked from commit e56339642a01922a06bf2552eae23aecfeb2de09) (cherry picked from commit 524e7f34fa942cd7012b7260f1891b6e9ed2840c) commit 479440e40be905fe3fddf023da59f2141556e007 Author: Robert Kanter Date: Tue Oct 1 22:25:52 2013 -0700 MR1: CLOUDERA-BUILD. Commenting out some failing MR1 tests for cdh5b1 (CDH-14666) (cherry picked from commit b27120d80586fd0e70e3e966a733a7a8974c3856) (cherry picked from commit d92d7142d05e206471f7a5fb94d2732b0e6c853d) commit 1e3d09a6a6fc0de526e5550419ff251c5975a92a Author: Sandy Ryza Date: Mon Sep 30 10:30:03 2013 -0700 MR1: CLOUDERA-BUILD. After HDFS-4817, fix TaskTracker to use identifier argument in NativeIO.POSIX.posixFadviseIfPossible (cherry picked from commit e4344fb374fd009eff22e9d7001d36224c97f6d6) (cherry picked from commit 7058ab6f79300c0e08bd60980a89303f41804b90) commit 966a543a6a42aa44cc5c33e60e6a7b095c701ebb Author: Karthik Kambatla Date: Tue Aug 13 10:54:46 2013 -0700 MR1: MAPREDUCE-5198. Fix a race condition during TaskTracker re-init which was causing failures since task directories were being cleaned up in multiple threads. Contributed by Arpit Gupta Reason: Proactive bug fix Ref: CDH-11905 (cherry picked from commit cb1430ebafbcd22cc88ab6ceaf8987a67f784b3f) (cherry picked from commit 038b1306458321a3e2152d2c2b8cd09c77b58b57) (cherry picked from commit 4a58649b12efe4c7830313fa84bce4ce88744da9) commit 689b7493a08fce47d78320fcc4c072904fc2dd22 Author: Karthik Kambatla Date: Mon Aug 12 23:04:53 2013 -0700 MR1: CLOUDERA-BUILD. CDH-11669. Change ZK FC port from 8019 (hdfs) to 8018 (cherry picked from commit 4fb5fa6f1a0e00ebe3c0afee704de2294c7a1ae7) (cherry picked from commit a155a73eb9cf03106579cf7c58ebf03ff748a494) (cherry picked from commit 1f434f6bb3ce511a8af708d5b83f2975291a35d1) commit f3581710a2e74fbfe1965ef03e526841536b543b Author: Suresh Srinivas Date: Mon Jan 7 01:34:20 2013 +0000 MR1: MAPREDUCE-4914. TestMiniMRDFSSort fails with openJDK7. Contributed by Brandon Li. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1429638 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 06cd43306bbb7937a603ec2b73460cb08e431fb2) (cherry picked from commit 49aabc4129a426f8884a1da5566a426a984648bb) (cherry picked from commit ec94d379af218ea524118d3c5a4420d7ff55e8b2) (cherry picked from commit f860d63282af145ada4c4524b6051ecae6e869f9) commit 4aba5ef71eddf66303bf682a4b9ecda4d397271b Author: Sanford Ryza Date: Wed Aug 7 19:59:05 2013 +0000 MR1: MAPREDUCE-5450. Unnecessary Configuration instantiation in IFileInputStream slows down merge. (Stanislav Barton and Ted Yu via Sandy Ryza) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1511461 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 53dcb4c56c7bedf382227be43fcbbb5be74bdb67) Conflicts: src/mapred/org/apache/hadoop/mapred/IFile.java src/mapred/org/apache/hadoop/mapred/ReduceTask.java (cherry picked from commit 2773f8a300d03bee696def154c2f9f04858e038e) (cherry picked from commit 34f998a417fec227674b6cb76fda6bdad07178a4) (cherry picked from commit 02f0dac155085a85462addeeec7455f643d52bed) commit be57da53d6dfd9fcd8f6915a5ce9abd1e0e14035 Author: Sandy Ryza Date: Mon Aug 5 22:47:40 2013 -0700 MR1: MAPREDUCE-5367. Local jobs all use same local working directory (Sandy Ryza) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1510613 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 31f3ce8926e4a89b53b5cc81f99ba14818d18bf4) (cherry picked from commit a1c17e9da89e94a48c38d9fe5c46504af84823fa) (cherry picked from commit d472102eaa332c76a178fb00a15243a6cca53a5b) commit a5b24a0b89891de97bfacddc885a50a74c8c09a1 Author: Sandy Ryza Date: Tue Jul 30 15:28:22 2013 -0700 MR1: MAPREDUCE-4366. mapred metrics shows negative count of waiting maps and reduces. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1507569 13f79535-47bb-0310-9956-ffa450edef68 Ref: CDH-11475 Author: Sandy Ryza (cherry picked from commit 61824f6b3d178e16eb7823c09b4cc0efc8aa217c) (cherry picked from commit d974492b8f63aaa3cc75ed1da60a6e6bb0552e40) (cherry picked from commit 9daf96073e3443360f11c1d1697a80d5a8532b43) commit 5a9997ed0a79fe21c901f96b9f456cc470be25e0 Author: Sandy Ryza Date: Thu Jul 11 15:28:15 2013 -0700 MR1: MAPREDUCE-5351. Fixed a memory leak in JobTracker due to stable FS objects in FSCache. Contributed by Sandy Ryza. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1499904 13f79535-47bb-0310-9956-ffa450edef68 Includes both original commits and addendum Ref: CDH-12811 Author: Sandy Reason: Reported on userlist (cherry picked from commit feafc6e0faf81c1dc3e39ac0377522e9736a25c8) (cherry picked from commit 96d71f616e1d184a4982e62e1990ead817e05298) (cherry picked from commit f2138630174c8bddf335967e543ed13e0baa9b28) commit ae452022713ef504c8bd548e1f0a62b6e9f1fb19 Author: Alejandro Abdelnur Date: Tue Jul 23 17:07:57 2013 -0700 MR1: MAPREDUCE-4049. plugin for generic shuffle service. (avnerb via tucu) Reason: CDH-13249, backporting TT side of plugglable shuffle. (cherry picked from commit fe6ce94d802b6e44befd04a690b29630aaea2ebb) (cherry picked from commit 0ea6f9cc0eaf87c6c20597d1b8c402b8c134096e) (cherry picked from commit cda5135a8be18098c41ffd8c857af45e58302b82) commit e7176c6fa6230ddac43fc9cd6c8b9126d543f82b Author: Karthik Kambatla Date: Tue Jul 16 17:52:56 2013 -0700 MR1: CLOUDERA-BUILD: Fix TestJobHistory calls to JobHistory.parseHistoryFromFS Reason: Build fix (cherry picked from commit 0121ad24cb96d10000164a8b0ae88ee0ff293023) (cherry picked from commit e9bae8f5433b3fc66b6b0a41929b1c8b2b06cbb2) (cherry picked from commit b49fe09042f07bca6612c2d056e00f3f7125296f) commit f6bb3047f982cf9749893c47697f26014684ca8c Author: Karthik Kambatla Date: Wed Jul 3 15:57:20 2013 -0700 MR1: MAPREDUCE-5364. Deadlock between RenewalTimerTask methods cancel() and run(). (kkambatl via tucu) (cherry picked from commit 14d67b8de24078559e2a1d5444e23731a3a6829c) (cherry picked from commit 37cae4b5ff3238d6f4f5d81154366e5c3c78c319) (cherry picked from commit 681753e9c1e8eefa67281914df10b1b6e8e5cf99) commit 83cc24577a5076f894224accf1fc31405b73b786 Author: Karthik Kambatla Date: Tue Jul 2 22:35:05 2013 -0700 MR1: CLOUDERA-BUILD. Avoid port conflicts in JT HA tests. Changes missed earlier (cherry picked from commit 8105fa54be0df560c86fb33282ad1f202ab11ca1) (cherry picked from commit 6422e36d807a1a70117a9cb9e92c4c4902db8582) (cherry picked from commit cca8fafb1ffe3ca2d9c9a14afbf3fcda6a0f055c) (cherry picked from commit 885ebba0ae8c30a7019d830dfee05255ea06a6f8) (cherry picked from commit 4c8170d4d5de9c5ebdd668a59dccdca98e2260f3) commit 66814d77a88a9546d12175936a6e28446a50b254 Author: Karthik Kambatla Date: Fri Jun 28 12:16:33 2013 -0700 MR1: MAPREDUCE-4246 Failure in deleting user directories in Secure hadoop (unclean backport) (cherry picked from commit 39d0586fd5bf911275ef4e691bb1773fff68bfff) (cherry picked from commit c6472663e2401e74f27262c071b5320cd9d94f62) (cherry picked from commit d9e8d95d54b72b7c43c3a32e82b7aab33d99e98c) commit 9ddfaac1b63d2c12303a60fe48a39954f1c58d5b Author: Robert Kanter Date: Mon Sep 23 16:29:15 2013 -0700 MR1: CLOUDERA-BUILD. Targeting Java 6 by default (CDH-14356) (cherry picked from commit 2d1cfab3a113fdd6ca09e73890a8e0af24ded314) (cherry picked from commit 233443b383908bbf09fdcefd196561cc5107382a) commit fffd223425f539361c84526fc04a212b28efc2fa Author: Robert Kanter Date: Thu Sep 19 17:59:25 2013 -0700 MR1: CLOUDERA-BUILD. Targeting Java 7 by default (CDH-14356) (cherry picked from commit 0ee48ef75f980f62cef789eebbab500266e011b4) (cherry picked from commit d5d331f708d46d527e33f4bf8c6a145a879eff83) commit dfff91912ec6df4af95785489bcb50c381dea58e Author: Karthik Kambatla Date: Mon Aug 12 21:04:54 2013 -0700 MR1: CLOUDERA-BUILD. CDH-8579. Remove MRUnit from contrib (cherry picked from commit 112ae971dfe30762c46820690a84a27ea00a13a8) (cherry picked from commit 742b2169385fbfd8cab7460dc8d1ae5ddead99f2) (cherry picked from commit a25945e2220ee67208800ea14281dcc42f5339d6) commit d15e226b675113824dca6583a0a9956310322ff4 Author: Sandy Ryza Date: Tue Aug 13 17:06:31 2013 -0700 MR1: MAPREDUCE-5038. old API CombineFileInputFormat missing fixes that are in new API. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1458021 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit a2330b6007f3424845cf30e5da162bbbf7d4036c) (cherry picked from commit 7a42ebac5d59a7432b672ecd7ada6c18b9791ea3) (cherry picked from commit 8b8039e9c7590d7d230273028319cf1c201e0c2e) commit 505bce61a20cb95a9ad7516663eeb926be284fd4 Author: Robert Kanter Date: Wed Sep 18 10:54:33 2013 -0700 MR1: CLOUDERA-BUILD. CDH-14148 (CDH being inconsistently compiled with 1.6 or 1.7 JDK target version) (cherry picked from commit db6dc282fdc2f519a46cb67f73c7740f297c1c2b) (cherry picked from commit f09009730b64ad4e5d8c2ae0cd6b2d56f087308f) commit 77f82f90a5b46063424e7a1f90069a518c14478e Author: Karthik Kambatla Date: Fri Sep 13 11:48:22 2013 -0700 MR1: CLOUDERA-BUILD. CDH MR1 equivalent of MAPREDUCE-5379 (cherry picked from commit 9f092c04cfc3290b31dab5126d93dd3255a3fbee) (cherry picked from commit 505887491ed978c53c5614211f1e736d9bc08505) (cherry picked from commit 84c3d022df7653b924152b374bf411db3b2633a5) commit 9c77441953c4aa9b3b60ba3486608f7a454f3cbe Author: Robert Kanter Date: Wed Aug 28 10:17:13 2013 -0700 MR1: CLOUDERA-BUILD: Bug:4337918 (MAPREDUCE-2359) default name node is viewfs:/// if we pass hdfs://path giving error - fix in DistributedCache(ramach) Author: Krishna Ramachandran git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077793 13f79535-47bb-0310-9956-ffa450edef68 (cherry-picked from commit 1f775395ae5dd060de0303f221f15fd985f025da) Ref: CDH-13780 (cherry picked from commit 88c3afc2c9ec8df7658ae1edf3ce78f8a4c9c9ea) (cherry picked from commit d45c18551cc92849d2ff9bb7a3305a5d95ab1317) commit 6f00f810ff06bcc0eb1abc06f9dac96a9c8cd70c Author: Robert Kanter Date: Wed Aug 28 10:12:09 2013 -0700 MR1: CLOUDERA-BUILD: Fix 4274823 Distributed Cache is not adding files to class paths Contributed by Chris Douglas git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077790 13f79535-47bb-0310-9956-ffa450edef68 (cherry-picked from commit fc0ec8c130da1ed2638728b0482b47f9250a156b) Ref: CDH-13780 (cherry picked from commit f98e77b392fb80cffc46fd0f1a8308582bf70680) (cherry picked from commit ac24bf0d60a656ce42fcac4cbd5054b832ac1a27) commit dae85617b52ce3f28be29631d37559217ef60062 Author: Sandy Ryza Date: Wed Aug 21 20:54:45 2013 -0700 MR1: CLOUDERA-BUILD. Alter build.xml to place task controller binaries in folder that matches up with System.getProperty("os.name") Author: Sandy Ryza Ref: CDH-13735 (cherry picked from commit b934a9ed616a0be76d63bfe6bbdc1451550f36d3) (cherry picked from commit 864d2bc1845e1e5d27533b8a625f4e1356e94c81) commit ecd5a4454315217084601e0bb38af4d73318540d Author: Sandy Ryza Date: Wed Jul 17 16:02:31 2013 -0700 MR1: HADOOP-8329. Build fails with Java 7. Contributed by Eli Collins git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1340270 13f79535-47bb-0310-9956-ffa450edef68 Author: Sandy Ryza Ref: CDH-13087 (cherry picked from commit 8d521f8e2344b0bf6ba9e0642eca0bf89b5943f2) (cherry picked from commit 02ab3a8455fa5402848fc64a1821bc0ea93c3c6e) commit d838002d51cc1b22c95c8242a100b3c130716de0 Author: Karthik Kambatla Date: Fri Jun 14 15:20:23 2013 -0700 MR1: CLOUDERA-BUILD. Delete tests from TestIO that test/require old record generation (cherry picked from commit 3c1dcb9b1f710a66104afc5c33866d654a42a006) (cherry picked from commit 14c2e1c6afefda3c041b738ca99bd1cfb6556b44) commit 60b017ef8f86a2cd3775dcff6835bf306ee26b0c Author: Karthik Kambatla Date: Thu Jun 13 14:10:35 2013 -0700 MR1: CLOUDERA-BUILD. Fix issues due to Common incompatibilities in CDH5 (cherry picked from commit 265e97bc866bae5ca7df66635783b6eb5a36dee0) (cherry picked from commit e603e26175923c65d95e013d6f3555ed7edbed10) (cherry picked from commit d18e988252ce828839f750b653734335bc92e47c) commit 564ee5f633c13d5e5d13b92e5a71b0e921818e7e Author: Karthik Kambatla Date: Thu Jun 13 11:40:07 2013 -0700 MR1: CLOUDERA-BUILD. CDH-9432. HADOOP-8700 breaks MR1 (cherry picked from commit 768379937cfcd9d15d2f1d2567e7b35696401ee3) (cherry picked from commit 3f4d5c94c1fcf46fdd3ac60e575ff4b64dbabeee) (cherry picked from commit 4d759a74785a3615cb38eb09269baf1d30e2c72d) commit 7962ff54c07b43799ae1882b4ce5ae10f2a10245 Author: Karthik Kambatla Date: Wed Jun 12 15:47:29 2013 -0700 MR1: CLOUDERA-BUILD. Build changes for CDH5.0.0 development (cherry picked from commit b1f1bcd8c51c5fbe7f59f5a0291a651bcb0b7297) (cherry picked from commit 49ea039c409ea7dd942a10eb34f3039333ca25e5) (cherry picked from commit b3541b59cb8550a26de618b6a095fb683d05a262) commit 5ca261068319727b7b504c40f76d67add05a42b4 Author: Karthik Kambatla Date: Mon Jun 3 12:57:59 2013 -0700 MR1: MAPREDUCE-5250 Searching for ';' in JobTracker History throws ArrayOutOfBoundException. (kkambatl via tucu) Reason: CDH-12176 (Customer request) (cherry picked from commit 4ad5b8337426ecb7046926f82aac2030f4a4fc85) (cherry picked from commit f0ff2208a65499b771acfcc30e79427ceb83ab81) (cherry picked from commit debd9ca7a163bd93570e4dcfdc16a9851f800f0b) commit 8f5c5ed8f7e87044cf6ebc6c887c24e056cc70a3 Author: Karthik Kambatla Date: Thu May 30 11:43:58 2013 -0700 MR1: CLOUDERA-BUILD. Job History search for non-existent dates results in error Reason: Customer request/ Bug fix (cherry picked from commit 1c1b318a626bed66f610c9db4882d377dc3aa9ca) (cherry picked from commit 43f4c9f6a2b817d3f59206b3197cc8bcd94e1125) (cherry picked from commit 44066ba9b13ac009e87252136b46b264142df9ba) commit 68e2aaaf61360f8fc4d9c3e8f0c7e5d2b078081c Author: Alejandro Abdelnur Date: Mon May 20 11:37:58 2013 -0700 MR1: MAPREDUCE-5148. Fix MAPREDUCE-4970 to ensure task-log4j.properties is available for previous installs by putting it in hadoop-core.jar. Contributed by Arun C. Murthy. (cherry picked from commit 28105b96b5c4bba5aead1aee53e8130b0198db5d) (cherry picked from commit 9ea9a2849bb71609fb70f68456869da16dab1ddc) (cherry picked from commit 47f71c8b12368579dbe7570b4de560c0045ef753) commit f6e50b7963583b0b36d5e6f67abaad3fad3ff906 Author: Karthik Kambatla Date: Wed May 15 01:35:06 2013 -0700 MR1: CLOUDERA-BUILD. Backport fixes from MAPREDUCE-323 to allow underscores in usernames and jobnames Reason: Customer request Ref: CDH-11431 Author: Karthik Kambatla (cherry picked from commit 0fafe1043fd60266b1966fd7f6457465cadb02c9) (cherry picked from commit e847fd69f31ff38851f519d2e8e41a8fbe3b9fe5) (cherry picked from commit 1b5fe33c437bfbfa5a7ce07b0418c797e15f7c47) commit 99bd4e3b6a410875aa83f8ba242b6aefbd9953e1 Author: Thomas Graves Date: Tue Sep 11 14:34:27 2012 +0000 MR1: MAPREDUCE-4576. Large dist cache can block tasktracker heartbeat (Robert Evans via tgraves). git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1383430 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 5cd92fe94be2ff5657903dd87f657aff6d2c8269) (cherry picked from commit fd454fe5b6f4b84f1a926fba8010aaf7de1ce5c1) (cherry picked from commit ae4c033d88b32822b788c1b1e296e9ecb2da6e69) (cherry picked from commit a02f2c04fcd1788094654317e8ff5ea3c7e43c60) (cherry picked from commit 5b44a623f0a4476be71288c040cb0f9b4c27393d) (cherry picked from commit a32c5dbc44e66b63d33626bdc6a9aaa64c69c795) (cherry picked from commit d08b95ec97be5379da86b003063af39d0a4bcb26) commit 96ab13083de17199400e2cc17de2a3597b9bc8a1 Author: Matthew J. Foley Date: Sun Feb 19 23:41:18 2012 +0000 MR1: MAPREDUCE-3824. Distributed caches are not removed properly. Contributed by Thomas Graves. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1291093 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7673e6d191a6cf1bbd12a4402c28333cce602243) Conflicts: src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java (cherry picked from commit d2cd046c85766f9ef3ad3488bdffcfce056068ee) (cherry picked from commit b23d60d08e0d34c984d4fb224921061c4b1d95d0) (cherry picked from commit 2724f3b40b58758fe6b6795120a13a19f37b96b7) (cherry picked from commit 77367205d49cd0d0816c0ff10dd7317eb0d64aef) (cherry picked from commit 25b91217f4f7cb348f5fe24f8fa8733b86499808) (cherry picked from commit abb1e51c4ebd36f51f3858a4a962546bef34e53d) commit 6403b89e88abfcd6fcd785caf1722ea7d1d93b32 Author: Mahadev Konar Date: Mon Aug 1 21:41:20 2011 +0000 MR1: MAPREDUCE-2494. Make the distributed cache delete entires using LRU priority. (Robert Joseph Evans via mahadev) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1152941 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 68e0fb175a284b2836f7c6e02c049d124be1f03e) (cherry picked from commit ce8bdab53634761243c70c9b71ebd0354c64a638) (cherry picked from commit d25385cb3ba35104f08a6247b91c24a1259c6339) (cherry picked from commit 32cb4a2eba1a310989dd1d78b6fd20a5f935c141) (cherry picked from commit 391cee06d199146c91e1a2024ddc0d6b6b7ff735) (cherry picked from commit e7ec5decd9e274de0a2134e12f0c639bad51394f) (cherry picked from commit 14e76fd5424ee3cd6fb0ac038c75d75fa59c502d) commit bc73e384fd4b8ad9df89ce6ee02a381867aad1cb Author: Christopher Douglas Date: Wed May 25 02:23:20 2011 +0000 MR1: MAPREDUCE-2495. exit() the TaskTracker when the distributed cache cleanup thread dies. Contributed by Robert Joseph Evans git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1127362 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fcc321599e9e068387d3401edd171c950b7be018) (cherry picked from commit 8ec131a3b8ed4d7e5593f75e61170c1436f9ba47) (cherry picked from commit 064e362c83a0a5b462d0f20b2904f36c3db032c1) (cherry picked from commit cdd203fc692aa430d76dec4a02144bee5b382d79) (cherry picked from commit 48d1a305a0b3da0356c2e22b090ceb1a6cb0eb25) (cherry picked from commit 067626cfa3ea0e206645e01984fb4e3c2df2d8b6) (cherry picked from commit c48a7be84bdc2fed0c565a61ed36c20e21c385c9) commit 56ff135957950460c1248df886ed5c7d9e01ce2b Author: Christopher Douglas Date: Mon May 16 22:53:09 2011 +0000 MR1: MAPREDUCE-2479. Move distributed cache cleanup to a background task, backporting MAPREDUCE-1568. Contributed by Robert Joseph Evans git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1103940 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 9b31f27ce02840e94043df911c82cf326afd1604) Conflicts: src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java src/mapred/org/apache/hadoop/mapred/TaskTracker.java src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java (cherry picked from commit 9e9fa3ab08ff715e63f5f76291f0d5c1ee50e129) (cherry picked from commit fa822e604cc6ed2dd3cd833984dbe177463d622c) Conflicts: src/mapred/org/apache/hadoop/mapred/TaskTracker.java (cherry picked from commit 09ad69c481052f0d942f3b991ff65876ba001587) (cherry picked from commit 15c8c2602c940fefc01f668e67a4a9c4fa1d5681) (cherry picked from commit c6650d7f3e32c5144145009a75f8f2c194267f14) (cherry picked from commit e6ff909fc645d3090dba4c2224f29ad324e54ef0) commit e3437a0bd410cc92359a14f4a8001329651aea42 Author: Christopher Douglas Date: Thu Mar 31 08:12:48 2011 +0000 MR1: MAPREDUCE-2409. Distinguish distributed cache artifacts localized as files, archives. Contributed by Siddharth Seth git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1087209 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 093cf31c10a2d05fd82ec9406ccb8e4b20a582e0) (cherry picked from commit c2a4f8836d88554f4e91a3e4901a40d743eae8b6) Conflicts: src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java (cherry picked from commit f056597ebd04d267098f406990dd051b07ebb9ca) (cherry picked from commit ad21ca0b4648324b0bb517553d595765f7eb7d1b) (cherry picked from commit 15d6975e671056aa295ccf8d5fe65e875054e0d5) (cherry picked from commit 5a157827d35d4f39f55bd5e6ae95c5193d6135fc) (cherry picked from commit de603a773e98498a9033cb8654bac19d90bd864b) commit 6454c7712bfe9a2394b353e2e427ca02016f6244 Author: Sandy Ryza Date: Mon Apr 22 16:38:46 2013 -0700 MR1: CLOUDERA_BUILD. MR TokenCache shouldn't fail if JT principal is missing Ref: CDH-11145 Author: Sandy Ryza Reason: Customer issue (cherry picked from commit 28ecf38392aac087499fcfec4afe3c24e702f1ba) (cherry picked from commit 93c56ad0e1505b6e4a540488026c1576bcc33e56) (cherry picked from commit d34f24143eef928644fddf37e17c0dc8b09d903f) commit 9041171032ea1d5f06cf39d9736dcff53bee0cf5 Author: Karthik Kambatla Date: Fri May 10 19:09:51 2013 -0700 MR1: CLOUDERA-BUILD. CDH-10752. Remove aspectj dependency in MR1 (cherry picked from commit edecc71e3d1edf9380f949647c35f3cf8436bd16) (cherry picked from commit 1097cb26751813b1debdaf6f27a1d7b3c7d4d6b3) (cherry picked from commit 9b85b3e579cdad75805015f377133abc70190c72) commit 3836a7562caf12a3e0d2b8e7f3adf00518a26158 Author: Tom White Date: Mon May 13 12:40:39 2013 +0100 MR1: CLOUDERA-BUILD. Unable to refresh JT when HA is enabled. (cherry picked from commit e3049f11a6e05c588909947fbbdee1cae57ad79c) (cherry picked from commit 0ba9978ad9c6dac3d5bc7b0178b4d5c801c500ce) (cherry picked from commit d535ebb33281d5ab617ee385e98637f5eff1d968) commit 10f16c9c515448a86266c2e7cd59d2ba4de4c2b2 Author: Alejandro Abdelnur Date: Thu May 9 21:22:50 2013 +0000 MR1: MAPREDUCE-5218. Annotate (comment) internal classes as Private. (kkambatl via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1480779 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 2b331d8e2242e862fec2017f073d7e9db521e592) Conflicts: src/mapred/org/apache/hadoop/mapred/MapReducePolicyProvider.java src/mapred/org/apache/hadoop/mapred/TaskInProgress.java Reason: API Compatibility Ref: CDH-9121/9128/9129/9130 (cherry picked from commit 6d132a80a4dfb843cfc46fef1babfef389b2ccaf) (cherry picked from commit be8e5b0d33feb83e8b6e433eff7c317b7770ae9b) (cherry picked from commit 05dda52916b5da742e3ab7b8866a09f3a34f9984) commit b0d1022fd4eca614d9640db430230b6b8ed85ba7 Author: Karthik Kambatla Date: Thu May 9 15:38:10 2013 -0700 MR1: CLOUDERA-BUILD. CDH-9235. Fix API incompatibility in mapreduce.lib.jobcontrol.JobControl (cherry picked from commit 5ab1a1731b97dcdc4877960cb955ae74a9bbaa24) (cherry picked from commit 1a3f6b32b1ab742bf4ffa5e8a644dafcee835b8f) (cherry picked from commit cc4cab6dddc8d1437d859b7dc31c81ff6d0d0e17) commit 570eafd53557bd34282f576fdc3372125b232181 Author: Karthik Kambatla Date: Thu May 9 15:23:59 2013 -0700 MR1: CLOUDERA-BUILD. CDH-9234. Fix API incompatibility in mapredue.lib.jobcontrol.ControlledJob (cherry picked from commit 53024f9fd2a32e2fabc6f8b499bb6fda5c3c01c6) (cherry picked from commit 65608fd9f474a30faf684baf5e60a62ada0815fd) (cherry picked from commit 030e51c5ede62ce4e6b2f6a39f54f3725a39a281) commit 91f3af3b9ad334c981969a1bebd7cdf129abfd7b Author: Andrew Wang Date: Thu May 2 14:33:59 2013 -0700 MR1: MAPREDUCE-5193. A few MR tests use block sizes which are smaller than the default minimum block size. Contributed by Andrew Wang. Reason: Broken test Author: Andrew Wang Ref: CDH-11911 (cherry picked from commit 9d53c3d05e153ba4be63f55e0aaf9d8a74559acf) (cherry picked from commit 4c514a3903374f3f92ce17f819ebd6317b24a7b1) (cherry picked from commit 6f7970cd53e50b98f1505e896694072ac503e24b) commit 70964458430d1ce0e9c2e55b35d457f09b5ef775 Author: Roman Shaposhnik Date: Wed May 1 19:26:14 2013 -0700 MR1: KITCHEN-BUILD. Grafting MR1 code base on top of Hadoop 2.X (cherry picked from commit 4a161db6f714c4e6e28c1efdf62a94938e3f8691) (cherry picked from commit 3e8335fca76d1780a9a6c0726364ac93eb5364e7) (cherry picked from commit 9a28249aad758af196cf491a54f4f6e09ea53754) Conflicts: hadoop-mapreduce1-project/.eclipse.templates/.classpath hadoop-mapreduce1-project/.eclipse.templates/.externalToolBuilders/Hadoop_Ant_Builder.launch hadoop-mapreduce1-project/.eclipse.templates/.project hadoop-mapreduce1-project/.eclipse.templates/README.txt commit e90121d8030edc22f7c4793f2aeac4e78c29c41c Author: Arun Murthy Date: Wed May 1 02:54:14 2013 +0000 MR1: MAPREDUCE-5154. Ensure job delegation token renewal is cancelled after job staging directory is deleted. Contributed by Sandy Ryza & Arun C. Murthy. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1477900 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 88731da5e0f55b72bc5238915899de89632d663e) Ref: CDH-11257 Author: Sandy Ryza Reason: Customer request (cherry picked from commit d77b44b0513d7396dc2af58341ae8de313bc2f6e) (cherry picked from commit eacad9d4bfcc37d90474784fe425b22a44e4a7a0) (cherry picked from commit 01f0b5cd49974b0c8380ea37a4e807699bdfbe8d) commit 5e0f92d4e66cacc8a16974e139920986407ac954 Author: Alejandro Abdelnur Date: Wed Apr 17 23:18:24 2013 +0000 MR1: MAPREDUCE-5133. TestSubmitJob.testSecureJobExecution is flaky due to job dir deletion race. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1469098 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d47454bf29ab2c89d2bbb0d87afead8abfd03687) Reason: Flaky test Author: Sandy Ryza Ref: CDH-11169 (cherry picked from commit af716c750fdc0b4df33550ec7f29acee9b442d3e) (cherry picked from commit 6f8fc4fab67c59dde24e05959f62cab885e63046) (cherry picked from commit df27b2e4df5cbffe6c5d88010f64a22cc3a36cbf) commit 216a244eee45cb14cb401cf37b935720291b158c Author: Alejandro Abdelnur Date: Wed Apr 17 15:27:59 2013 -0700 MR1: CLOUDERA-BUILD. Add changes to mr1 build to specify JDK1.7 as target (cherry picked from commit 098bc163405dfb3e5e61d4cf8e80fdfb47e21d24) (cherry picked from commit 45a3883a507355916bf5e4e802b9a06b97e8c35f) (cherry picked from commit 18379b27e6a698d45195af9db869b10708e90517) commit 9ba48cef11f23cc0fc02f29dc8345f944f266e83 Author: Harsh J Date: Tue Mar 26 07:52:08 2013 +0530 MR1: CLOUDERA_BUILD. Fix regression introduced by b5eaf8099 that makes a certain JobTracker limit configurable by clients if un-finalized. Description: The JT's split meta info limits were being taken from client configs due to an earlier regression change. This fixes the bad behavior. Reason: Customer Request Author: Harsh J Ref: CDH-10222 (cherry picked from commit 3d66cbd755b0ad77f35f2bc45f236b25f7854f25) (cherry picked from commit ad79f49e3ee3a4f7b67b0cb472809a88cf84010a) (cherry picked from commit d7b777458c90c16c9c0f8de2e6565a67a808596a) commit abf000f07ab214b8947293d5bbda58cfbb69178a Author: Alejandro Abdelnur Date: Wed Apr 3 22:29:22 2013 +0000 MR1: MAPREDUCE-2817. MiniRMCluster hardcodes 'mapred.local.dir' configuration to 'build/test/mapred/local'. (rkanter via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1464221 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 3f8b27564ad759c9d88a09cd69e5ca26f8f5221b) (cherry picked from commit d83970b145ffa849515fe0536af83c4677ae9923) (cherry picked from commit 80ee298b978f59c0e930538fb4ead5895ff57234) (cherry picked from commit c1a07020ec6948a84d3aaf3f4e880bb87bd61867) commit 8ad11ade4d5edab563f2fb0623eaf2ba84c6b51d Author: Thomas White Date: Wed Feb 27 10:42:58 2013 +0000 MR1: MAPREDUCE-5008. Merger progress miscounts with respect to EOF_MARKER. Contributed by Sandy Ryza. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1450725 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f15a72d7d2d14e8d715e4404f2eb55e5e78e67e9) Conflicts: src/mapred/org/apache/hadoop/mapred/ReduceTask.java Author: Sandy Ryza Reason: Fix progress after MAPREDUCE-2264 Ref: CDH-11368 (cherry picked from commit 2c0428f73eddda137e8aa6ef4cb0112b64f0e2d3) (cherry picked from commit 38100fc5c24ca3228b1f91db76b070a3cb196419) (cherry picked from commit 24e494d99fdd9967a130d08a85fcbe9f19514b52) commit fea63cb7e8aebe7eab1b510a6745f4fcd27f4578 Author: Karthik Kambatla Date: Mon Mar 18 15:43:46 2013 -0700 MR1: MAPREDUCE-5028. The previous commit is a partial cherry-pick. This is to fix it. Ref: CDH-10562 Author: Karthik Kambatla (cherry picked from commit c05d7c700b9458bb54029e592bca0bbd36f4c7bc) (cherry picked from commit f25e097163a416a006b434d24775a28da1f1b880) (cherry picked from commit 721d6f9e2ea87cb97c50e515aae048f9f8522d4d) commit 5289583e01c2bd145d9a78edda4eefd96abd993b Author: Alejandro Abdelnur Date: Fri Mar 15 20:12:29 2013 +0000 MR1: MAPREDUCE-5073. TestJobStatusPersistency.testPersistency fails on JDK7. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1457093 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d5ba7c6a40b66f4cbd51445cc89e0fc79d16cf01) Author: Sandy Ryza Reason: Fix failing jdk7 tests Ref: CDH-10973 (cherry picked from commit 1a83cd0f80cf2f4e3a552f66088d9def9245d102) (cherry picked from commit f00baf333ce2309f332dfe652b73cc2759628726) (cherry picked from commit e4faa394e702df2eae9f66a261a41d159acf109c) commit e966f9b56da5bed99620852a5aafe8968dc6a0c8 Author: Alejandro Abdelnur Date: Fri Mar 15 17:48:32 2013 +0000 MR1: MAPREDUCE-5072. TestDelegationTokenRenewal.testDTRenewal fails in MR1 on jdk7. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1457034 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d473428164658260bdc691f047c7411d98a946c2) Reason: Fix failing jdk7 tests Ref: CDH-11028 Author: Sandy Ryza (cherry picked from commit 2cb57a911f67c8c6574789b546194831554830a3) (cherry picked from commit 9f9db4a7f314b412f79281d4d9c4d5b703c3f815) (cherry picked from commit 12ca23572cdbdf6bd394cea7318f2f0d7ad77245) commit ea408b81c6b2602c22862fbe9f0f6932107503ab Author: Alejandro Abdelnur Date: Fri Mar 15 17:42:02 2013 +0000 MR1: MAPREDUCE-5070. TestClusterStatus.testClusterMetrics fails on JDK7. (tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1457033 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d06219b66948d0b3dfe4dedd78a871fe0a458c14) Author: Sandy Ryza Ref: CDH-10971 Reason: Fix failing jdk7 tests (cherry picked from commit ba765d68aba424946292693fce2466a56ebb7041) (cherry picked from commit e1597c842993de51c7605f80c66fe5449b1eb85f) (cherry picked from commit 7e794fee21ceb861c79bc67fcaa79e09a43a7500) commit 52b6310cf7fd60428547bbb767c47eb69800f35f Author: Alejandro Abdelnur Date: Fri Mar 15 11:16:19 2013 -0700 MR1: CLOUDERA-BUILD. add safety check to Hadoop build build to ensure the right JDK is being used (cherry picked from commit 5b7c295850c34e9ebfb9ec22978d1c31e65719c7) (cherry picked from commit 2a23485a8c3dee10ee180d7ebcd5cd76e18f4bb9) (cherry picked from commit 938366d192e75699c3f13dbc2404276c881cc48b) commit cae0f1a93b26f6deb57f98a9f7d9b06586c12bd4 Author: Sandy Ryza Date: Thu Mar 14 13:15:03 2013 -0700 MR1: MAPREDUCE-4777. In TestIFile, testIFileReaderWithCodec relies on testIFileWriterWithCodec. Contributed by Sandy Ryza Reason: Fix tests broken by move to JDK7 Ref: CDH-10994 Author: Sandy Ryza (cherry picked from commit 01c942744635484d91ed70a1cb23f492ebf30f2b) (cherry picked from commit a6563e2e56390db25b5fc78c126dbda120d2570e) (cherry picked from commit 001dc9e34e88defcb910e76ac64d96483d8c1873) commit b25905cac219362d868ac5b73643c78f66855e5f Author: Alejandro Abdelnur Date: Tue Mar 12 07:14:48 2013 -0700 MR1: Remove stripping of scheme, authority from submit dir in support of viewfs. Reason: bug Author: Alejandro Abdelnur Ref: CDH-10922 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077795 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 6dc476279ad119495993caad3b0648f1b20287f0) (cherry picked from commit 6ac85e8e78e60cb723d84beba4391bb05de91e18) (cherry picked from commit ce3bb19673508cc00c983f7cde2dae0c9bf4e9f9) (cherry picked from commit ca5f588f673c661dd85e5ab4a68250d36c8bb948) commit bcb0850cd904658d4ae2cfdb0cd7ffb99c41872a Author: Arun Murthy Date: Mon Aug 1 21:49:39 2011 +0000 MR1: MAPREDUCE-2187. Reporter sends progress during sort/merge. Contributed by Anupam Seth. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1152944 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit a453ed137110e1076d5c8e68736c690d37cf9175) Conflicts: src/mapred/org/apache/hadoop/mapred/ReduceTask.java Reason: Bug fix Ref: CDH-10929 Author: Anupam Seth (cherry picked from commit 403d160b3e3b530c6300c5cbb5726b4b040f1d6a) (cherry picked from commit a7e6b959bf1c0efe4466d57176985c5e3f95d7f9) (cherry picked from commit 14e7add6c7ab1b12ccde686a66e29a17d4e411c5) commit 00ff5596403bbc0467c3bf113b171d20a565beeb Author: Alejandro Abdelnur Date: Mon Mar 11 18:57:46 2013 +0000 MR1: MAPREDUCE-5047. keep.failed.task.files=true causes job failure on secure clusters. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1455283 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit b7824899b559389d140415f76a7a830e1a641de7) Reason: Customer issue Ref: CDH-4759 Author: Sandy Ryza (cherry picked from commit 47e56d65f37e252ea75ec1e176431c0e4998c73c) (cherry picked from commit 18859cdfa9cf3abd9b2818f9bb8774ad6b691f74) (cherry picked from commit 8dbce45592913945f367885921bbf5904abcb417) commit 3ce9224402cb987105b149b1b44dfd30a5eea100 Author: Alejandro Abdelnur Date: Wed Mar 6 00:50:32 2013 +0000 MR1: MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. (kkambatl via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1453107 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 2ce6dc93376cb7bd54d7adafb49127151bcb686f) Conflicts: src/mapred/org/apache/hadoop/mapreduce/ReduceContext.java Reason: Integer overflow in combiner Ref: CDH-10562 Author: Karthik Kambatla (cherry picked from commit 28307ff1aaae1d595a78f12eb69a8779207148e9) (cherry picked from commit d76f0a0836256c22924dcf4649e69a417d9669b2) (cherry picked from commit 34b68260be174236278d3a01d65124304ef9aeaa) commit 86000859bcb3db1807f1bacfaf27511200db5b1d Author: Karthik Kambatla Date: Mon Mar 4 18:55:17 2013 -0800 MR1: CLOUDERA-BUILD. JobConf link in JobHistory is broken Reason: JobHistory is broken Ref: CDH-10282 Author: Karthik Kambatla (cherry picked from commit 99b584fa4394962c07295b44a3126a9f3be7dc18) (cherry picked from commit 94747be6889623d519374ab5567677c71d0d8163) (cherry picked from commit 274cb9ebac9c53e793c5ea2c633888e99990fb27) commit da280d4b983b21df9827bbaa84333ce67ab05c55 Author: Alejandro Abdelnur Date: Mon Feb 4 22:26:34 2013 +0000 MR1: MAPREDUCE-4843. When using DefaultTaskController, JobLocalizer not thread safe. (kkambatl via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1442404 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit aa82ee9b532d08199d259a53890f7e15519dd43c) Ref: CDH-9698 Author: Karthik Kambatla (cherry picked from commit 54375d33cd6b75f9f13b16b5264518d879708db9) (cherry picked from commit 39b3f5dd3426cbbe65e492be6488a41ae3f7ae3f) (cherry picked from commit 680169fdad32997646e55d46143bf499d2febb29) commit 02509061259ec37a8d71af1c28eb62ef24df0a81 Author: Alejandro Abdelnur Date: Wed Feb 6 01:48:16 2013 +0000 MR1: MAPREDUCE-4970. Child tasks (try to) create security audit log files. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1442831 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 11daa863b777104cbad7fa255268be336bf40541) Author: Sandy Ryza Ref: CDH-10388 Reason: Customer (cherry picked from commit 290024df2a638969084625473d9bbbd6f0455947) (cherry picked from commit 73a63a50eaa51e84479bb352606b3666e8d246be) (cherry picked from commit 5c2f49b8002cb6ccd59c3fd96fe3f96b4da5c022) commit 2576bbc2a2f2c3e09c0923fa2f59141096ddd522 Author: Alejandro Abdelnur Date: Thu Feb 14 21:55:15 2013 +0000 MR1: MAPREDUCE-4643. Addendum, make job-history cleanup-period configurable. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1446352 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit cbd3b7a35c16bb382db054999497574b8c29f626) (cherry picked from commit 15c9e05cd5e997507b497de2399cc36b77e7f151) (cherry picked from commit 25a4e83882d3df180c4b40b0c0c378e3b54c774c) (cherry picked from commit 96b5415fe8444fa0ab3f04a816fc030ebaea7b01) commit 0e1303c670e3c3afe533e5846d7dfdf4c4b5734b Author: Alejandro Abdelnur Date: Fri Feb 8 22:42:47 2013 +0000 MR1: MAPREDUCE-4643. Make job-history cleanup-period configurable. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1444266 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e83648b4dd854844e655fc7e50f3e9b3305d73ba) Author: Sandy Ryza Ref: CDH-10281 Reason: Customer (cherry picked from commit 27f39d4beae125e8dca16d94a21c53eb650bd13e) (cherry picked from commit 4448209413199bbe89922f160e62fff1cdb5a944) (cherry picked from commit 2ee3007be13257f23ea163caa23fabdf03f1edd4) commit ae7c67e6bd4034fc61ebc948181ffabf4a34a27d Author: Tom White Date: Thu Feb 14 11:12:37 2013 +0000 MR1: CLOUDERA-BUILD. JT HA: job is not recovered when jt transitions to active then to standby and then to active (follow up) Reason: Bug Ref: CDH-10365 Author: Tom White (cherry picked from commit 223ecad2d71ac6ebe38b311bb3cd62cb291874b1) (cherry picked from commit a81c102f737a9a120d3cfdf2cbec50252d124460) (cherry picked from commit 7c57f535f005ed2016ae11747e9543dd5d860270) commit 455b4c1d90fa3d23bc8710393124ca864980f627 Author: Alejandro Abdelnur Date: Tue Feb 12 16:14:27 2013 -0800 MR1: CLOUDERA-BUILD. hadoop client must exclude servlet/jsp/jetty/tomcat JARs. Reason: bug, this creates conflicts in Oozie and HttpFS Author: Alejandro Abdelnur Ref: CDH-10421 (cherry picked from commit b1e1f10e831672b16e08f7c7b5659c352613f4e0) (cherry picked from commit 2ed7bc277789f3671dee40757a72393f96ddf96c) (cherry picked from commit f9deb4f8b54a38e5fbde40ac56861cd039d341d6) commit 85eb8718f76ca8a689b86bf2f5c01e4c4d83a52e Author: Alejandro Abdelnur Date: Mon Feb 11 10:40:22 2013 -0800 MR1: CLOUDERA-BUILD. JT HA: job is not recovered when jt transitions to active then to standby and then to active Reason: bug Author: Tom White Ref: CDH-10365 (cherry picked from commit 78ceddb42ffbf61ea4bea63130a534d4a28fd741) (cherry picked from commit 20934700c75539c1f9967613cbe898c8981ef9da) (cherry picked from commit e2d7108c4f57b157f2a9652fc31e78aa51bdd93e) commit 8865a81785545310cf9228b13a0fa661966fefd4 Author: Christopher Douglas Date: Thu Jul 19 19:06:21 2012 +0000 MR1: CDH-8864. Support for splittable and concatenated BZip2 - backport HADOOP-7823 and MAPREDUCE-4888 HADOOP-7823. Port HADOOP-4012 providing split support for bzip2 compressed files to branch-1. Contributed by Andrew Purtell MAPREDUCE-4888. Fixed NLineInputFormat one-off error which dropped data. Contributed by Vinod K V. Reason: Support splittable/concatenated bzip2 (customers' request) Ref: CDH-8864 Author: Andrew Purtell / Abdul Qadeer / Vinod K V (cherry picked from commit 4ce73c91db2c4e9e3a167e03b138a9f927d26132) (cherry picked from commit 4fc1fd83bff8e0da01afb1ab23decc11d84f4f63) (cherry picked from commit 1145f0a584b2393dc30a52538b9bc21ca3df433a) commit 1b76936b7df981c1eb2e2ff4c82c6b5eb2c593e1 Author: Tom White Date: Fri Feb 1 14:14:13 2013 +0000 MR1: CLOUDERA-BUILD. JT HA: if job is run with mapred.job.restart.recover=false, job client hangs on failover Reason: Bug Ref: CDH-10247 Author: Tom White (cherry picked from commit 229250d70250380f44d9df5a0188c04333a9f084) (cherry picked from commit 116c5880424c62927b15d4015aa752ee56fdb751) (cherry picked from commit 09f9d2d188992d3cbaeb2264f0e8134fc6bfda0c) commit 45806b42428de24e337bf3600e09fd2cfb3e99bd Author: Alejandro Abdelnur Date: Wed Feb 6 12:34:43 2013 -0800 MR1: MAPREDUCE-4977. Documentation for pluggable sort Reason: backport, new feature Author: Alejandro Abdelnur Ref: CDH-8388 (cherry picked from commit 44e35756091f500d1326ad846cbfc583c75a511e) (cherry picked from commit 2a6c8fb80fb8dadd88a27cf23efd3a610b6d0459) (cherry picked from commit 30db7d70cbad83da4d6297cf1e77d0c1a95fdfff) commit 5d10163cb851b1ffb9f0691b6880a1f96521a9b9 Author: Alejandro Abdelnur Date: Mon Jul 16 17:30:50 2012 +0000 MR1: HADOOP-8552. Conflict: Same security.log.file for multiple users. (kkambatl via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1362154 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit c1f59496ccba92261d85cc274450e5c759f0129d) Reason: log4j error printed out in task process Ref: Author: Sandy Ryza (cherry picked from commit ce99fcf8441a97ef58555ead837498eeca4aaff3) (cherry picked from commit 84ca796fc6464e811dd2e194fbb3a03e517b3f0f) (cherry picked from commit 242ff9e5b339860160f4abe701122c33d8a03f01) commit d401e1e8bb5dad550322951187c3f90c57a5f9f9 Author: Karthik Kambatla Date: Wed Jan 30 23:55:46 2013 -0800 MR1: Revert "CLOUDERA-BUILD. Fix DataChecksum API usage to reflect HADOOP-8700 changes" This reverts commit be0ed1e32fe18f2b1ab327414fbbc8789bb1e0ce. (cherry picked from commit 4185406af5ce31c62d9fac0a352e3bc82e324b91) (cherry picked from commit e37de84a0fc156e6fef58603616b30d8d826d148) (cherry picked from commit 8371c289d3b98d46b81cf540b9509bdc0bd784e2) commit b20571c971360f61cee5ae1fa6c55ff79777091c Author: Jenkins slave Date: Wed Jan 30 10:29:08 2013 -0800 MR1: Preparing for CDH4.3.0 development (cherry picked from commit e13ca434a83095632e868c8a3a6f935c27b3dffb) (cherry picked from commit 8e27951ce0920fe8bf0fb33b5385b6c2fa92bd2e) (cherry picked from commit 8fddf9ca555e95197d7ede6250662a3b64bf8d9e) commit d7966ff88a1d87a555543877d3072088ccb6806f Author: Tom White Date: Wed Jan 30 15:15:51 2013 +0000 MR1: CLOUDERA-BUILD. Wait for RUNNING state when transitioning to active in JT HA. Reason: Bug Ref: CDH-10167 Author: Tom White (cherry picked from commit 705530756051440c4a813f9d7ab5eeb550f8d2eb) (cherry picked from commit 4aeac859afd6d60a966784f49b8a74afe3d149b7) (cherry picked from commit 78edd3b25cc660c8a09dc04ac703f0ba67233780) commit 4e2b19e4ee02888ea6ebe640070b1395d97f2249 Author: Tom White Date: Tue Jan 29 12:01:51 2013 +0000 MR1: CLOUDERA-BUILD. Fair scheduler does not terminate its EagerTaskInitializationListener. Reason: Bug Ref: CDH-10167 Author: Tom White (cherry picked from commit 33ea303ca417b73d0404fa683760aa695284f41e) (cherry picked from commit 2808dccb7d7714453f94363da34f6c1b4f71c01a) (cherry picked from commit c3c36aea359fe4e2d67c9e6a4050d437bd27376c) commit 75cf231fdc929ab9c33b4d1bfec2cb677187f05b Author: Alejandro Abdelnur Date: Mon Jan 28 16:16:03 2013 -0800 MR1: CLOUDERA-BUILD. JT HA: jobtrackerha daemon shuts down on secure cluster after a while Reason: bug Author: Alejandro Abdelnur Ref: CDH-10165 (cherry picked from commit 636167c90fa04ead9c9249819adfd969f7511e7a) (cherry picked from commit 777e4295b70a57389efb045eba3982633d7fd417) (cherry picked from commit f486d1502334a7b6b4124dca2b5a32aca9b857da) commit d824bfe407d593a69af2a919bd541509b91fd547 Author: Alejandro Abdelnur Date: Mon Jan 28 09:58:58 2013 -0800 MR1: CLOUDERA-BUILD. ReduceTask class requires public visibility for pluggable sort. Reason: bug Author: Alejandro Abdelnur Ref: CDH-10154 (cherry picked from commit cd09304604d3ebaa850b8e78b3c8d186fe6e25e3) (cherry picked from commit a33a846e220fadefcb7388664b3bd5a854d8d3cc) (cherry picked from commit 3213daff8913ade29b727e23be92e8cf7f23d730) commit d2f3ad2ae9a248d64ba20232a0b0cb198bf90a0c Author: Alejandro Abdelnur Date: Sat Jan 26 20:33:41 2013 +0000 MR1: MAPREDUCE-4962. jobdetails.jsp uses display name instead of real name to get counters. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1438956 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 71a4429f006b489cda51862274751f446af7fbb6) Reason: Bug Ref: CDH-9004 Author: Sandy Ryza (cherry picked from commit bd99949a4a54a502b209ed005b55561a86d04fd2) (cherry picked from commit 0321e650409034648dd2f97186fce20dab7e3d8c) (cherry picked from commit 7b18fd0d2f01650a53ea42d4c20ce2f9b7ed80f6) commit 48d49a9c717c58e9e2414b80698cf6b7efe7e1ba Author: Thomas White Date: Fri Jan 25 10:57:52 2013 +0000 MR1: MAPREDUCE-2931. LocalJobRunner should support parallel mapper execution. Contributed by Sandy Ryza. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1438447 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 14369a4ed7138a5eae46e95c5fe6d3ed61c72e34) Reason: New Feature Ref: CDH-8337 Author: Sandy Ryza (cherry picked from commit 8722d3e2dea4e93cd8994358832aa903bb2e4b2e) (cherry picked from commit 158306539d16327fb8d97900fca551f268bd391f) (cherry picked from commit 255366bd92503ca54dd0c549a0146926116114aa) commit 4b742c06dd294b75743842daaa392112cd484904 Author: Alejandro Abdelnur Date: Sat Jan 26 04:29:54 2013 +0000 MR1: MAPREDUCE-4963. StatisticsCollector improperly keeps track of Last Day and Last Hour statistics for new TaskTrackers. (rkanter via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1438843 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit dd62cd17b0f975d22504162316072180fa03b141) (cherry picked from commit 48b1877f75201a770e6ba0d6e9a1c226668442a5) (cherry picked from commit bae2b18235ed8b73a2f96a7ac63b0d825f89f7c8) (cherry picked from commit c807d3de18d6b0da7b4717b2f1586404b22e3cf7) commit 4a2093532a7cfed04a6a6f5bc1db32cc3ddeb5cb Author: Alejandro Abdelnur Date: Fri Jan 25 01:05:12 2013 +0000 MR1: MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1438286 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 142e1b8b722c53be5264310f64c81e8afcda5457) Reason: Customer/support request Ref: CDH-7179 Author: Sandy Ryza (cherry picked from commit 5cce98177a36ceb2f3030fc524d1d1f09b802645) (cherry picked from commit 377abf8dca18fdefd6a698a38bd5551afcaa7505) (cherry picked from commit 0faec1d166b6db588fda9d46504149525d6eb08d) commit b92c05e9e1a0bd3c8c9937eba0e515c38549f6ac Author: Alejandro Abdelnur Date: Fri Jan 25 16:33:35 2013 -0800 MR1: CLOUDERA-BUILD. JT HA mrhaadmin does not work when hadoop.security.authorization is set to true Reason: bug Auhor: Alejandro Abdelnur Ref: CDH-10099 (cherry picked from commit 593e06d3f6ff07f212b312489e3bc705ad0fa51e) (cherry picked from commit a6278ea1e3bcb64c72782b7bb904ca2e3462bd7d) (cherry picked from commit ae8bf17af51080ca954740a3073937b896385f9d) commit 67ffacd7fc33861e8880a4477a9556c67a23676c Author: Alejandro Abdelnur Date: Fri Jan 25 15:12:51 2013 -0800 MR1: CLOUDERA-BUILD. oozie distcp fails on secure mr1 cluster Reason: bug, this is a backport of a functionality present in distcp-v2 (Hadoop2) Author: Alejandro Abdelnur Ref: CDH-9905 (cherry picked from commit fafd3187b67b53363c2eebfe7ab5ad56fc4d9684) (cherry picked from commit cc711abe1b340a0bdf01bfabaf4d5f898ead0bc8) (cherry picked from commit a6b1530beb8e918701beebf1c58abc1f182942bf) commit 7a185f39d4eefa54f0f8f54a8d439484f3b2f5e3 Author: Sean Mackrory Date: Thu Jan 24 13:55:29 2013 -0800 MR1: CDH-9274: Oro was removed from Ivy dependencies, removing it from Maven to prevent broken symlinks in packaging (cherry picked from commit c3f64c6260aea1d271a975d012d11ce18a1e360c) (cherry picked from commit d1181393917250bbd7e0693bb7f0c513332cb710) (cherry picked from commit 96769bf5050d0cfce571f246b6148c35c98d8c8b) commit 91eea26bd9efdf6a3eca7c450662bbe03d8d1533 Author: Thomas White Date: Wed Jan 23 11:06:39 2013 +0000 MR1: MAPREDUCE-4929. mapreduce.task.timeout is ignored. Contributed by Sandy Ryza. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1437343 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit f92d8753bc4ab98f68f6556fa802bcd11e1cabfd) Reason: Support/customer request Author: Sandy Ryza Ref: CDH-9078 (cherry picked from commit d12250e94b840d90625347e59c16f4bf7292050a) (cherry picked from commit ad5234e1fdb785674640e9d983815f11fa0efdb2) (cherry picked from commit 7d484a9fb9eb3409a23cd4e0b5f637e030cb1b0f) commit 510b5385f7d6a195b30aca40c9900ab667583ac5 Author: Alejandro Abdelnur Date: Thu Jan 24 10:27:23 2013 -0800 MR1: CLOUDERA-BUILD. jt ha does not work in a secure cluster. Reason: bug Author: Alejandro Abdelnur Ref: CDH-9873 (cherry picked from commit 49370bb92ca3f1716b16a0b1f42bb70a9850ad98) (cherry picked from commit 2e433b548b1a30d67073d01e24a559afbd28f05c) (cherry picked from commit f4cf3b6d3886702336ea82fa3ece9d0a2483a3a1) commit 7827f51c40c7265e630b3eabed4cb7c7ba3a3ca1 Author: Alejandro Abdelnur Date: Wed Jan 23 10:33:14 2013 -0800 MR1: MAPREDUCE-4808. Allow reduce-side merge to be pluggable. (masokan via tucu) Reason: enable pluggable sort Author: Alejandro Abdelnur Ref: CDH-6920 (cherry picked from commit 52d9d41ac127d9fc30f386ebeab846f3e442078c) (cherry picked from commit ae0efd89a3f1b7d1ad543e7f12433da31d0bb10d) (cherry picked from commit f14026fdc286804a09676afd9c453accee0f7059) commit aef0ae27820cef174c002eadd332e9a775608a6f Author: Alejandro Abdelnur Date: Wed Jan 23 10:13:11 2013 -0800 MR1: MAPREDUCE-4807. Allow MapOutputBuffer to be pluggable. (masokan via tucu) Reason: enable pluggable sort Author: Alejandro Abdelnur Ref: CDH-6920 (cherry picked from commit 1cd9b817e2ea962fe35e3d79299e32e5ec201134) (cherry picked from commit a0654fed6b049dde2073d27f8ce9fcdae765a486) (cherry picked from commit d54406fe4f7ed7afe85cb22ff1f9048f34025192) commit e923d590e247cc257fc742b21e0b98b6449830c4 Author: Karthik Kambatla Date: Wed Jan 23 15:51:14 2013 -0800 MR1: CLOUDERA-BUILD. Backport MAPREDUCE-4562 to MR1 for compatibility with MR2 Reason: Compatibility with MR2 Ref: CDH-9978 Author: Jarcec (cherry picked from commit 2c3417107f29a02f0027ec02a53663d282112808) (cherry picked from commit 6e88f735f18dab4711d4eea04f1ef7d835feeccc) (cherry picked from commit 936088898c17ab79f54f88be7d2d777ff5ffa2a7) commit 6feccd9c642cdb323f37f575abe15e6a97e85e7b Author: Karthik Kambatla Date: Wed Jan 23 14:48:56 2013 -0800 MR1: CDH-9701. Revert MAPREDUCE-2492 and other dependent JIRAs. The reverted commits are: e804373 "CDH-9220. Fix TestStreamingStatus to check log contains error" e809c60 "CDH-9220. TestStreamingStatus failing - regression due to CDH-8955" 6381204 "Backport MAPREDUCE-4800. Remove Unnecessary code from MapTaskStatus." 72a156f "Backport MAPREDUCE-2492. The new MapReduce API should make available task's progress to the task." Reason: Maintain binary compatibility for rolling upgrade Ref: CDH-9701 (cherry picked from commit 5b0940b6ca651c11ffe3bad60cd9bf3ef3225617) (cherry picked from commit 17bf9aeb46de4e9bb399a67559fa035210cecf0c) (cherry picked from commit 5aa340f7f379bfc0aecd4a01c2afc700747d7216) commit 3d340f2b7b13e1b831a57fe3fdad983aaef9cadd Author: Alejandro Abdelnur Date: Fri Jan 18 00:43:28 2013 +0000 MR1: MAPREDUCE-4923. Add toString method to TaggedInputSplit. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1434995 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit bed22b230563228cdc5c6366b0af2e5ab48ae63a) Reason: For ZD-10823 Author: Sandy Ryza Ref: CDH-9861 (cherry picked from commit 69140573dec8fc99bc92e764ee945748aba27877) (cherry picked from commit 1819a99840447ea2077c32ab475c6dfce17de533) (cherry picked from commit 5740d9ef93fb746da31eb97dba79cec5a6322adc) commit 34154c6a66c85c9a7d9d35b850cd87074815d475 Author: Alejandro Abdelnur Date: Wed Jan 16 23:56:04 2013 +0000 MR1: MAPREDUCE-4315. jobhistory.jsp throws 500 when a .txt file is found in /done. (sandyr via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1434506 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 61ee40b37429c41d9cbc4c619b6db4a12644dfa0) (cherry picked from commit a6ccb440ce302fcfc6dc64ad167eba08b60da6d4) (cherry picked from commit a035acecc775f6718b1253cd90b66e8bf89ac945) (cherry picked from commit 9867370c9e8ff9e2e2b65897ee181220d9966d71) commit a4e5ffd675b38b0f3612a23e905db8bc7c244ab4 Author: Tom White Date: Thu Jan 17 14:48:35 2013 +0000 MR1: CLOUDERA-BUILD. Don't shut down jobtracker HA process if an error occurs while active jobtracker is being closed. Reason: Bug Ref: CDH-9687 Author: Tom White (cherry picked from commit a784698987c20f12ffab50e39e274bd10ba37dc8) (cherry picked from commit 6f54bbcd05c0f534b267a39961205dd06a38ee0a) (cherry picked from commit 26cc2da710d5a72735bf4ce09434764123163903) commit 423921a49bf2c54d6aa049b54d6f85f731497844 Author: Harsh J Date: Tue Jan 15 14:13:16 2013 +0000 MR1: MAPREDUCE-4930. Backport MAPREDUCE-4678 and MAPREDUCE-4925 to branch-1. Contributed by Karthik Kambatla and Chris McConnell. (harsh) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1433428 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 3164be4d5b0f574058844cde984f72202a0d5293) Reason: Customer request Ref: CDH-8172 Author: Karthik Kambatla and Chris McConnell (cherry picked from commit 88057b1a7a519db5712b2ca71ed2e088250ef300) (cherry picked from commit 0fc05837b7a50f1b61c475c3d7c3d4235f21b378) (cherry picked from commit f57a63f783af5b2993dee400d49750855a20fa83) commit 9116b4bc002ef9d2e55ea661a36fe4e87bd49ad3 Author: Alejandro Abdelnur Date: Wed Jan 16 01:07:35 2013 +0000 MR1: MAPREDUCE-4924. flakey test: org.apache.hadoop.mapred.TestClusterMRNotification.testMR. (rkanter via tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1433782 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit d0fb29450104fb814e2b492af5db8581f3a02109) (cherry picked from commit 6b22cdf4b73f7b6f5f40da4e8b4f53c6a4b77ce0) (cherry picked from commit 5ebee4cb29477ee3625edfae0837465ef35c2ade) (cherry picked from commit 6a3a3c34a7517cd7eb25510f652d1a9017062898) commit ff058fe025a560b46f73a3c8519ded8db08d51ac Author: Matthew J. Foley Date: Thu Dec 15 08:51:13 2011 +0000 MR1: MAPREDUCE-3475. JT can't renew its own tokens. Contributed by Daryn Sharp. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1214660 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 0279d7f6966f430413ed3e13d5be694200127948) (cherry picked from commit 771bd33123f354e26345db98a60e6c0b809c5b9f) (cherry picked from commit 08bafc66d52005f150a599afaf17168f82355e3f) (cherry picked from commit 1bf283c52378cbe9119de9e5783d0465c84a7319) commit a31799385fd8bbfe0a6b0b69530ec6630837d3c4 Author: Roman Shaposhnik Date: Tue Apr 30 10:28:46 2013 -0700 MR1: KITCHEN-BUILD. Grafting MR1 code base on top of Hadoop 2.X (cherry picked from commit ca674c72accdde99706ca7b9c4a3b0e3fa1477e8) (cherry picked from commit ab18247b8f7e814ac85a62b92686511fd8083245) (cherry picked from commit 522cf92c2843c14ac1fbce43e6abb53673681d50) Conflicts: hadoop-mapreduce1-project/CHANGES.txt hadoop-mapreduce1-project/LICENSE.txt hadoop-mapreduce1-project/NOTICE.txt hadoop-mapreduce1-project/README.txt hadoop-mapreduce1-project/bin/hadoop hadoop-mapreduce1-project/bin/hadoop-config.sh hadoop-mapreduce1-project/bin/hadoop-daemon.sh hadoop-mapreduce1-project/bin/hadoop-daemons.sh hadoop-mapreduce1-project/bin/rcc hadoop-mapreduce1-project/bin/slaves.sh hadoop-mapreduce1-project/bin/start-mapred.sh hadoop-mapreduce1-project/bin/stop-mapred.sh hadoop-mapreduce1-project/build.xml hadoop-mapreduce1-project/cloudera-pom.xml hadoop-mapreduce1-project/cloudera/files/hadoop-0.20.1.gz hadoop-mapreduce1-project/cloudera/maven-packaging/.gitignore hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-client/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-client/src/main/assemblies/hadoop-client.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-core/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-examples/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-minicluster/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-mrunit/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-streaming/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-tarball/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-test/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-tools/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/templates/build.template hadoop-mapreduce1-project/cloudera/maven-packaging/templates/libraries.template hadoop-mapreduce1-project/conf/capacity-scheduler.xml.template hadoop-mapreduce1-project/conf/configuration.xsl hadoop-mapreduce1-project/conf/core-site.xml.template hadoop-mapreduce1-project/conf/fair-scheduler.xml hadoop-mapreduce1-project/conf/fair-scheduler.xml.template hadoop-mapreduce1-project/conf/hadoop-env.sh.template hadoop-mapreduce1-project/conf/hadoop-metrics.properties hadoop-mapreduce1-project/conf/hadoop-policy.xml.template hadoop-mapreduce1-project/conf/hdfs-site.xml.template hadoop-mapreduce1-project/conf/log4j.properties hadoop-mapreduce1-project/conf/mapred-queue-acls.xml.template hadoop-mapreduce1-project/conf/mapred-site.xml.template hadoop-mapreduce1-project/conf/masters.template hadoop-mapreduce1-project/conf/org-xerial-snappy.properties hadoop-mapreduce1-project/conf/slaves.template hadoop-mapreduce1-project/conf/ssl-client.xml.example hadoop-mapreduce1-project/conf/ssl-server.xml.example hadoop-mapreduce1-project/conf/taskcontroller.cfg hadoop-mapreduce1-project/example-confs/conf.pseudo/README hadoop-mapreduce1-project/example-confs/conf.pseudo/core-site.xml hadoop-mapreduce1-project/example-confs/conf.pseudo/hadoop-metrics.properties hadoop-mapreduce1-project/example-confs/conf.pseudo/hdfs-site.xml hadoop-mapreduce1-project/example-confs/conf.pseudo/mapred-site.xml hadoop-mapreduce1-project/example-confs/conf.secure/configuration.xsl hadoop-mapreduce1-project/example-confs/conf.secure/core-site.xml hadoop-mapreduce1-project/example-confs/conf.secure/hadoop-env.sh hadoop-mapreduce1-project/example-confs/conf.secure/hadoop-metrics.properties hadoop-mapreduce1-project/example-confs/conf.secure/hadoop-policy.xml hadoop-mapreduce1-project/example-confs/conf.secure/hdfs-site.xml hadoop-mapreduce1-project/example-confs/conf.secure/log4j.properties hadoop-mapreduce1-project/example-confs/conf.secure/mapred-queue-acls.xml hadoop-mapreduce1-project/example-confs/conf.secure/mapred-site.xml hadoop-mapreduce1-project/example-confs/conf.secure/masters hadoop-mapreduce1-project/example-confs/conf.secure/slaves hadoop-mapreduce1-project/example-confs/conf.secure/taskcontroller.cfg hadoop-mapreduce1-project/ivy.xml hadoop-mapreduce1-project/ivy/hadoop-core-pom-template.xml hadoop-mapreduce1-project/ivy/hadoop-core.pom hadoop-mapreduce1-project/ivy/hadoop-examples-pom-template.xml hadoop-mapreduce1-project/ivy/hadoop-streaming-pom-template.xml hadoop-mapreduce1-project/ivy/hadoop-test-pom-template.xml hadoop-mapreduce1-project/ivy/hadoop-tools-pom-template.xml hadoop-mapreduce1-project/ivy/ivysettings.xml hadoop-mapreduce1-project/ivy/libraries.properties hadoop-mapreduce1-project/lib/ant-contrib-1.0b3.jar hadoop-mapreduce1-project/lib/hsqldb-1.8.0.10.LICENSE.txt hadoop-mapreduce1-project/lib/hsqldb-1.8.0.10.jar hadoop-mapreduce1-project/lib/jdiff/hadoop_0.17.0.xml hadoop-mapreduce1-project/lib/jdiff/hadoop_0.18.1.xml hadoop-mapreduce1-project/lib/jdiff/hadoop_0.18.2.xml hadoop-mapreduce1-project/lib/jdiff/hadoop_0.18.3.xml hadoop-mapreduce1-project/lib/jdiff/hadoop_0.19.0.xml hadoop-mapreduce1-project/lib/jdiff/hadoop_0.19.1.xml hadoop-mapreduce1-project/lib/jdiff/hadoop_0.19.2.xml hadoop-mapreduce1-project/lib/jdiff/hadoop_0.20.1.xml hadoop-mapreduce1-project/lib/jsp-2.1/jsp-2.1.jar hadoop-mapreduce1-project/lib/jsp-2.1/jsp-api-2.1.jar hadoop-mapreduce1-project/lib/kfs-0.2.2.jar hadoop-mapreduce1-project/lib/kfs-0.2.LICENSE.txt hadoop-mapreduce1-project/src/ant/org/apache/hadoop/ant/DfsTask.java hadoop-mapreduce1-project/src/ant/org/apache/hadoop/ant/antlib.xml hadoop-mapreduce1-project/src/ant/org/apache/hadoop/ant/condition/DfsBaseConditional.java hadoop-mapreduce1-project/src/ant/org/apache/hadoop/ant/condition/DfsExists.java hadoop-mapreduce1-project/src/ant/org/apache/hadoop/ant/condition/DfsIsDir.java hadoop-mapreduce1-project/src/ant/org/apache/hadoop/ant/condition/DfsZeroLen.java hadoop-mapreduce1-project/src/benchmarks/gridmix/README hadoop-mapreduce1-project/src/benchmarks/gridmix/generateData.sh hadoop-mapreduce1-project/src/benchmarks/gridmix/gridmix-env hadoop-mapreduce1-project/src/benchmarks/gridmix/javasort/text-sort.large hadoop-mapreduce1-project/src/benchmarks/gridmix/javasort/text-sort.medium hadoop-mapreduce1-project/src/benchmarks/gridmix/javasort/text-sort.small hadoop-mapreduce1-project/src/benchmarks/gridmix/maxent/maxent.large hadoop-mapreduce1-project/src/benchmarks/gridmix/monsterQuery/monster_query.large hadoop-mapreduce1-project/src/benchmarks/gridmix/monsterQuery/monster_query.medium hadoop-mapreduce1-project/src/benchmarks/gridmix/monsterQuery/monster_query.small hadoop-mapreduce1-project/src/benchmarks/gridmix/pipesort/text-sort.large hadoop-mapreduce1-project/src/benchmarks/gridmix/pipesort/text-sort.medium hadoop-mapreduce1-project/src/benchmarks/gridmix/pipesort/text-sort.small hadoop-mapreduce1-project/src/benchmarks/gridmix/streamsort/text-sort.large hadoop-mapreduce1-project/src/benchmarks/gridmix/streamsort/text-sort.medium hadoop-mapreduce1-project/src/benchmarks/gridmix/streamsort/text-sort.small hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/allThroughHod hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/allToSameCluster hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/maxentHod hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/maxentToSameCluster hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/monsterQueriesHod hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/monsterQueriesToSameCluster hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/sleep_if_too_busy hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/textSortHod hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/textSortToSameCluster hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/webdataScanHod hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/webdataScanToSameCluster hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/webdataSortHod hadoop-mapreduce1-project/src/benchmarks/gridmix/submissionScripts/webdataSortToSameCluster hadoop-mapreduce1-project/src/benchmarks/gridmix/webdatascan/webdata_scan.large hadoop-mapreduce1-project/src/benchmarks/gridmix/webdatascan/webdata_scan.medium hadoop-mapreduce1-project/src/benchmarks/gridmix/webdatascan/webdata_scan.small hadoop-mapreduce1-project/src/benchmarks/gridmix/webdatasort/webdata_sort.large hadoop-mapreduce1-project/src/benchmarks/gridmix/webdatasort/webdata_sort.medium hadoop-mapreduce1-project/src/benchmarks/gridmix/webdatasort/webdata_sort.small hadoop-mapreduce1-project/src/benchmarks/gridmix2/README.gridmix2 hadoop-mapreduce1-project/src/benchmarks/gridmix2/build.xml hadoop-mapreduce1-project/src/benchmarks/gridmix2/generateGridmix2data.sh hadoop-mapreduce1-project/src/benchmarks/gridmix2/gridmix-env-2 hadoop-mapreduce1-project/src/benchmarks/gridmix2/gridmix_config.xml hadoop-mapreduce1-project/src/benchmarks/gridmix2/rungridmix_2 hadoop-mapreduce1-project/src/benchmarks/gridmix2/src/java/org/apache/hadoop/mapred/CombinerJobCreator.java hadoop-mapreduce1-project/src/benchmarks/gridmix2/src/java/org/apache/hadoop/mapred/GenericMRLoadJobCreator.java hadoop-mapreduce1-project/src/benchmarks/gridmix2/src/java/org/apache/hadoop/mapred/GridMixRunner.java hadoop-mapreduce1-project/src/c++/jsvc/build.xml hadoop-mapreduce1-project/src/c++/jsvc/commons-daemon-1.0.2-src.tar.gz hadoop-mapreduce1-project/src/c++/jsvc/xconf.sh hadoop-mapreduce1-project/src/c++/libhdfs/Makefile.am hadoop-mapreduce1-project/src/c++/libhdfs/bootstrap.sh hadoop-mapreduce1-project/src/c++/libhdfs/configure.ac hadoop-mapreduce1-project/src/c++/libhdfs/docs/Doxyfile hadoop-mapreduce1-project/src/c++/libhdfs/docs/libhdfs_footer.html hadoop-mapreduce1-project/src/c++/libhdfs/hdfs.c hadoop-mapreduce1-project/src/c++/libhdfs/hdfs.h hadoop-mapreduce1-project/src/c++/libhdfs/hdfsJniHelper.c hadoop-mapreduce1-project/src/c++/libhdfs/hdfsJniHelper.h hadoop-mapreduce1-project/src/c++/libhdfs/hdfs_read.c hadoop-mapreduce1-project/src/c++/libhdfs/hdfs_test.c hadoop-mapreduce1-project/src/c++/libhdfs/hdfs_write.c hadoop-mapreduce1-project/src/c++/libhdfs/m4/apfunctions.m4 hadoop-mapreduce1-project/src/c++/libhdfs/m4/apjava.m4 hadoop-mapreduce1-project/src/c++/libhdfs/m4/apsupport.m4 hadoop-mapreduce1-project/src/c++/libhdfs/tests/conf/core-site.xml hadoop-mapreduce1-project/src/c++/libhdfs/tests/conf/hadoop-site.xml hadoop-mapreduce1-project/src/c++/libhdfs/tests/conf/hdfs-site.xml hadoop-mapreduce1-project/src/c++/libhdfs/tests/conf/mapred-site.xml hadoop-mapreduce1-project/src/c++/libhdfs/tests/conf/slaves hadoop-mapreduce1-project/src/c++/libhdfs/tests/test-libhdfs.sh hadoop-mapreduce1-project/src/c++/librecordio/Makefile hadoop-mapreduce1-project/src/c++/librecordio/archive.hh hadoop-mapreduce1-project/src/c++/librecordio/binarchive.cc hadoop-mapreduce1-project/src/c++/librecordio/binarchive.hh hadoop-mapreduce1-project/src/c++/librecordio/csvarchive.cc hadoop-mapreduce1-project/src/c++/librecordio/csvarchive.hh hadoop-mapreduce1-project/src/c++/librecordio/exception.cc hadoop-mapreduce1-project/src/c++/librecordio/exception.hh hadoop-mapreduce1-project/src/c++/librecordio/fieldTypeInfo.cc hadoop-mapreduce1-project/src/c++/librecordio/fieldTypeInfo.hh hadoop-mapreduce1-project/src/c++/librecordio/filestream.cc hadoop-mapreduce1-project/src/c++/librecordio/filestream.hh hadoop-mapreduce1-project/src/c++/librecordio/recordTypeInfo.cc hadoop-mapreduce1-project/src/c++/librecordio/recordTypeInfo.hh hadoop-mapreduce1-project/src/c++/librecordio/recordio.cc hadoop-mapreduce1-project/src/c++/librecordio/recordio.hh hadoop-mapreduce1-project/src/c++/librecordio/test/Makefile hadoop-mapreduce1-project/src/c++/librecordio/test/test.cc hadoop-mapreduce1-project/src/c++/librecordio/test/test.hh hadoop-mapreduce1-project/src/c++/librecordio/test/test.jr hadoop-mapreduce1-project/src/c++/librecordio/test/testFromJava.cc hadoop-mapreduce1-project/src/c++/librecordio/test/testFromJava.hh hadoop-mapreduce1-project/src/c++/librecordio/typeIDs.cc hadoop-mapreduce1-project/src/c++/librecordio/typeIDs.hh hadoop-mapreduce1-project/src/c++/librecordio/typeInfo.cc hadoop-mapreduce1-project/src/c++/librecordio/typeInfo.hh hadoop-mapreduce1-project/src/c++/librecordio/utils.cc hadoop-mapreduce1-project/src/c++/librecordio/utils.hh hadoop-mapreduce1-project/src/c++/librecordio/xmlarchive.cc hadoop-mapreduce1-project/src/c++/librecordio/xmlarchive.hh hadoop-mapreduce1-project/src/c++/pipes/.autom4te.cfg hadoop-mapreduce1-project/src/c++/pipes/Makefile.am hadoop-mapreduce1-project/src/c++/pipes/api/hadoop/Pipes.hh hadoop-mapreduce1-project/src/c++/pipes/api/hadoop/TemplateFactory.hh hadoop-mapreduce1-project/src/c++/pipes/bootstrap.sh hadoop-mapreduce1-project/src/c++/pipes/configure.ac hadoop-mapreduce1-project/src/c++/pipes/debug/pipes-default-gdb-commands.txt hadoop-mapreduce1-project/src/c++/pipes/debug/pipes-default-script hadoop-mapreduce1-project/src/c++/pipes/impl/HadoopPipes.cc hadoop-mapreduce1-project/src/c++/task-controller/.autom4te.cfg hadoop-mapreduce1-project/src/c++/task-controller/.gitignore hadoop-mapreduce1-project/src/c++/task-controller/Makefile.am hadoop-mapreduce1-project/src/c++/task-controller/bootstrap.sh hadoop-mapreduce1-project/src/c++/task-controller/configure.ac hadoop-mapreduce1-project/src/c++/task-controller/impl/configuration.c hadoop-mapreduce1-project/src/c++/task-controller/impl/configuration.h hadoop-mapreduce1-project/src/c++/task-controller/impl/main.c hadoop-mapreduce1-project/src/c++/task-controller/impl/task-controller.c hadoop-mapreduce1-project/src/c++/task-controller/impl/task-controller.h hadoop-mapreduce1-project/src/c++/task-controller/test/test-task-controller.c hadoop-mapreduce1-project/src/c++/utils/.autom4te.cfg hadoop-mapreduce1-project/src/c++/utils/Makefile.am hadoop-mapreduce1-project/src/c++/utils/api/hadoop/SerialUtils.hh hadoop-mapreduce1-project/src/c++/utils/api/hadoop/StringUtils.hh hadoop-mapreduce1-project/src/c++/utils/bootstrap.sh hadoop-mapreduce1-project/src/c++/utils/configure.ac hadoop-mapreduce1-project/src/c++/utils/impl/SerialUtils.cc hadoop-mapreduce1-project/src/c++/utils/impl/StringUtils.cc hadoop-mapreduce1-project/src/c++/utils/m4/hadoop_utils.m4 hadoop-mapreduce1-project/src/contrib/bash-tab-completion/README hadoop-mapreduce1-project/src/contrib/bash-tab-completion/hadoop.sh hadoop-mapreduce1-project/src/contrib/build-contrib.xml hadoop-mapreduce1-project/src/contrib/build.xml hadoop-mapreduce1-project/src/contrib/capacity-scheduler/README hadoop-mapreduce1-project/src/contrib/capacity-scheduler/build.xml hadoop-mapreduce1-project/src/contrib/capacity-scheduler/ivy.xml hadoop-mapreduce1-project/src/contrib/capacity-scheduler/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerConf.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerQueue.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacitySchedulerServlet.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/JobInitializationPoller.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/JobQueuesManager.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/MemoryMatcher.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/ClusterWithCapacityScheduler.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacityScheduler.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerConf.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerServlet.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerWithJobTracker.java hadoop-mapreduce1-project/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithCS.java hadoop-mapreduce1-project/src/contrib/cloud/README.txt hadoop-mapreduce1-project/src/contrib/cloud/build.xml hadoop-mapreduce1-project/src/contrib/cloud/lib/pyAntTasks-1.3-LICENSE.txt hadoop-mapreduce1-project/src/contrib/cloud/lib/pyAntTasks-1.3.jar hadoop-mapreduce1-project/src/contrib/cloud/src/integration-test/create-ebs-snapshot.sh hadoop-mapreduce1-project/src/contrib/cloud/src/integration-test/ebs-storage-spec.json hadoop-mapreduce1-project/src/contrib/cloud/src/integration-test/persistent-cluster.sh hadoop-mapreduce1-project/src/contrib/cloud/src/integration-test/transient-cluster.sh hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop-ec2 hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/__init__.py hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/__init__.py hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/cli.py hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/cluster.py hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/data/hadoop-ec2-init-remote.sh hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/data/zookeeper-ec2-init-remote.sh hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/providers/__init__.py hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/providers/dummy.py hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/providers/ec2.py hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/service.py hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/storage.py hadoop-mapreduce1-project/src/contrib/cloud/src/py/hadoop/cloud/util.py hadoop-mapreduce1-project/src/contrib/cloud/src/py/setup.py hadoop-mapreduce1-project/src/contrib/cloud/src/test/py/testcluster.py hadoop-mapreduce1-project/src/contrib/cloud/src/test/py/teststorage.py hadoop-mapreduce1-project/src/contrib/cloud/src/test/py/testuserdata.py hadoop-mapreduce1-project/src/contrib/cloud/src/test/py/testutil.py hadoop-mapreduce1-project/src/contrib/data_join/build.xml hadoop-mapreduce1-project/src/contrib/data_join/ivy.xml hadoop-mapreduce1-project/src/contrib/data_join/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/README.txt hadoop-mapreduce1-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java hadoop-mapreduce1-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java hadoop-mapreduce1-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java hadoop-mapreduce1-project/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/ArrayListBackedIterator.java hadoop-mapreduce1-project/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java hadoop-mapreduce1-project/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinMapperBase.java hadoop-mapreduce1-project/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinReducerBase.java hadoop-mapreduce1-project/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/JobBase.java hadoop-mapreduce1-project/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/ResetableIterator.java hadoop-mapreduce1-project/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/TaggedMapOutput.java hadoop-mapreduce1-project/src/contrib/data_join/src/test/org/apache/hadoop/contrib/utils/join/TestDataJoin.java hadoop-mapreduce1-project/src/contrib/ec2/README.txt hadoop-mapreduce1-project/src/contrib/ec2/bin/cmd-hadoop-cluster hadoop-mapreduce1-project/src/contrib/ec2/bin/create-hadoop-image hadoop-mapreduce1-project/src/contrib/ec2/bin/delete-hadoop-cluster hadoop-mapreduce1-project/src/contrib/ec2/bin/hadoop-ec2 hadoop-mapreduce1-project/src/contrib/ec2/bin/hadoop-ec2-env.sh.template hadoop-mapreduce1-project/src/contrib/ec2/bin/hadoop-ec2-init-remote.sh hadoop-mapreduce1-project/src/contrib/ec2/bin/image/create-hadoop-image-remote hadoop-mapreduce1-project/src/contrib/ec2/bin/image/ec2-run-user-data hadoop-mapreduce1-project/src/contrib/ec2/bin/launch-hadoop-cluster hadoop-mapreduce1-project/src/contrib/ec2/bin/launch-hadoop-master hadoop-mapreduce1-project/src/contrib/ec2/bin/launch-hadoop-slaves hadoop-mapreduce1-project/src/contrib/ec2/bin/list-hadoop-clusters hadoop-mapreduce1-project/src/contrib/ec2/bin/terminate-hadoop-cluster hadoop-mapreduce1-project/src/contrib/eclipse-plugin/.classpath hadoop-mapreduce1-project/src/contrib/eclipse-plugin/.project hadoop-mapreduce1-project/src/contrib/eclipse-plugin/.settings/org.eclipse.jdt.core.prefs hadoop-mapreduce1-project/src/contrib/eclipse-plugin/.settings/org.eclipse.jdt.ui.prefs hadoop-mapreduce1-project/src/contrib/eclipse-plugin/.settings/org.eclipse.wst.validation.prefs hadoop-mapreduce1-project/src/contrib/eclipse-plugin/META-INF/MANIFEST.MF hadoop-mapreduce1-project/src/contrib/eclipse-plugin/build.properties hadoop-mapreduce1-project/src/contrib/eclipse-plugin/build.xml hadoop-mapreduce1-project/src/contrib/eclipse-plugin/ivy.xml hadoop-mapreduce1-project/src/contrib/eclipse-plugin/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/eclipse-plugin/plugin.xml hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Components/Conf.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Components/Export.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Components/Import.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Components/New.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Components/Reload.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Components/Tool.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Components/Tools.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/ConnectDFS.xml hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/CreateProj.xml hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant-16x16.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant-24x24.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant-32x32.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant-64x64.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant-small-16x16.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant.jpg hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant100x100.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant16x16.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant2-136x136.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant2-16x16.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant2-24x24.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant2-32x32.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant2-64x64.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant2.jpg hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant3-122x122.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant3-16x16.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Elephant3-24x24.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/HelloWorld.xml hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/MAP100x100.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/MAP16x15.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/RunProj.xml hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/SetHadoopPath.xml hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/Setup.xml hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/download.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/drive100x100.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/drive16x16.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/driver.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/driverwiz.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/elephantblue16x16.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/files.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/hadoop-logo-16x16.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/hadoop-logo-24x24.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/hadoop-logo-85x85.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/hadoop-logo.jpg hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/hadoop.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/hadoop_small.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/job.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/location-edit-16x16.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/location-new-16x16.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/map16x16.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/mapper16.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/mapwiz.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/new-folder.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/projwiz.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/reduce100x100.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/reduce16x16.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/reducer-16x16.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/reducer16.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/reducewiz.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/refresh.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/spite_overcloud.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/spitesmall.gif hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/spitesmall.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/resources/upload.png hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/Activator.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/ErrorMessageDialog.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/HadoopPerspectiveFactory.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/ImageLibrary.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/MapReduceNature.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/NewDriverWizard.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/NewDriverWizardPage.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/NewMapReduceProjectWizard.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/NewMapperWizard.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/NewReducerWizard.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/PropertyTester.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/actions/DFSActionImpl.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/actions/EditLocationAction.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/actions/NewLocationAction.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/actions/OpenNewMRClassWizardAction.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/actions/OpenNewMRProjectAction.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/ActionProvider.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSActions.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSContent.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSContentProvider.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSFile.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSFolder.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSLocation.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSLocationsRoot.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSMessage.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/dfs/DFSPath.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/HadoopApplicationLaunchShortcut.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/LocalMapReduceLaunchTabGroup.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/MutexRule.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/launch/StartHadoopLaunchTabGroup.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/preferences/MapReducePreferencePage.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/preferences/PreferenceConstants.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/preferences/PreferenceInitializer.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/ConfProp.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/HadoopJob.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/HadoopPathPage.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/HadoopServer.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/IJobListener.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/server/JarModule.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/HadoopLocationWizard.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/HadoopServerSelectionListContentProvider.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/IHadoopServerListener.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/RunOnHadoopWizard.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/servers/ServerRegistry.java hadoop-mapreduce1-project/src/contrib/eclipse-plugin/src/java/org/apache/hadoop/eclipse/view/servers/ServerView.java hadoop-mapreduce1-project/src/contrib/failmon/README hadoop-mapreduce1-project/src/contrib/failmon/bin/failmon.sh hadoop-mapreduce1-project/src/contrib/failmon/bin/scheduler.py hadoop-mapreduce1-project/src/contrib/failmon/build.xml hadoop-mapreduce1-project/src/contrib/failmon/conf/commons-logging.properties hadoop-mapreduce1-project/src/contrib/failmon/conf/failmon.properties hadoop-mapreduce1-project/src/contrib/failmon/conf/global.config hadoop-mapreduce1-project/src/contrib/failmon/conf/hosts.list hadoop-mapreduce1-project/src/contrib/failmon/conf/log4j.properties hadoop-mapreduce1-project/src/contrib/failmon/ivy.xml hadoop-mapreduce1-project/src/contrib/failmon/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/Anonymizer.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/CPUParser.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/Continuous.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/Environment.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/EventRecord.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/Executor.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/HDFSMerger.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/HadoopLogParser.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/LocalStore.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/LogParser.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/MonitorJob.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/Monitored.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/NICParser.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/OfflineAnonymizer.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/PersistentState.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/RunOnce.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/SMARTParser.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/SensorsParser.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/SerializedRecord.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/ShellParser.java hadoop-mapreduce1-project/src/contrib/failmon/src/java/org/apache/hadoop/contrib/failmon/SystemLogParser.java hadoop-mapreduce1-project/src/contrib/fairscheduler/README hadoop-mapreduce1-project/src/contrib/fairscheduler/build.xml hadoop-mapreduce1-project/src/contrib/fairscheduler/designdoc/fsdesigndoc.tex hadoop-mapreduce1-project/src/contrib/fairscheduler/ivy.xml hadoop-mapreduce1-project/src/contrib/fairscheduler/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/AllocationConfigurationException.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/CapBasedLoadManager.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/DefaultTaskSelector.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairScheduler.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerEventLog.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FairSchedulerServlet.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/FifoJobComparator.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/JobSchedulable.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/LoadManager.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/LocalityLevel.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/NewJobWeightBooster.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/Pool.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolManager.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/PoolSchedulable.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/Schedulable.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/SchedulingAlgorithms.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/SchedulingMode.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/TaskSelector.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/UndeclaredPoolException.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/java/org/apache/hadoop/mapred/WeightAdjuster.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/FairSchedulerStressTest.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/FairSchedulerSystemTestBase.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/FakeSchedulable.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestCapBasedLoadManager.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestComputeFairShares.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairScheduler.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerEventLog.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerPoolNames.java hadoop-mapreduce1-project/src/contrib/fairscheduler/src/test/org/apache/hadoop/mapred/TestFairSchedulerSystem.java hadoop-mapreduce1-project/src/contrib/fuse-dfs/Makefile.am hadoop-mapreduce1-project/src/contrib/fuse-dfs/README hadoop-mapreduce1-project/src/contrib/fuse-dfs/acinclude.m4 hadoop-mapreduce1-project/src/contrib/fuse-dfs/bootstrap.sh hadoop-mapreduce1-project/src/contrib/fuse-dfs/build.xml hadoop-mapreduce1-project/src/contrib/fuse-dfs/configure.ac hadoop-mapreduce1-project/src/contrib/fuse-dfs/global_footer.mk hadoop-mapreduce1-project/src/contrib/fuse-dfs/global_header.mk hadoop-mapreduce1-project/src/contrib/fuse-dfs/ivy.xml hadoop-mapreduce1-project/src/contrib/fuse-dfs/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/Makefile.am hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_connect.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_connect.h hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_context_handle.h hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_dfs.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_dfs.h hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_file_handle.h hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls.h hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_access.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_chmod.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_chown.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_create.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_flush.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_getattr.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_mkdir.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_mknod.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_open.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_read.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_readdir.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_release.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_rename.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_rmdir.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_statfs.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_symlink.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_truncate.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_unlink.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_utimens.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_impls_write.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_init.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_init.h hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_options.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_options.h hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_stat_struct.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_stat_struct.h hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_trash.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_trash.h hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_users.c hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/fuse_users.h hadoop-mapreduce1-project/src/contrib/fuse-dfs/src/test/TestFuseDFS.java hadoop-mapreduce1-project/src/contrib/gridmix/README hadoop-mapreduce1-project/src/contrib/gridmix/build.xml hadoop-mapreduce1-project/src/contrib/gridmix/ivy.xml hadoop-mapreduce1-project/src/contrib/gridmix/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/AvgRecordFactory.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/CombineFileSplit.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/EchoUserResolver.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/FilePool.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/FileQueue.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GenerateData.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJob.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixJobSubmissionPolicy.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixKey.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/GridmixRecord.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/InputStriper.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/IntermediateRecordFactory.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobCreator.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobFactory.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobMonitor.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/JobSubmitter.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/LoadJob.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/LoadSplit.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RandomAlgorithms.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ReadRecordFactory.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RecordFactory.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/ReplayJobFactory.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/RoundRobinUserResolver.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/SleepJob.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/StatListener.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Statistics.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/SubmitterUserResolver.java hadoop-mapreduce1-project/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/UserResolver.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobFactory.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/DebugJobProducer.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/GridmixTestUtils.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestFilePool.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestFileQueue.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixRecord.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestGridmixSubmission.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRandomAlgorithm.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestRecordFactory.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestSleepJob.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/org/apache/hadoop/mapred/gridmix/TestUserResolve.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/system/org/apache/hadoop/mapred/gridmix/GridMixConfig.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/system/org/apache/hadoop/mapred/gridmix/GridMixRunMode.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/system/org/apache/hadoop/mapred/gridmix/TestGridMixDataGeneration.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/system/org/apache/hadoop/mapred/gridmix/TestGridMixFilePool.java hadoop-mapreduce1-project/src/contrib/gridmix/src/test/system/org/apache/hadoop/mapred/gridmix/UtilsForGridmix.java hadoop-mapreduce1-project/src/contrib/hod/CHANGES.txt hadoop-mapreduce1-project/src/contrib/hod/README hadoop-mapreduce1-project/src/contrib/hod/bin/VERSION hadoop-mapreduce1-project/src/contrib/hod/bin/checknodes hadoop-mapreduce1-project/src/contrib/hod/bin/hod hadoop-mapreduce1-project/src/contrib/hod/bin/hodcleanup hadoop-mapreduce1-project/src/contrib/hod/bin/hodring hadoop-mapreduce1-project/src/contrib/hod/bin/ringmaster hadoop-mapreduce1-project/src/contrib/hod/bin/verify-account hadoop-mapreduce1-project/src/contrib/hod/build.xml hadoop-mapreduce1-project/src/contrib/hod/conf/hodrc hadoop-mapreduce1-project/src/contrib/hod/config.txt hadoop-mapreduce1-project/src/contrib/hod/getting_started.txt hadoop-mapreduce1-project/src/contrib/hod/hodlib/AllocationManagers/__init__.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/AllocationManagers/goldAllocationManager.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/__init__.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/allocationManagerUtil.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/desc.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/descGenerator.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/hodsvc.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/logger.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/miniHTMLParser.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/nodepoolutil.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/setup.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/socketServers.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/tcp.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/threads.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/types.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/util.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Common/xmlrpc.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/GridServices/__init__.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/GridServices/hdfs.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/GridServices/mapred.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/GridServices/service.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Hod/__init__.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Hod/hadoop.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Hod/hod.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Hod/nodePool.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/HodRing/__init__.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/HodRing/hodRing.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/NodePools/__init__.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/NodePools/torque.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/RingMaster/__init__.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/RingMaster/idleJobTracker.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/RingMaster/ringMaster.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Schedulers/__init__.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/Schedulers/torque.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/ServiceProxy/__init__.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/ServiceProxy/serviceProxy.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/ServiceRegistry/__init__.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/ServiceRegistry/serviceRegistry.py hadoop-mapreduce1-project/src/contrib/hod/hodlib/__init__.py hadoop-mapreduce1-project/src/contrib/hod/ivy.xml hadoop-mapreduce1-project/src/contrib/hod/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/hod/support/checklimits.sh hadoop-mapreduce1-project/src/contrib/hod/support/logcondense.py hadoop-mapreduce1-project/src/contrib/hod/testing/__init__.py hadoop-mapreduce1-project/src/contrib/hod/testing/helper.py hadoop-mapreduce1-project/src/contrib/hod/testing/lib.py hadoop-mapreduce1-project/src/contrib/hod/testing/main.py hadoop-mapreduce1-project/src/contrib/hod/testing/testHadoop.py hadoop-mapreduce1-project/src/contrib/hod/testing/testHod.py hadoop-mapreduce1-project/src/contrib/hod/testing/testHodCleanup.py hadoop-mapreduce1-project/src/contrib/hod/testing/testHodRing.py hadoop-mapreduce1-project/src/contrib/hod/testing/testModule.py hadoop-mapreduce1-project/src/contrib/hod/testing/testRingmasterRPCs.py hadoop-mapreduce1-project/src/contrib/hod/testing/testThreads.py hadoop-mapreduce1-project/src/contrib/hod/testing/testTypes.py hadoop-mapreduce1-project/src/contrib/hod/testing/testUtil.py hadoop-mapreduce1-project/src/contrib/hod/testing/testXmlrpc.py hadoop-mapreduce1-project/src/contrib/index/README hadoop-mapreduce1-project/src/contrib/index/build.xml hadoop-mapreduce1-project/src/contrib/index/conf/index-config.xml.template hadoop-mapreduce1-project/src/contrib/index/ivy.xml hadoop-mapreduce1-project/src/contrib/index/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/index/sample/data.txt hadoop-mapreduce1-project/src/contrib/index/sample/data2.txt hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/example/HashingDistributionPolicy.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/example/IdentityLocalAnalysis.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/example/LineDocInputFormat.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/example/LineDocLocalAnalysis.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/example/LineDocRecordReader.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/example/LineDocTextAndOp.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/example/RoundRobinDistributionPolicy.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/lucene/FileSystemDirectory.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/lucene/LuceneIndexFileNameFilter.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/lucene/LuceneUtil.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/lucene/MixedDeletionPolicy.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/lucene/MixedDirectory.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/lucene/RAMDirectoryUtil.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/lucene/ShardWriter.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/main/UpdateIndex.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/DocumentAndOp.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/DocumentID.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IDistributionPolicy.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IIndexUpdater.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/ILocalAnalysis.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdateCombiner.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdateConfiguration.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdateMapper.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdateOutputFormat.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdatePartitioner.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdateReducer.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IntermediateForm.java hadoop-mapreduce1-project/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/Shard.java hadoop-mapreduce1-project/src/contrib/index/src/test/org/apache/hadoop/contrib/index/lucene/TestMixedDirectory.java hadoop-mapreduce1-project/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestDistributionPolicy.java hadoop-mapreduce1-project/src/contrib/index/src/test/org/apache/hadoop/contrib/index/mapred/TestIndexUpdater.java hadoop-mapreduce1-project/src/contrib/mrunit/README.txt hadoop-mapreduce1-project/src/contrib/mrunit/broken.xml.build hadoop-mapreduce1-project/src/contrib/mrunit/doc/overview.html hadoop-mapreduce1-project/src/contrib/mrunit/ivy.xml hadoop-mapreduce1-project/src/contrib/mrunit/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapDriverBase.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapReduceDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/ReduceDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/ReduceDriverBase.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/TestDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockInputSplit.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockMapContext.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockMapContextWrapper.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockOutputCommitter.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockRawKeyValueIterator.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockReduceContext.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockReduceContextWrapper.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mapreduce/mock/MockReporter.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mock/MockInputSplit.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mock/MockOutputCollector.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/mock/MockReporter.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/testutil/ExtendedAssert.java hadoop-mapreduce1-project/src/contrib/mrunit/src/java/org/apache/hadoop/mrunit/types/Pair.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/AllTests.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/TestCounters.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/TestExample.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/TestMapDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/TestMapReduceDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/TestReduceDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/TestTestDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/AllTests.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/TestCounters.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mock/TestMockOutputCollector.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/mock/TestMockReporter.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/types/AllTests.java hadoop-mapreduce1-project/src/contrib/mrunit/src/test/org/apache/hadoop/mrunit/types/TestPair.java hadoop-mapreduce1-project/src/contrib/streaming/build.xml hadoop-mapreduce1-project/src/contrib/streaming/ivy.xml hadoop-mapreduce1-project/src/contrib/streaming/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/AutoInputFormat.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/DumpTypedBytes.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/Environment.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/HadoopStreaming.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/JarBuilder.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/LoadTypedBytes.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PathFinder.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeCombiner.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRunner.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapper.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeReducer.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamBaseRecordReader.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamInputFormat.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamKeyValUtil.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamXmlRecordReader.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/UTF8ByteArrayUtils.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/IdentifierResolver.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/InputWriter.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/OutputReader.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/RawBytesInputWriter.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/RawBytesOutputReader.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TextInputWriter.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TextOutputReader.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TypedBytesInputWriter.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/io/TypedBytesOutputReader.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/package.html hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/typedbytes/Type.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/typedbytes/TypedBytesInput.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/typedbytes/TypedBytesOutput.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/typedbytes/TypedBytesRecordInput.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/typedbytes/TypedBytesRecordOutput.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/typedbytes/TypedBytesWritable.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/typedbytes/TypedBytesWritableInput.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/typedbytes/TypedBytesWritableOutput.java hadoop-mapreduce1-project/src/contrib/streaming/src/java/org/apache/hadoop/typedbytes/package.html hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/FailApp.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/RawBytesMapApp.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/RawBytesReduceApp.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/StderrApp.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/StreamAggregate.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestAutoInputFormat.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestDumpTypedBytes.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestGzipInput.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestLoadTypedBytes.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleArchiveFiles.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestMultipleCachefiles.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestRawBytesStreaming.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamAggregate.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamDataProtocol.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamReduceNone.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamXmlRecordReader.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreaming.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingAsDifferentUser.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingCombiner.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingCounters.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingEmptyInpNonemptyOut.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingExitStatus.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingFailure.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingKeyValue.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingSeparator.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStderr.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingTaskLog.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestSymLink.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestTypedBytesStreaming.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TrApp.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TrAppReduce.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TypedBytesMapApp.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TypedBytesReduceApp.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/UlimitApp.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/UniqApp.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/UtilTest.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/streaming/ValueCountReduce.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/typedbytes/TestIO.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/org/apache/hadoop/typedbytes/TestTypedBytesWritable.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/system/org/apache/hadoop/mapred/TestLinuxTaskControllerOtherUserStreamingJob.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/system/org/apache/hadoop/mapred/TestStreamingJobProcessTree.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/system/org/apache/hadoop/mapred/TestTaskKillingOfStreamingJob.java hadoop-mapreduce1-project/src/contrib/streaming/src/test/system/scripts/ProcessTree.sh hadoop-mapreduce1-project/src/contrib/streaming/src/test/system/scripts/StreamMapper.sh hadoop-mapreduce1-project/src/contrib/test/core-site.xml hadoop-mapreduce1-project/src/contrib/test/hadoop-site.xml hadoop-mapreduce1-project/src/contrib/test/hdfs-site.xml hadoop-mapreduce1-project/src/contrib/test/mapred-site.xml hadoop-mapreduce1-project/src/contrib/thriftfs/README hadoop-mapreduce1-project/src/contrib/thriftfs/build.xml hadoop-mapreduce1-project/src/contrib/thriftfs/gen-cocoa/hadoopfs.h hadoop-mapreduce1-project/src/contrib/thriftfs/gen-cocoa/hadoopfs.m hadoop-mapreduce1-project/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem.cpp hadoop-mapreduce1-project/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem.h hadoop-mapreduce1-project/src/contrib/thriftfs/gen-cpp/ThriftHadoopFileSystem_server.skeleton.cpp hadoop-mapreduce1-project/src/contrib/thriftfs/gen-cpp/hadoopfs_constants.cpp hadoop-mapreduce1-project/src/contrib/thriftfs/gen-cpp/hadoopfs_constants.h hadoop-mapreduce1-project/src/contrib/thriftfs/gen-cpp/hadoopfs_types.cpp hadoop-mapreduce1-project/src/contrib/thriftfs/gen-cpp/hadoopfs_types.h hadoop-mapreduce1-project/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/BlockLocation.java hadoop-mapreduce1-project/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/FileStatus.java hadoop-mapreduce1-project/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/MalformedInputException.java hadoop-mapreduce1-project/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/Pathname.java hadoop-mapreduce1-project/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftHadoopFileSystem.java hadoop-mapreduce1-project/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftHandle.java hadoop-mapreduce1-project/src/contrib/thriftfs/gen-java/org/apache/hadoop/thriftfs/api/ThriftIOException.java hadoop-mapreduce1-project/src/contrib/thriftfs/gen-perl/Constants.pm hadoop-mapreduce1-project/src/contrib/thriftfs/gen-perl/ThriftHadoopFileSystem.pm hadoop-mapreduce1-project/src/contrib/thriftfs/gen-perl/Types.pm hadoop-mapreduce1-project/src/contrib/thriftfs/gen-php/ThriftHadoopFileSystem.php hadoop-mapreduce1-project/src/contrib/thriftfs/gen-php/hadoopfs_types.php hadoop-mapreduce1-project/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem-remote hadoop-mapreduce1-project/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem.py hadoop-mapreduce1-project/src/contrib/thriftfs/gen-py/hadoopfs/ThriftHadoopFileSystem.pyc hadoop-mapreduce1-project/src/contrib/thriftfs/gen-py/hadoopfs/__init__.py hadoop-mapreduce1-project/src/contrib/thriftfs/gen-py/hadoopfs/__init__.pyc hadoop-mapreduce1-project/src/contrib/thriftfs/gen-py/hadoopfs/constants.py hadoop-mapreduce1-project/src/contrib/thriftfs/gen-py/hadoopfs/ttypes.py hadoop-mapreduce1-project/src/contrib/thriftfs/gen-py/hadoopfs/ttypes.pyc hadoop-mapreduce1-project/src/contrib/thriftfs/gen-rb/ThriftHadoopFileSystem.rb hadoop-mapreduce1-project/src/contrib/thriftfs/gen-rb/hadoopfs_constants.rb hadoop-mapreduce1-project/src/contrib/thriftfs/gen-rb/hadoopfs_types.rb hadoop-mapreduce1-project/src/contrib/thriftfs/gen-st/hadoopfs.st hadoop-mapreduce1-project/src/contrib/thriftfs/if/hadoopfs.thrift hadoop-mapreduce1-project/src/contrib/thriftfs/ivy.xml hadoop-mapreduce1-project/src/contrib/thriftfs/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/thriftfs/lib/README hadoop-mapreduce1-project/src/contrib/thriftfs/lib/Thrift.LICENSE hadoop-mapreduce1-project/src/contrib/thriftfs/lib/hadoopthriftapi.jar hadoop-mapreduce1-project/src/contrib/thriftfs/lib/libthrift.jar hadoop-mapreduce1-project/src/contrib/thriftfs/scripts/hdfs.py hadoop-mapreduce1-project/src/contrib/thriftfs/scripts/start_thrift_server.sh hadoop-mapreduce1-project/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java hadoop-mapreduce1-project/src/contrib/thriftfs/test/org/apache/hadoop/thriftfs/TestThriftfs.java hadoop-mapreduce1-project/src/contrib/vaidya/build.xml hadoop-mapreduce1-project/src/contrib/vaidya/ivy.xml hadoop-mapreduce1-project/src/contrib/vaidya/ivy/libraries.properties hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/DiagnosticTest.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/JobDiagnoser.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/postexdiagnosis/PostExPerformanceDiagnoser.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/postexdiagnosis/tests/BalancedReducePartitioning.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/postexdiagnosis/tests/MapSideDiskSpill.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/postexdiagnosis/tests/MapsReExecutionImpact.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/postexdiagnosis/tests/ReadingHDFSFilesAsSideEffect.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/postexdiagnosis/tests/ReducesReExecutionImpact.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/postexdiagnosis/tests/postex_diagnosis_tests.xml hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/statistics/job/JobStatistics.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/statistics/job/JobStatisticsInterface.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/statistics/job/MapTaskStatistics.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/statistics/job/ReduceTaskStatistics.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/statistics/job/TaskStatistics.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/util/XMLUtils.java hadoop-mapreduce1-project/src/contrib/vaidya/src/java/org/apache/hadoop/vaidya/vaidya.sh hadoop-mapreduce1-project/src/docs/changes/ChangesFancyStyle.css hadoop-mapreduce1-project/src/docs/changes/ChangesSimpleStyle.css hadoop-mapreduce1-project/src/docs/changes/changes2html.pl hadoop-mapreduce1-project/src/docs/forrest.properties hadoop-mapreduce1-project/src/docs/releasenotes.html hadoop-mapreduce1-project/src/docs/src/documentation/README.txt hadoop-mapreduce1-project/src/docs/src/documentation/classes/CatalogManager.properties hadoop-mapreduce1-project/src/docs/src/documentation/conf/cli.xconf hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/Encrypted_Shuffle.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/HttpAuthentication.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/SLG_user_guide.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/Secure_Impersonation.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/cluster_setup.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/commands_manual.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/distcp.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/fair_scheduler.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/file_system_shell.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/gridmix.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/hadoop_archives.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/hdfs_design.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/hdfs_imageviewer.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/hdfs_permissions_guide.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/hdfs_quota_admin_guide.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/hod_scheduler.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/index.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/libhdfs.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/native_libraries.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/service_level_auth.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/single_node_setup.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/site.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/streaming.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/tabs.xml hadoop-mapreduce1-project/src/docs/src/documentation/content/xdocs/vaidya.xml hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/architecture.gif hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/core-logo.gif hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/favicon.ico hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/hadoop-logo-2.gif hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/hadoop-logo-big.jpg hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/hadoop-logo.jpg hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/hdfsarchitecture.gif hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/hdfsarchitecture.odg hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/hdfsarchitecture.png hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/hdfsdatanodes.gif hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/hdfsdatanodes.odg hadoop-mapreduce1-project/src/docs/src/documentation/resources/images/hdfsdatanodes.png hadoop-mapreduce1-project/src/docs/src/documentation/skinconf.xml hadoop-mapreduce1-project/src/docs/status.xml hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/AggregateWordCount.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/AggregateWordHistogram.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/DBCountPageView.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/ExampleDriver.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/Grep.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/Join.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/MultiFileWordCount.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/PiEstimator.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/RandomTextWriter.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/RandomWriter.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/SecondarySort.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/SleepJob.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/Sort.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/WordCount.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/dancing/DancingLinks.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/dancing/DistributedPentomino.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/dancing/OneSidedPentomino.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/dancing/Pentomino.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/dancing/Sudoku.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/dancing/package.html hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/dancing/puzzle1.dta hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/package.html hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/terasort/TeraGen.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/terasort/TeraInputFormat.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/terasort/TeraOutputFormat.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/terasort/TeraSort.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/terasort/TeraValidate.java hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/terasort/job_history_summary.py hadoop-mapreduce1-project/src/examples/org/apache/hadoop/examples/terasort/package.html hadoop-mapreduce1-project/src/examples/pipes/.autom4te.cfg hadoop-mapreduce1-project/src/examples/pipes/Makefile.am hadoop-mapreduce1-project/src/examples/pipes/README.txt hadoop-mapreduce1-project/src/examples/pipes/bootstrap.sh hadoop-mapreduce1-project/src/examples/pipes/conf/word-part.xml hadoop-mapreduce1-project/src/examples/pipes/conf/word.xml hadoop-mapreduce1-project/src/examples/pipes/configure.ac hadoop-mapreduce1-project/src/examples/pipes/impl/sort.cc hadoop-mapreduce1-project/src/examples/pipes/impl/wordcount-nopipe.cc hadoop-mapreduce1-project/src/examples/pipes/impl/wordcount-part.cc hadoop-mapreduce1-project/src/examples/pipes/impl/wordcount-simple.cc hadoop-mapreduce1-project/src/examples/python/WordCount.py hadoop-mapreduce1-project/src/examples/python/compile hadoop-mapreduce1-project/src/examples/python/pyAbacus/JyAbacusWCPlugIN.py hadoop-mapreduce1-project/src/examples/python/pyAbacus/JythonAbacus.py hadoop-mapreduce1-project/src/examples/python/pyAbacus/compile hadoop-mapreduce1-project/src/examples/python/pyAbacus/wordcountaggregator.spec hadoop-mapreduce1-project/src/fixFontsPath.sh hadoop-mapreduce1-project/src/mapred/mapred-default.xml hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/filecache/DistributedCache.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/filecache/TaskDistributedCacheManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/ACLsManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/AdminOperationsProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/AuditLogger.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/BasicTypeSorterBase.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/BufferSorter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Child.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/CleanupQueue.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Clock.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/ClusterStatus.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/CommitTaskAction.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/CompletedJobStatusStore.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/ConfiguredFailoverProxyProvider.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Counters.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/DefaultJobHistoryParser.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/DefaultTaskController.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/DisallowedTaskTrackerException.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/EagerTaskInitializationListener.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/FileAlreadyExistsException.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/FileInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/FileOutputCommitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/FileOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/FileSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/HAUtil.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/HeartbeatResponse.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/HistoryViewer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/ID.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/IFile.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/IFileInputStream.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/IFileOutputStream.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/IndexCache.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/InfoMap.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/InputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/InputSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/InterTrackerProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/InvalidFileTypeException.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/InvalidInputException.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/InvalidJobConfException.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/IsolationRunner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JSPUtil.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JTProtocols.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JVMId.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JettyBugMonitor.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobACLsManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobChangeEvent.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobClient.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobConf.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobConfigurable.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobContext.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobContextImpl.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobEndNotifier.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobHistory.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobID.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobInProgress.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobInProgressListener.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobInProgress_Counter.properties hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobInfo.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobLocalizer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobPriority.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobProfile.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobQueueClient.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobQueueInfo.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobQueueJobInProgressListener.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobQueueTaskScheduler.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobStatus.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobStatusChangeEvent.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobSubmissionProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTracker.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTrackerHADaemon.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTrackerHAHttpRedirector.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTrackerHAServiceProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTrackerHAServiceTarget.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTrackerInstrumentation.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTrackerMXBean.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTrackerMetricsInst.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTrackerPlugin.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTrackerProxies.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JobTrackerStatistics.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JvmContext.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JvmManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/JvmTask.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/KeyValueLineRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/KeyValueTextInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/KillJobAction.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/KillTaskAction.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/LaunchTaskAction.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/LimitTasksPerJobTaskScheduler.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/LineRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/LinuxTaskController.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/LocalJobRunner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MRConstants.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MapFileOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MapOutputFile.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MapReduceBase.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MapReducePolicyProvider.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MapRunnable.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MapRunner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MapTask.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MapTaskCompletionEventsUpdate.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MapTaskRunner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MapTaskStatus.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Mapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MergeSorter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Merger.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MultiFileInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/MultiFileSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/NetUtils2.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/NodeHealthCheckerService.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Operation.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/OutputCollector.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/OutputCommitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/OutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/OutputLogFilter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Partitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Queue.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/QueueAclsInfo.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/QueueManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/RamManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/RawKeyValueIterator.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/RecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/RecordWriter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/ReduceTask.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/ReduceTaskRunner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/ReduceTaskStatus.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Reducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/ReinitTrackerAction.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Reporter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/ResourceEstimator.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/RunningJob.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SequenceFileAsBinaryInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SequenceFileAsBinaryOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SequenceFileAsTextInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SequenceFileAsTextRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFilter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SequenceFileOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SequenceFileRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SkipBadRecords.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SortedRanges.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SpillRecord.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/SshFenceByTcpPort.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/StatisticsCollector.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/StreamPumper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TIPStatus.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Task.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskAttemptContext.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskAttemptContextImpl.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskAttemptID.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskCompletionEvent.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskController.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskGraphServlet.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskID.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskLog.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskLogAppender.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskLogServlet.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskLogsTruncater.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskMemoryManagerThread.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskReport.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskRunner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskScheduler.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskStatus.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskTracker.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskTrackerAction.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskTrackerInstrumentation.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskTrackerMXBean.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskTrackerManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskTrackerMetricsInst.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskTrackerStatus.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Task_Counter.properties hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TextInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/TextOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/UserLogCleaner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/Utils.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/jobcontrol/Job.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/jobcontrol/JobControl.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/jobcontrol/package.html hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/ArrayListBackedIterator.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/ComposableInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/ComposableRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/CompositeInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/CompositeInputSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/CompositeRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/InnerJoinRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/JoinRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/MultiFilterRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/OuterJoinRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/OverrideRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/Parser.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/ResetableIterator.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/StreamBackedIterator.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/TupleWritable.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/WrappedRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/join/package.html hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/BinaryPartitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/Chain.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/ChainMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/ChainReducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/CombineFileInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/CombineFileRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/CombineFileSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/DelegatingInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/DelegatingMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/FieldSelectionMapReduce.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/HashPartitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/IdentityMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/IdentityReducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/InputSampler.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/InverseMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/KeyFieldBasedComparator.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/KeyFieldBasedPartitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/KeyFieldHelper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/LongSumReducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/MultipleInputs.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/MultipleOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/MultipleOutputs.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/MultipleSequenceFileOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/MultipleTextOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/NLineInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/NullOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/RegexMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/TaggedInputSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/TokenCountMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/DoubleValueSum.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/LongValueMax.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/LongValueMin.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/LongValueSum.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/StringValueMax.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/StringValueMin.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/UniqValueCount.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/UserDefinedValueAggregatorDescriptor.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/ValueAggregator.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorBaseDescriptor.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorCombiner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorDescriptor.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJob.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJobBase.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorReducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/ValueHistogram.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/aggregate/package.html hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/db/DBConfiguration.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/db/DBInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/db/DBOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/db/DBWritable.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/db/package.html hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/lib/package.html hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/package.html hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/Application.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/BinaryProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/DownwardProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/OutputHandler.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/PipesMapRunner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/PipesNonJavaInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/PipesPartitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/PipesReducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/Submitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/UpwardProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/pipes/package.html hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/tools/GetGroups.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/tools/MRAdmin.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/tools/MRHAAdmin.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapred/tools/MRZKFailoverController.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/Cluster.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/ClusterMetrics.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/ContextFactory.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/Counter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/CounterGroup.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/Counters.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/FileSystemCounter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/FileSystemCounter.properties hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/ID.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/InputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/InputSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/Job.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/JobACL.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/JobContext.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/JobCounter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/JobCounter.properties hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/JobID.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/JobStatus.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/JobSubmissionFiles.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/MRJobConfig.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/MapContext.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/Mapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/OutputCommitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/OutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/Partitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/RecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/RecordWriter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/ReduceContext.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/Reducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/StatusReporter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/TaskAttemptContext.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/TaskAttemptID.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/TaskCounter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/TaskCounter.properties hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/TaskID.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/TaskInputOutputContext.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/TaskType.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/AbstractCounter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/AbstractCounterGroup.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/AbstractCounters.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/CounterGroupBase.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/CounterGroupFactory.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/FileSystemCounterGroup.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/FrameworkCounterGroup.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/GenericCounter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/LimitExceededException.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/Limits.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/counters/package-info.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/BigDecimalSplitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/BooleanSplitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBConfiguration.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBSplitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBWritable.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/DataDrivenDBInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/DataDrivenDBRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/DateSplitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/FloatSplitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/IntegerSplitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDataDrivenDBInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDataDrivenDBRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDateSplitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/TextSplitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/db/package.html hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionHelper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionReducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormatCounter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/InvalidInputException.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/KeyValueLineRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/KeyValueTextInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/LineRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/MultipleInputs.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/NLineInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsBinaryInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsTextInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsTextRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileInputFilter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileRecordReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/TaggedInputSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/input/TextInputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/ControlledJob.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/JobControl.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/package.html hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/map/InverseMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/map/MultithreadedMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/map/RegexMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/map/TokenCounterMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/map/WrappedMapper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/FileOutputFormatCounter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/FilterOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/LazyOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/MapFileOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/NullOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/SequenceFileAsBinaryOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/SequenceFileOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/output/TextOutputFormat.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/partition/BinaryPartitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/partition/HashPartitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedPartitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldHelper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/reduce/IntSumReducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/reduce/LongSumReducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/lib/reduce/WrappedReducer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/security/TokenCache.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/security/token/JobTokenIdentifier.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/security/token/JobTokenSecretManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/security/token/JobTokenSelector.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenIdentifier.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSecretManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSelector.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/server/jobtracker/JobTrackerJspHelper.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/server/jobtracker/TaskTracker.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/JVMInfo.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/userlogs/DeleteJobEvent.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/userlogs/JobCompletedEvent.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/userlogs/JobStartedEvent.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/userlogs/JvmFinishedEvent.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/userlogs/UserLogEvent.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/server/tasktracker/userlogs/UserLogManager.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/split/JobSplit.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/split/JobSplitWriter.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/split/SplitMetaInfoReader.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/task/JobContextImpl.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/task/MapContextImpl.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/task/TaskAttemptContextImpl.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/task/TaskInputOutputContextImpl.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/util/CountersStrings.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mapreduce/util/ResourceBundles.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mr1security/RefreshUserMappingsProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mr1security/authorize/RefreshAuthorizationPolicyProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mr1tools/GetGroupsBase.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/mr1tools/GetUserMappingsProtocol.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/util/LinuxResourceCalculatorPlugin.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/util/MRAsyncDiskService.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/util/MemoryCalculatorPlugin.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/util/PluginDispatcher.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/util/ProcessTree.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/util/ProcfsBasedProcessTree.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/util/ResourceCalculatorPlugin.java hadoop-mapreduce1-project/src/mapred/org/apache/hadoop/util/SingleArgumentRunnable.java hadoop-mapreduce1-project/src/native/.autom4te.cfg hadoop-mapreduce1-project/src/native/AUTHORS hadoop-mapreduce1-project/src/native/COPYING hadoop-mapreduce1-project/src/native/ChangeLog hadoop-mapreduce1-project/src/native/Makefile.am hadoop-mapreduce1-project/src/native/NEWS hadoop-mapreduce1-project/src/native/README hadoop-mapreduce1-project/src/native/acinclude.m4 hadoop-mapreduce1-project/src/native/bootstrap.sh hadoop-mapreduce1-project/src/native/config/config.guess hadoop-mapreduce1-project/src/native/configure.ac hadoop-mapreduce1-project/src/native/lib/Makefile.am hadoop-mapreduce1-project/src/native/packageNativeHadoop.sh hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/compress/snappy/Makefile.am hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/compress/snappy/org_apache_hadoop_io_compress_snappy.h hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.am hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/compress/zlib/org_apache_hadoop_io_compress_zlib.h hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/nativeio/Makefile.am hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/nativeio/Makefile.in hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/nativeio/errno_enum.c hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/nativeio/errno_enum.h hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/nativeio/file_descriptor.c hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/io/nativeio/file_descriptor.h hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/security/Makefile.am hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/security/Makefile.in hadoop-mapreduce1-project/src/native/src/org/apache/hadoop/security/getGroup.c hadoop-mapreduce1-project/src/native/src/org_apache_hadoop.h hadoop-mapreduce1-project/src/saveVersion.sh hadoop-mapreduce1-project/src/test/META-INF/services/org.apache.hadoop.security.token.TokenRenewer hadoop-mapreduce1-project/src/test/all-tests hadoop-mapreduce1-project/src/test/aop/build/aop.xml hadoop-mapreduce1-project/src/test/aop/org/apache/hadoop/fi/FiConfig.java hadoop-mapreduce1-project/src/test/aop/org/apache/hadoop/fi/ProbabilityModel.java hadoop-mapreduce1-project/src/test/bin/test-patch.sh hadoop-mapreduce1-project/src/test/checkstyle-noframes-sorted.xsl hadoop-mapreduce1-project/src/test/checkstyle.xml hadoop-mapreduce1-project/src/test/commit-tests hadoop-mapreduce1-project/src/test/core-site.xml hadoop-mapreduce1-project/src/test/ddl/buffer.jr hadoop-mapreduce1-project/src/test/ddl/int.jr hadoop-mapreduce1-project/src/test/ddl/string.jr hadoop-mapreduce1-project/src/test/ddl/test.jr hadoop-mapreduce1-project/src/test/fi-site.xml hadoop-mapreduce1-project/src/test/findbugsExcludeFile.xml hadoop-mapreduce1-project/src/test/hadoop-policy.xml hadoop-mapreduce1-project/src/test/hadoop-site.xml hadoop-mapreduce1-project/src/test/hdfs-site.xml hadoop-mapreduce1-project/src/test/krb5.conf hadoop-mapreduce1-project/src/test/lib/ftplet-api-1.0.0-SNAPSHOT.jar hadoop-mapreduce1-project/src/test/lib/ftpserver-core-1.0.0-SNAPSHOT.jar hadoop-mapreduce1-project/src/test/lib/ftpserver-server-1.0.0-SNAPSHOT.jar hadoop-mapreduce1-project/src/test/lib/mina-core-2.0.0-M2-20080407.124109-12.jar hadoop-mapreduce1-project/src/test/log4j.properties hadoop-mapreduce1-project/src/test/mapred-site.xml hadoop-mapreduce1-project/src/test/org/apache/hadoop/conf/TestJobConf.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/conf/TestNoDefaultsJobConf.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/filecache/TestMRWithDistributedCache.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/filecache/TestTrackerDistributedCacheManager.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/fs/AccumulatingReducer.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/fs/DFSCIOTest.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/fs/DistributedFSCheck.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/fs/IOMapperBase.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/fs/TestCopyFiles.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/fs/TestDFSIO.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/fs/TestFileSystem.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/fs/TestHarFileSystemWithHA.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/ha/TestMapredSshFenceByTcpPort.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/hdfs/NNBench.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/hdfs/NNBenchWithoutMR.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/io/FileBench.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/io/TestSequenceFileMergeProgress.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/BigMapOutput.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/ClusterMapReduceTestCase.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/ClusterWithLinuxTaskController.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/ControlledMapReduceJob.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/DummyMemoryCalculatorPlugin.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/EmptyInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/FakeObjectUtilities.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/GenericMRLoadGenerator.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/HadoopTestCase.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/MRBench.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/MRCaching.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/MiniMRCluster.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/MiniMRHACluster.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/NotificationTestCase.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/ReliabilityTest.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/SortValidator.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestAdminOperationsProtocolWithServiceAuthorization.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestAuditLogger.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestBadRecords.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestClusterMRNotification.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestClusterStatus.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestCollect.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestCommandLineJobSubmission.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestComparators.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestCompressedEmptyMapOutputs.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestControlledMapReduceJob.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestCounters.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestCustomOutputCommitter.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestDiskFailures.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestDuplicateArchiveFileCachedURL.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestDuplicateArchiveFileCachedURLMinicluster.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestEmptyJob.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestFieldSelection.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestFileInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestFileOutputCommitter.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestFileOutputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestGetSplitHosts.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestHADelegationToken.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestHAStateTransitionFailure.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestHAStateTransitions.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestHAStress.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestHAUtil.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestHAWebUI.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestIFile.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestIFileStreams.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestIndexCache.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestInputPath.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestIsolationRunner.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJavaSerialization.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJettyBugMonitor.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobACLs.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobCleanup.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobClient.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobCounters.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobDirCleanup.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobExecutionAsDifferentUser.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobHistory.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobHistoryConfig.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobHistoryParsing.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobHistoryVersion.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobInProgress.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobInProgressListener.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobKillAndFail.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobName.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobQueueInformation.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobQueueTaskScheduler.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobRetire.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobStatusPersistency.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobSysDirWithDFS.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobTrackerHAServiceProtocol.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobTrackerHealthCheck.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobTrackerInstrumentation.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobTrackerRestart.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobTrackerRestartWithLostTracker.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobTrackerStart.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJobTrackerXmlJsp.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJvmManager.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestJvmReuse.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestKillCompletedJob.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestKillSubProcesses.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestKillSubProcessesWithLinuxTaskController.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestLRUCache.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestLimitTasksPerJobTaskScheduler.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestLineRecordReader.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestLinuxTaskController.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestLocalMRNotification.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestLocalModeWithNewApis.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestLocalizationWithLinuxTaskController.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestLostTracker.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMRServerPorts.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMRZKFailoverController.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMapCollection.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMapOutputType.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMapRed.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMapredHeartbeat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMapredSystemDir.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMiniMRBringup.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMiniMRChildTask.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMiniMRDFSCaching.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMiniMRDFSSort.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMiniMRLocalFS.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFSWithDistinctUsers.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMultiFileInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMultiFileSplit.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMultipleLevelCaching.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestMultipleTextOutputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestNodeBlacklisting.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestNodeHealthService.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestNodeRefresh.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestNonLocalJobJarSubmission.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestParallelInitialization.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestQueueAclsForCurrentUser.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestQueueManager.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndJobPriority.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestQueueManagerForJobKillAndNonDefaultQueue.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestRecoveryManager.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestReduceFetch.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestReduceTask.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestReduceTaskFetchFail.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestResourceEstimation.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestSetupAndCleanupFailure.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestSetupWorkDir.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestShuffleJobToken.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestSortedRanges.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestStatisticsCollector.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestSubmitJob.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTTResourceReporting.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskChildOptsParsing.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskClasspathPrecedence.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskCommit.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskFail.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskLauncher.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskLimits.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskLogServlet.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskLogsTruncater.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskOutputSize.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskRunner.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskStatus.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskTrackerDirectories.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskTrackerInstrumentation.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskTrackerLocalization.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskTrackerLogIndex.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskTrackerMemoryManager.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTaskTrackerVersionCheck.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTextInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTextOutputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTrackerBlacklistAcrossJobs.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestTrackerDistributedCacheManagerWithLinuxTaskController.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestUserDefinedCounters.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestUserLogCleanup.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestUserlogsRetentionAcrossRestarts.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestWebUIAuthorization.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/TestWritableJobConf.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/ThreadedMapBenchmark.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/UtilsForTests.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/WordCount.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/jobcontrol/TestJobControl.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/jobcontrol/TestLocalJobControl.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/join/IncomparableKey.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/join/TestDatamerge.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/join/TestTupleWritable.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestChainMapReduce.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestCombineFileInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestDelegatingInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestKeyFieldBasedComparator.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestKeyFieldBasedPartitioner.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestKeyFieldHelper.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestLineInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestMultipleInputs.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestMultipleOutputs.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestMultithreadedMapRunner.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/TestTotalOrderPartitioner.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/aggregate/AggregatorTests.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/db/TestConstructQuery.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/lib/db/TestDBJob.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/pipes/TestPipes.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/pipes/TestPipesAsDifferentUser.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/pipes/WordCountInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/test.jar hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/test.tar hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/test.tar.gz hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/test.tgz hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/test.txt hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/test.zip hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/testscript.txt hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapred/tools/TestGetMapReduceGroups.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/MapReduceTestUtil.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/TestChild.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/TestCounters.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/TestMRJobClient.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/TestMapReduceLazyOutput.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/TestMapReduceLocal.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/TestTaskContext.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/db/TestDBOutputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/db/TestIntegerSplitter.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/db/TestTextSplitter.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/fieldsel/TestMRFieldSelection.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestDelegatingInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestFileInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestLineRecordReader.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestMRKeyValueTextInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsBinaryInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsTextInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileInputFilter.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestMultipleInputs.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/input/TestNLineInputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControl.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/map/TestMultithreadedMapper.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/output/TestJobOutputCommitter.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/output/TestMRMultipleOutputs.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/output/TestMultipleOutputs.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/partition/TestBinaryPartitioner.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/partition/TestInputSampler.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/partition/TestKeyFieldHelper.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedPartitioner.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/security/TestEncryptedShuffle.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/security/TestTokenCache.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/security/token/TestDelegationTokenRenewal.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/security/token/delegation/TestDelegationToken.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/security/token/delegation/TestDelegationTokenAuthMethod.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/mapreduce/util/TestMRAsyncDiskService.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/record/TestRecordMR.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/record/TestRecordWritable.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/security/TestMapredGroupMappingServiceRefresh.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/security/authorize/HadoopPolicyProvider.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/test/AllTestDriver.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/test/MiniHadoopClusterManager.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/tools/TestDistCh.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/tools/rumen/TestZombieJob.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/util/DummyResourceCalculatorPlugin.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/util/TestLinuxResourceCalculatorPlugin.java hadoop-mapreduce1-project/src/test/org/apache/hadoop/util/TestProcfsBasedProcessTree.java hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/hdfs/HDFSPolicyProviderAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/hdfs/server/datanode/DataNodeAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/hdfs/server/namenode/NameNodeAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/mapred/JTProtocolAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/mapred/JobClientAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/mapred/JobInProgressAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/mapred/JobTrackerAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/mapred/MapReducePolicyProviderAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/mapred/StatisticsCollectorAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/mapred/TaskAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/mapred/TaskTrackerAspect.aj hadoop-mapreduce1-project/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj hadoop-mapreduce1-project/src/test/system/c++/runAs/Makefile.in hadoop-mapreduce1-project/src/test/system/c++/runAs/configure hadoop-mapreduce1-project/src/test/system/c++/runAs/configure.ac hadoop-mapreduce1-project/src/test/system/c++/runAs/main.c hadoop-mapreduce1-project/src/test/system/c++/runAs/runAs.c hadoop-mapreduce1-project/src/test/system/c++/runAs/runAs.h.in hadoop-mapreduce1-project/src/test/system/conf/hadoop-policy-system-test.xml hadoop-mapreduce1-project/src/test/system/conf/system-test.xml hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/hdfs/TestHL040.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/hdfs/test/system/DNClient.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/hdfs/test/system/DNProtocol.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/hdfs/test/system/HDFSCluster.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/hdfs/test/system/HDFSDaemonClient.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/hdfs/test/system/NNClient.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/hdfs/test/system/NNProtocol.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/HealthScriptHelper.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/HighRamJobHelper.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/JobInfoImpl.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TTInfoImpl.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TTTaskInfoImpl.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TaskInfoImpl.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestCMExceptionDuringRunJob.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestCacheFileReferenceCount.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfMemoryExceedsTask.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestChildsKillingOfSuspendTask.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestCluster.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestControlledJob.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestCorruptedDiskJob.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheModifiedFile.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCachePrivateFile.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestDistributedCacheUnModifiedFile.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestFileOwner.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestHealthScriptError.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestHealthScriptPathError.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestHealthScriptTimeout.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestHiRamJobWithBlackListTT.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestJobCacheDirectoriesCleanUp.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestJobHistoryLocation.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestJobKill.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestJobSummary.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestLinuxTaskControllerOtherUser.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestLostTaskTracker.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestNodeDecommissioning.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestPushConfig.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestRetiredJobs.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestSortValidate.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestTaskChildsKilling.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestTaskController.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestTaskKilling.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestTaskOwner.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestTaskTrackerInfoSuccessfulFailedJobs.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapred/TestTaskTrackerInfoTTProcess.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/FinishTaskControlAction.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTProtocol.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JobInfo.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRCluster.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRDaemonClient.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTInfo.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTProtocol.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTTaskInfo.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TaskInfo.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonClient.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/test/system/ControlAction.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/test/system/DaemonProtocol.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/test/system/ProcessInfo.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/test/system/ProcessInfoImpl.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/test/system/process/ClusterProcessManager.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/test/system/process/HadoopDaemonRemoteCluster.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/test/system/process/MultiUserHadoopDaemonRemoteCluster.java hadoop-mapreduce1-project/src/test/system/java/org/apache/hadoop/test/system/process/RemoteProcess.java hadoop-mapreduce1-project/src/test/system/java/shared/org/apache/hadoop/common/RemoteExecution.java hadoop-mapreduce1-project/src/test/system/java/shared/org/apache/hadoop/mapred/StatisticsCollectionHandler.java hadoop-mapreduce1-project/src/test/system/scripts/healthScriptError hadoop-mapreduce1-project/src/test/system/scripts/healthScriptTimeout hadoop-mapreduce1-project/src/test/system/scripts/pushConfig.sh hadoop-mapreduce1-project/src/test/test-webapps/static/test.css hadoop-mapreduce1-project/src/test/test-webapps/test/testjsp.jsp hadoop-mapreduce1-project/src/test/testjar/ClassWordCount.java hadoop-mapreduce1-project/src/test/testjar/CustomOutputCommitter.java hadoop-mapreduce1-project/src/test/testjar/ExternalMapperReducer.java hadoop-mapreduce1-project/src/test/testjar/ExternalWritable.java hadoop-mapreduce1-project/src/test/testjar/GenerateTaskChildProcess.java hadoop-mapreduce1-project/src/test/testjar/JobKillCommitter.java hadoop-mapreduce1-project/src/test/testjar/UserNamePermission.java hadoop-mapreduce1-project/src/test/testshell/ExternalMapReduce.java hadoop-mapreduce1-project/src/test/tools/data/rumen/histogram-tests/gold-minimal.json hadoop-mapreduce1-project/src/test/tools/data/rumen/histogram-tests/gold-one-value-many-repeats.json hadoop-mapreduce1-project/src/test/tools/data/rumen/histogram-tests/gold-only-one-value.json hadoop-mapreduce1-project/src/test/tools/data/rumen/histogram-tests/gold-three-values.json hadoop-mapreduce1-project/src/test/tools/data/rumen/histogram-tests/input-minimal.json hadoop-mapreduce1-project/src/test/tools/data/rumen/histogram-tests/input-one-value-many-repeats.json hadoop-mapreduce1-project/src/test/tools/data/rumen/histogram-tests/input-only-one-value.json hadoop-mapreduce1-project/src/test/tools/data/rumen/histogram-tests/input-three-values.json hadoop-mapreduce1-project/src/test/tools/data/rumen/small-trace-test/job-tracker-logs-topology-output hadoop-mapreduce1-project/src/test/tools/data/rumen/small-trace-test/job-tracker-logs-trace-output.gz hadoop-mapreduce1-project/src/test/tools/data/rumen/small-trace-test/sample-job-tracker-logs.gz hadoop-mapreduce1-project/src/test/tools/data/rumen/small-trace-test/truncated-job-tracker-log hadoop-mapreduce1-project/src/test/tools/data/rumen/small-trace-test/truncated-topology-output hadoop-mapreduce1-project/src/test/tools/data/rumen/small-trace-test/truncated-trace-output hadoop-mapreduce1-project/src/test/tools/data/rumen/zombie/input-topology.json hadoop-mapreduce1-project/src/test/tools/data/rumen/zombie/input-trace.json hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/DistCh.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/DistCp.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/DistCp_Counter.properties hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/DistTool.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/HadoopArchives.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/Logalyzer.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/AbstractClusterStory.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/CDFPiecewiseLinearRandomGenerator.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/CDFRandomGenerator.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/ClusterStory.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/ClusterTopologyReader.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/DeepCompare.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/DeepInequalityException.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/HadoopLogsAnalyzer.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/Histogram.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/JobStory.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/JobStoryProducer.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/JobTraceReader.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/JsonObjectMapperParser.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/LogRecordType.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/LoggedDiscreteCDF.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/LoggedJob.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/LoggedLocation.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/LoggedNetworkTopology.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/LoggedSingleRelativeRanking.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTask.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/MachineNode.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/MapTaskAttemptInfo.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/Node.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/Pair.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/ParsedConfigFile.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/ParsedHost.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/ParsedLine.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/Pre21JobHistoryConstants.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/RackNode.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/ReduceTaskAttemptInfo.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/TaskAttemptInfo.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/TaskInfo.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/TreePath.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/ZombieCluster.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/ZombieJob.java hadoop-mapreduce1-project/src/tools/org/apache/hadoop/tools/rumen/ZombieJobProducer.java hadoop-mapreduce1-project/src/webapps/job/analysejobhistory.jsp hadoop-mapreduce1-project/src/webapps/job/index.html hadoop-mapreduce1-project/src/webapps/job/job_authorization_error.jsp hadoop-mapreduce1-project/src/webapps/job/jobblacklistedtrackers.jsp hadoop-mapreduce1-project/src/webapps/job/jobconf.jsp hadoop-mapreduce1-project/src/webapps/job/jobconf_history.jsp hadoop-mapreduce1-project/src/webapps/job/jobdetails.jsp hadoop-mapreduce1-project/src/webapps/job/jobdetailshistory.jsp hadoop-mapreduce1-project/src/webapps/job/jobfailures.jsp hadoop-mapreduce1-project/src/webapps/job/jobhistory.jsp hadoop-mapreduce1-project/src/webapps/job/jobqueue_details.jsp hadoop-mapreduce1-project/src/webapps/job/jobtasks.jsp hadoop-mapreduce1-project/src/webapps/job/jobtaskshistory.jsp hadoop-mapreduce1-project/src/webapps/job/jobtracker.jsp hadoop-mapreduce1-project/src/webapps/job/jobtracker.jspx hadoop-mapreduce1-project/src/webapps/job/loadhistory.jsp hadoop-mapreduce1-project/src/webapps/job/machines.jsp hadoop-mapreduce1-project/src/webapps/job/taskdetails.jsp hadoop-mapreduce1-project/src/webapps/job/taskdetailshistory.jsp hadoop-mapreduce1-project/src/webapps/job/taskstats.jsp hadoop-mapreduce1-project/src/webapps/job/taskstatshistory.jsp hadoop-mapreduce1-project/src/webapps/static/hadoop-logo.jpg hadoop-mapreduce1-project/src/webapps/static/hadoop.css hadoop-mapreduce1-project/src/webapps/static/images/favicon.ico hadoop-mapreduce1-project/src/webapps/static/jobconf.xsl hadoop-mapreduce1-project/src/webapps/static/jobtracker.js hadoop-mapreduce1-project/src/webapps/static/sorttable.js hadoop-mapreduce1-project/src/webapps/task/index.html hadoop-mapreduce1-project/src/webapps/task/tasktracker.jsp commit 4c6c1c4edb550ddda8abb6157afda91492b81fa8 Author: Karthik Kambatla Date: Thu Jun 13 19:38:40 2013 -0700 CLOUDERA-BUILD. Revert "HADOOP-8912. Merging changes 1397437 and 1397438 from trunk" This reverts commit 59e991d12389b1a171960bd8c402ba0f89dfa1a0. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt Conflicts: .gitattributes (cherry picked from commit e409e38df1b438ea75f5e11a3578ab1c82eef66b) (cherry picked from commit 6b6c347b0b4f30afa7cbed53ab773bda06ae53d0) commit eb0cc244d95c97cdc3a56f5f4b02919ef4d49587 Author: Andrew Bayer Date: Fri Feb 14 16:07:35 2014 -0800 CLOUDERA-BUILD. Removing upstream Maven deployment repos (cherry picked from commit ad6e9c9946e9374c23ccc3bdc6a63aa7dfed6f16) (cherry picked from commit 9ae46da65a66bbd0fa0b3fcaaa971e5062e2ddee) commit 269aaab2d54841f1a7b4fcfbf7fce51bf7657c93 Author: Robert Kanter Date: Mon Sep 23 16:28:29 2013 -0700 CLOUDERA-BUILD. Targeting Java 6 by default (CDH-14356) (cherry picked from commit e905cc51c83325f069aa5722894a940de06c3ec7) (cherry picked from commit f2885d9272139372e56781603c2eee91bf8df78c) (cherry picked from commit 2c5a4330ffb9347d13c8a2de6e9f1af26dfdd80a) commit 35cd569ceb9f6572aa8bf00698fc8bd176ae5c09 Author: Robert Kanter Date: Thu Sep 19 17:55:34 2013 -0700 CLOUDERA-BUILD. Targeting Java 7 by default (CDH-14356) (cherry picked from commit c9e514d40c9e2c2109172ba25b80cde9400bd377) Conflicts: pom.xml (cherry picked from commit a75a50248ac08edb21f244dfc5276515b3d8e1b8) (cherry picked from commit 417f70096ac3c7ef2157b74b5b15c837491bb3ca) commit dd160c1211da733e6ae25e62321659e8724cf0aa Author: Alejandro Abdelnur Date: Wed Apr 17 15:27:34 2013 -0700 CLOUDERA-BUILD. Add changes to hadoop build to specify JDK1.7 as target (cherry picked from commit 2564488ef8ac30c5edeb8706d0bd13ff145f6e33) (cherry picked from commit 269c2ad6f2116530d408ec9ae2aaff54d303a1a1) Conflicts: pom.xml (cherry picked from commit be5d9b4c0dede984aced37beac3083cff2dcd0c5) (cherry picked from commit a605dacffe4caea26552b9937a9a64cc3a853570) commit bd6fe9ae845153385d503d12499a88e0ab7a2e5f Author: Alejandro Abdelnur Date: Fri Mar 15 11:10:42 2013 -0700 CLOUDERA-BUILD. add safety check to Hadoop build build to ensure the right JDK is being used (cherry picked from commit 3d9e98821e6bbc6e351b5e0997a3766fa4b8fb58) Conflicts: pom.xml (cherry picked from commit 4e7483098ff30a9f9ed9554b73076a3c5ea0179e) Conflicts: pom.xml (cherry picked from commit e9237b71efa28dec5395aa780977a93368eb983c) (cherry picked from commit ce8df473333dac2e928ff49f5212243ed24b52e9) commit d80d1f1a48ddedc445970b13b6638325df031388 Author: Andrew Wang Date: Mon Jan 20 12:00:17 2014 -0800 CLOUDERA-BUILD. Use the CDH Tomcat version in HttpFS pom.xml. (cherry picked from commit a079ed5a9acb70b29f666d936ec1b660e51758d6) (cherry picked from commit d23ae5cc8462bec859f6cc14ddf70b67eb7a3906) (cherry picked from commit 2381c944a9b52774edb6701afe06296cb23877e1) commit 6f49f235ff29bd9b7c50687fdf4ce125b4665f4b Author: Tom White Date: Fri Dec 13 14:18:58 2013 +0000 CLOUDERA-BUILD. Use common CDH version of Avro. (cherry picked from commit bc06e2543a828201f410a807ee88fea9f089ec4a) (cherry picked from commit bf1ab18dad7c4f6f523912b3e0697a89a6c48df7) (cherry picked from commit 39e6f8384ad615c667d3dfa14f016a84316ae554) commit 613e65294cdbbbdd3dd5155f145fc99ed5cf4ae8 Author: Alejandro Abdelnur Date: Mon Sep 9 17:22:48 2013 +0200 CLOUDERA-BUILD. Use slf4j version from CDH root (cherry picked from commit a52090bb9381fff42b4d360496f7dcdf07444356) (cherry picked from commit 368867927e39909209d97b81989488596cbba539) (cherry picked from commit b494f26ccb0b95c3401fa87600caafb086f6c6a1) commit 24d05a5e0917177e6153fc8a57c443e65728add7 Author: Alejandro Abdelnur Date: Tue Aug 27 17:23:59 2013 +0200 CLOUDERA-BUILD. Use cdh.protobuf.version variable to specify the version of protobuf/protoc to use (cherry picked from commit 76571165ee0d3cec98f19acb488ad164e9d1af14) (cherry picked from commit 4db3c1e2e4b1ff00ef4d2d9359c0e834a290b706) (cherry picked from commit a1f699dd662b212d25785b5ee85c643f78a32f09) commit f50465797841807b940ca8effed0ef86c629fac8 Author: Alejandro Abdelnur Date: Mon Aug 26 23:11:14 2013 +0200 CLOUDERA-BUILD. Change env variable for protoc to be CDH5 specific (cherry picked from commit bb30321ad5867b51b0fa7f2419f98e951a44fa3c) (cherry picked from commit e9e6f3994bc6b62ed7f356d7c91dc1c4521247c5) Conflicts: hadoop-project/pom.xml (cherry picked from commit ccc85ee27479b23f5f04ef2671685a7ee75fee22) commit 52a7975be9fb297af1794a3900f18f45437f9095 Author: Sandy Ryza Date: Fri Jun 21 16:35:24 2013 -0700 CLOUDERA-BUILD. Set the Fair Scheduler as the default scheduler. (cherry picked from commit 2608afcdbb6efa3bbf496c2b70a7e2ccde4dd0ba) (cherry picked from commit 30f7dad019e7de2b974360de97a9e841ea5663cc) (cherry picked from commit e55941cca0971855b19a0d42c0ec510d4d464027) commit 29f4d811c9396499ca0989cdc2b3225dc74c4e2c Author: Juan Yu Date: Mon Aug 18 11:14:08 2014 -0700 CLOUDERA-BUILD. Update poms for 5.2.0 - version: 2.5.0-cdh5.2.0-SNAPSHOT (cherry picked from commit 304158bf580d9389be102e0788d2115aebed7f75) Conflicts: hadoop-mapreduce1-project/build.xml hadoop-mapreduce1-project/cloudera-pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-client/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-core/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-examples/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-minicluster/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-mrunit/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-streaming/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-tarball/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-test/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/hadoop-tools/pom.xml hadoop-mapreduce1-project/cloudera/maven-packaging/pom.xml hadoop-mapreduce1-project/ivy/libraries.properties