Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,834 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

1637 Commits

Author SHA1 Message Date
Arpit Agarwal e6d729c27c HADOOP-6350: Merging r1602324 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602325 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 02:56:47 +00:00
Karthik Kambatla c43ab7f08e YARN-2155. FairScheduler: Incorrect threshold check for preemption. (Wei Yan via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602297 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 21:26:39 +00:00
Andrew Wang 35eeacc122 HDFS-6460. Ignore stale and decommissioned nodes in NetworkTopology#sortByDistance. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602287 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 20:45:52 +00:00
Chris Nauroth 7b1c468b43 HADOOP-10561. Merging change r1602225 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602229 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 16:58:40 +00:00
Uma Maheswara Rao G d59ca5c4e1 Merged from trunk to branch-2. HDFS-6375. Listing extended attributes with the search permission. Contributed by Charles Lamb 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602133 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 12:02:57 +00:00
Zhijie Shen 48520b43ff YARN-2075. Fixed the test failure of TestRMAdminCLI. Contributed by Kenji Kikushima. 
svn merge --ignore-ancestry -c 1602071 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602073 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 06:48:49 +00:00
Arpit Agarwal 8314818b6f HADOOP-10376: Merging r1602055 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602057 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 01:43:01 +00:00
Alejandro Abdelnur cbec85322f HDFS-6379. HTTPFS - Implement ACLs support. (yoderme via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602042 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 22:40:15 +00:00
Jason Darrell Lowe 128519958f svn merge -c 1602033 FIXES: HADOOP-10622. Shell.runCommand can deadlock. Contributed by Gera Shegalov 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602034 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 22:06:12 +00:00
Uma Maheswara Rao G 6eb03a41cb Merge HDFS-2006 HDFS XAttrs feature from Trunk to Branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601992 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 19:25:17 +00:00
Brandon Li e5dadff1b7 HADOOP-10656. Merging change r1601985 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601986 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 18:58:44 +00:00
Chris Nauroth 74a6db7b27 HADOOP-9555. Merging change r1601709 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601713 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 18:05:22 +00:00
Aaron Myers d156c785a6 HADOOP-10664. TestNetUtils.testNormalizeHostName fails. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601483 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-09 19:03:37 +00:00
Aaron Myers d3473f1e20 HADOOP-9099. NetUtils.normalizeHostName fails on domains where UnknownHost resolves to an IP address. Contributed by Ivan Mitic. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601479 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-09 18:59:53 +00:00
Steve Loughran d7f5d6795c HADOOP-10647. String Format Exception in SwiftNativeFileSystemStore.java. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600970 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-06 17:59:37 +00:00
Andrew Wang 45847e8df1 Addendum for common changes in HDFS-6268 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599846 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-04 01:08:02 +00:00
Andrew Wang bb87b70e37 Revert bad HDFS-6268 commit from branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599807 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 22:06:11 +00:00
Andrew Wang 2088225632 HDFS-6268. Merged from r1599734. Better sorting in NetworkTopology#pseudoSortByDistance when no local node is found. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599737 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 18:33:51 +00:00
Aaron Myers 53a0b3c496 HADOOP-10658. SSLFactory expects truststores being configured. Contributed by Alejandro Abdelnur. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599436 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 07:24:42 +00:00
Ravi Prakash f8a3041cfe HADOOP-9704. Write metrics sink plugin for Hadoop/Graphite (Chu Tong, Alex Newman and Babak Behzad via raviprak) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599415 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 05:51:52 +00:00
Jing Zhao adc4dc57c8 HADOOP-10630. Merge change r1599366 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599369 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-02 21:43:48 +00:00
Brandon Li c1e2673754 HDFS-6056. Merging change r1598782 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598792 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-31 00:26:34 +00:00
Suresh Srinivas c5c3241da8 HADOOP-10342. Merging branch-2 equivalent of commit 1568525 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598754 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-30 21:56:58 +00:00
Aaron Myers 452b37a2d7 HADOOP-10638. Updating hadoop-daemon.sh to work as expected when nfs is started as a privileged user. Contributed by Manikandan Narayanaswamy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598452 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-30 01:53:36 +00:00
Arpit Agarwal d1b7433a62 HADOOP-9968 and HADOOP-10448. Merging r1570934 and 1598396 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598440 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 23:38:07 +00:00
Alejandro Abdelnur 7d3496c7be HADOOP-10639. FileBasedKeyStoresFactory initialization is not using default for SSL_REQUIRE_CLIENT_CERT_KEY. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598415 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 21:40:15 +00:00
Chris Nauroth 8169cd491f HADOOP-10602. Merging change r1598339 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598340 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 17:36:03 +00:00
Chris Nauroth 7895ecccac HADOOP-10602. Merging change r1598337 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598338 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 17:33:10 +00:00
Arpit Agarwal d25d41d49b HADOOP-10566. Refactor proxyservers out of ProxyUsers. (Contributed by Benoy Antony) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598140 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-28 21:12:06 +00:00
Xuan Gong 5757def1a1 HADOOP-10625. Trim configuration names when putting/getting them 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598070 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-28 17:06:04 +00:00
Brandon Li 14ea885990 HDFS-6411. Merging change r1597895 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597896 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-27 23:05:15 +00:00
Andrew Wang 2a9d3a8824 HDFS-6435. Merged from r1596966. Add support for specifying a static uid/gid mapping for the NFS gateway. (atm via wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596967 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 20:45:13 +00:00
Arpit Agarwal 517eccb0c7 HADOOP-10618: Merging r1596964 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596965 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 20:41:44 +00:00
Jing Zhao 50acb4032f MAPREDUCE-5899. Merge change r1596931 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596937 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 18:50:20 +00:00
Arpit Agarwal 3929791066 HADOOP-10562. Fix CHANGES.txt entry again 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596388 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-20 20:18:02 +00:00
Arpit Agarwal a4efa20f29 HADOOP-10562. Fix CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596377 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-20 19:27:39 +00:00
Brandon Li 63740cb27a HADOOP-10612. Merging change r1596075 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596080 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 22:20:03 +00:00
Jason Darrell Lowe b6988521f4 Reverted HADOOP-10474 from branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596048 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 20:31:40 +00:00
Jason Darrell Lowe fb22c7c52f Reverting HADOOP-10485 from branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596041 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 20:13:14 +00:00
Aaron Myers 9962a38eb8 HADOOP-10489. UserGroupInformation#getTokens and UserGroupInformation#addToken can lead to ConcurrentModificationException. Contributed by Robert Kanter. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596027 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 19:59:08 +00:00
Sanford Ryza fa76a87dbe HADOOP-10614. CBZip2InputStream is not threadsafe (Xiangrui Meng via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595523 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-17 18:09:13 +00:00
Karthik Kambatla 9c5a2f812e HADOOP-10609. .gitignore should ignore .orig and .rej files. (kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595412 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-17 01:40:55 +00:00
Aaron Myers 3f617e325c HDFS-6406. Add capability for NFS gateway to reject connections from unprivileged ports. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595352 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 21:25:05 +00:00
Chris Nauroth d20f565b4c MAPREDUCE-5809. Merging change r1595283 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595290 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 18:32:15 +00:00
Brandon Li 3a9110ac05 HDFS-6361. Merging change r1595050 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595053 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 21:27:43 +00:00
Kihwal Lee 62d86218ef HADOOP-10588. Workaround for jetty6 acceptor startup issue. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595051 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 21:25:38 +00:00
Chris Nauroth 6af77d3cd3 HDFS-6326. Merging change r1594743 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594746 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-14 22:44:21 +00:00
Colin McCabe ba2483f31e HADOOP-10401. ShellBasedUnixGroupsMapping#getGroups does not always return primary group first (ajisakaa via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594717 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-14 21:07:01 +00:00
Kihwal Lee fe0180dd6c svn merge -c 1594709 merging from trunk to branch-2 to fix:HDFS-2949. Add check to active state transition to prevent operator-induced split brain. Contributed by Rushabh S Shah. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594710 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-14 20:46:38 +00:00
Brandon Li 090003221e HADOOP-10572. Merging change r1594289 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594291 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 17:12:03 +00:00
Suresh Srinivas 99025aacd6 Revert the commit r1594283 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594285 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 17:01:24 +00:00
Suresh Srinivas 196ee73e9a HADOOP-10566. Adding files missed in previous commit 1594280 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594283 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 17:00:01 +00:00
Jonathan Turner Eagles 8379c0c944 HADOOP-10585. Retry polices ignore interrupted exceptions (Daryn Sharp via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594270 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 16:32:24 +00:00
Sanford Ryza 29a124d09d YARN-2036. Document yarn.resourcemanager.hostname in ClusterSetup (Ray Chiang via Sandy Ryza) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593632 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-09 22:19:14 +00:00
Kihwal Lee 76bfc73cc9 svn merge -c 1593362 merging from trunk to branch-2 to fix:HADOOP-10158. SPNEGO should work with multiple interfaces/SPNs. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593363 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-08 18:28:22 +00:00
Kihwal Lee cf7d09e0a2 Correcting the check-in mistake for HADOOP-10581. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593361 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-08 18:24:29 +00:00
Kihwal Lee 559fcdc2a6 svn merge -c 1593357 merging from trunk to branch-2 to fix:HADOOP-10581. TestUserGroupInformation#testGetServerSideGroups fails. Contributed by Mit Desai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593358 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-08 18:04:59 +00:00
Arpit Agarwal 868e9b6431 HADOOP-10467: Merging r1593162 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593164 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-08 00:46:14 +00:00
Alejandro Abdelnur c278e40239 HADOOP-10556. [FIXING JIRA NUMBER TYPO] Add toLowerCase support to auth_to_local rules for service name. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593108 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-07 18:24:40 +00:00
Alejandro Abdelnur 2d683525d2 HADOOP-10566. Add toLowerCase support to auth_to_local rules for service name. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593106 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-07 18:22:12 +00:00
Haohui Mai caa1107813 HADOOP-10471. Merge r1592915 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592917 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-06 22:45:03 +00:00
Chris Nauroth 7a0d71916d HADOOP-10517. Merging change r1592855 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592856 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-06 19:54:12 +00:00
Chris Nauroth bfe689c00b HADOOP-10541. Merging change r1592803 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592804 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-06 16:56:24 +00:00
Tsz-wo Sze 75955e7c50 svn merge -c 1592179 from trunk for HDFS-5168. Add cross node dependency support to BlockPlacementPolicy. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592181 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-03 11:04:35 +00:00
Aaron Myers 775b27a6fe HADOOP-10568. Add s3 server-side encryption. Contributed by David S. Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592134 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-03 00:26:23 +00:00
Chris Nauroth dcf7c356ce HADOOP-10549. Merging change r1592011 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592012 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-02 19:15:39 +00:00
Arpit Agarwal cb889486aa HADOOP-10562: Merging r1592002 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592003 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-02 18:39:07 +00:00
Arpit Agarwal 86e5a7f96d HADOOP-10562. Undo previous commit. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591784 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-01 21:19:58 +00:00
Arpit Agarwal 21c1b0cba4 HADOOP-10562: Merging r1591782 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591783 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-01 21:15:25 +00:00
Aaron Myers a85a2a9a0a HADOOP-10543. RemoteException's unwrapRemoteException method failed for PathIOException. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591182 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-30 03:24:05 +00:00
Arpit Agarwal fa889d0ef6 HADOOP-10547: Merging r1591098 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591099 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 20:43:42 +00:00
Arpit Agarwal a325ab0e59 HADOOP-10547: Merging r1591095 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591097 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 20:41:05 +00:00
Vinod Kumar Vavilapalli 4c1f66d7fa YARN-1929. Fixed a deadlock in ResourceManager that occurs when failover happens right at the time of shutdown. Contributed by Karthik Kambatla. 
svn merge --ignore-ancestry -c 1591071 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591072 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 19:50:17 +00:00
Haohui Mai f37186167a HADOOP-10508. Merge r1590876 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590877 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-29 06:06:18 +00:00
Kihwal Lee 7746dbe28c svn merge -c 1590637 merging from trunk to branch-2 to fix:HADOOP-10322. Add ability to read principal names from a keytab. Contributed by Benoy Antony and Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590639 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-28 13:54:48 +00:00
Arpit Agarwal 774b782596 HADOOP-10540: Merging r1589923 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589924 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 03:10:31 +00:00
Aaron Myers 0bf1e43ac3 HDFS-6281. Provide option to use the NFS Gateway without having to use the Hadoop portmapper. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589915 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-25 00:19:34 +00:00
Jing Zhao fa6c972283 HADOOP-10535. Merge r1589905 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589906 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 23:05:25 +00:00
Chris Nauroth 91aad1c7bd HADOOP-10539. Merging change r1589884 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589885 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 21:26:09 +00:00
Andrew Wang 69a90ff22f HADOOP-10531. hadoop-config.sh - bug in --hosts argument. Contributed by Sebastien Barrier. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589531 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 22:37:24 +00:00
Uma Maheswara Rao G cdfb1aedd9 Merge HADOOP-10251. Both NameNodes could be in STANDBY State if SNN network is unstable. Contributed by Vinayakumar B. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589495 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 19:04:33 +00:00
Kihwal Lee f4bba31c92 svn merge -c 1589405 merging from trunk to branch-2 to fix:HADOOP-10527. Fix incorrect return code and allow more retries on EINTR. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589407 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 13:28:55 +00:00
Chris Nauroth 8296b7e3cc HADOOP-10503. Merging change r1589273 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589275 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-22 19:58:02 +00:00
Kihwal Lee f01067d685 svn merge -c 1588970 merging from trunk to branch-2 to fix:HADOOP-10526. Chance for Stream leakage in CompressorStream. Contributed by Rushabh Shah. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588971 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 19:21:46 +00:00
Kihwal Lee 8ccf18cee7 svn merge -c 1588949 merging from trunk to branch-2 to fix:HADOOP-10522. JniBasedUnixGroupMapping mishandles errors. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588950 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 18:28:53 +00:00
Suresh Srinivas 44b3357c55 HADOOP-9919. Merge r1588943 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588944 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 18:00:08 +00:00
Ivan Mitic 2fb649a668 YARN-1865 Merging change r1588693 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588696 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-19 19:00:42 +00:00
Chris Nauroth 5d90eaa20d HADOOP-10499. Merging change r1588098 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588099 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-16 23:16:36 +00:00
Daryn Sharp aa2f2da767 svn merge -c 1587608 FIXES: HADOOP-10498. Add support for proxy server. (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587609 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-15 15:27:04 +00:00
Chris Nauroth d2bb90033e HADOOP-10500. Merging change r1587361 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587362 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-14 23:52:21 +00:00
Chris Nauroth e390be170f HADOOP-10496. Merging change r1587141 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587144 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-14 04:32:31 +00:00
Chris Nauroth 065a09c8fc HADOOP-10495. Merging change r1587137 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587138 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-14 04:14:57 +00:00
Jing Zhao 4d83618ec6 HDFS-6229. Merge r1586714 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586715 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 16:45:06 +00:00
Jonathan Turner Eagles fbc9db6954 HADOOP-8826. Docs still refer to 0.20.205 as stable line (Mit Desai via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586687 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 15:38:06 +00:00
Chris Nauroth dcc01e0ff5 HADOOP-10490. Merging change r1586570 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586572 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 04:45:32 +00:00
Vinayakumar B a495fdb86f Merge HADOOP-10350. BUILDING.txt should mention openssl dependency required for hadoop-pipes (Vinayakumar B) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586443 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-10 19:34:36 +00:00
Haohui Mai 11a6feb8d3 HADOOP-10485. Merge r1586059 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586060 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 18:12:17 +00:00
Tsz-wo Sze 29f9ee01ce svn merge -c 1586030 from trunk for HADOOP-10473. TestCallQueueManager should interrupt before counting calls. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586031 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 16:50:25 +00:00
Steve Loughran 770aef5053 HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585933 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 11:11:31 +00:00
Jing Zhao f84e522ab7 HADOOP-10475. Merge change r1585888 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585889 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 04:57:57 +00:00
Haohui Mai 56268ffc41 HADOOP-10474. Merge r1585886 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585887 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-09 04:10:23 +00:00
Haohui Mai 1c0b72e807 HADOOP-10468. Merge r1585659 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585660 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-08 08:21:03 +00:00
Tsz-wo Sze d7d7f090cb svn merge -c 1585538 from trunk for HADOOP-10466. Lower the log level in UserGroupInformation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585539 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-07 18:07:57 +00:00
Tsz-wo Sze f290904937 svn merge -c 1584767 from trunk for the hadoop-common part of HDFS-6189. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584771 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-04 15:54:50 +00:00
Chris Nauroth e97d46029b HADOOP-10456. Merging change r1584575 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584579 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-04 09:31:51 +00:00
Uma Maheswara Rao G 0451f75a4a Merge HADOOP-10462. DF#getFilesystem is not parsing the command output. Contributed by Akira AJISAKA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584573 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-04 09:13:20 +00:00
Kihwal Lee 99ce3a8288 Fixing an error in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584442 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-03 22:47:41 +00:00
Jonathan Turner Eagles beb7622f52 HADOOP-10454. Provide FileContext version of har file system. (Kihwal Lee via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584432 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-03 22:25:54 +00:00
Aaron Myers c5b5947777 HADOOP-10459. distcp V2 doesn't preserve root dir's attributes when -p is specified. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584233 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-03 00:56:12 +00:00
Tsz-wo Sze cd982702b2 svn merge -c 1583842 from trunk for HADOOP-10455. When there is an exception, ipc.Server should first check whether it is an terse exception. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583843 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-02 01:01:50 +00:00
Aaron Myers 12ecd70d82 HADOOP-10414. Incorrect property name for RefreshUserMappingProtocol in hadoop-policy.xml. Contributed by Joey Echeverria. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583730 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-01 16:22:12 +00:00
Jing Zhao 20fb03a6c4 HADOOP-10345. Merge change r1583454 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583457 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-31 20:55:14 +00:00
Jing Zhao bae376e002 HADOOP-10451. Merge r1583393 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583395 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-31 18:42:11 +00:00
Arun Murthy 5e3d050989 Added release notes for hadoop-2.4.0. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583254 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-31 07:49:48 +00:00
Arun Murthy 21a1744039 Preparing for hadoop-2.4.0 release. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583246 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-31 07:39:04 +00:00
Ivan Mitic 1ab0827065 HADOOP-9525. Merging change r1582958 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582959 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-29 06:31:17 +00:00
Jing Zhao 0da50f6074 HADOOP-10301. Merge r1582883 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582884 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 21:22:39 +00:00
Chris Nauroth d8c11dc781 HADOOP-10450. Merging change r1582868 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582871 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 19:53:16 +00:00
Tsz-wo Sze 144ab4b15b svn merge -c 1582851 from trunk for HADOOP-10449. Fix the javac warnings in the security package. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582852 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-28 18:16:28 +00:00
Jonathan Turner Eagles edd6aa54cb HADOOP-10442. Group look-up can cause segmentation fault when certain JNI-based mapping module is used. (Kihwal Lee via jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582452 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-27 20:08:47 +00:00
Jing Zhao 8dc3ad11a9 HADOOP-10441. Merge r1582043 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582044 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 20:34:28 +00:00
Tsz-wo Sze 8ae6d5b5bd svn merge -c 1582015 from trunk for HADOOP-10437. Fix the javac warnings in the conf and the util package. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582017 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 19:05:51 +00:00
Tsz-wo Sze 3e9e036099 svn merge -c 1581964 from trunk for HADOOP-10440. HarFsInputStream.read(byte[]) updates position incorrectly. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581965 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 17:48:52 +00:00
Haohui Mai 496c14ccf0 HADOOP-10439. Fix compilation error in branch-2 after HADOOP-10426. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581721 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-26 07:58:47 +00:00
Arpit Agarwal 8f708aa9fb HADOOP-10280: Merging r1581532,1581533 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581546 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 21:51:32 +00:00
Tsz-wo Sze 2cc8d2d65b svn merge -c 1581437 from trunk for HADOOP-10426. Declare CreateOpts.getOpt(..) with generic type argument, removes unused FileContext.getFileStatus(..) and fixes various javac warnings. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581440 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 18:09:48 +00:00
Tsz-wo Sze 70a254314a svn merge -c 1581183 from trunk for HADOOP-10425. LocalFileSystem.getContentSummary should not count crc files. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581186 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-25 02:05:03 +00:00
Chris Nauroth 501c09c2c4 HADOOP-10422. Merging change r1581112 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581123 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 23:31:52 +00:00
Karthik Kambatla 64e93189f1 HADOOP-10423. Clarify compatibility policy document for combination of new client and old server. (Chris Nauroth via kasha) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581117 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 23:27:12 +00:00
Brandon Li da2d86bd04 HDFS-6050. Merging change r1581055 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581059 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 20:57:51 +00:00
Tsz-wo Sze 77b05150a7 svn merge -c 1580977 from trunk for HADOOP-10015. UserGroupInformation prints out excessive warnings. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580978 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 18:38:17 +00:00
Aaron Myers 99432027d3 HADOOP-10418. SaslRpcClient should not assume that remote principals are in the default_realm. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580667 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-24 00:02:46 +00:00
Chris Nauroth 3f32bb0e7f HADOOP-10191. Merging change r1580170 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580171 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-22 05:12:33 +00:00
Jing Zhao 2bf6f06235 HDFS-6038. Merge r1579813 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579814 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-20 23:08:32 +00:00
Arpit Agarwal a72cbb919b HADOOP-10221. Merging r1579387 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579388 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-19 20:23:28 +00:00
Arpit Agarwal 8a65533982 HADOOP-10221. Merging r1579382 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579383 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-19 20:18:24 +00:00
Enis Soztutar f8d157cda8 HADOOP-10383 InterfaceStability annotations should have RetentionPolicy.RUNTIME 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578694 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-18 01:07:57 +00:00
Tsz-wo Sze a537b9745d svn merge -c 1577710 from trunk for HADOOP-10407. Fix the javac warnings in org.apache.hadoop.ipc package. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577720 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-14 21:19:29 +00:00
Christopher Douglas 8f915e55fd HADOOP-3679. Fixup assert ordering in unit tests to yield meaningful error 
messages. Contributed by Jay Vyas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577397 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-14 00:47:04 +00:00
Christopher Douglas 9695bc7af6 YARN-1771. Reduce the number of NameNode operations during localization of 
public resources using a cache. Contributed by Sangjin Lee



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577392 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-14 00:31:08 +00:00
Brandon Li 2cf495a464 HDFS-6080. Merging change r1577319 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577320 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-13 21:07:14 +00:00
Jonathan Turner Eagles e6111498f8 HADOOP-10332. HttpServer's jetty audit log always logs 200 OK (jeagles) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577221 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-13 16:11:45 +00:00
Michael Stack 243db1c57e HADOOP-10337 ConcurrentModificationException from MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576189 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-11 04:38:06 +00:00
Vinod Kumar Vavilapalli ad5c0e4613 MAPREDUCE-5028. Fixed a bug in MapTask that was causing mappers to fail when a large value of io.sort.mb is set. Contributed by Karthik Kambatla. 
svn merge --ignore-ancestry -c 1576170 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576171 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-11 01:30:20 +00:00
Arpit Agarwal bb7e14902b HADOOP-10394. Merging r1576145 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576146 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-11 00:03:11 +00:00
Arpit Agarwal 4af360d629 HADOOP-10395. Merging r1575562 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576142 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-10 23:58:05 +00:00
Tsz-wo Sze 134a29f226 svn merge -c 1574259 from trunk for HDFS-5535. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576128 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-10 23:37:46 +00:00
Chris Nauroth 0663d54767 HADOOP-10399. Merging change r1576124 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576126 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-10 23:15:51 +00:00
Tsz-wo Sze 325f94b36a svn merge -c 1575470 from trunk for HADOOP-10393. Fix the javac warnings in hadoop-auth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575471 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-08 02:19:12 +00:00
Haohui Mai ffaab80c42 Merge r1575381 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575382 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-07 19:37:00 +00:00