Commit Graph

1295 Commits

Author SHA1 Message Date
Suresh Srinivas bc18c6f842 HADOOP-10005. Merge 1532907 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532908 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:05:23 +00:00
Chris Nauroth 9cda28ef0d HADOOP-9897. Merging change r1532880 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532883 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:15:09 +00:00
Brandon Li 218b1cc69c HDFS-5330. Merging change r1532539 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532543 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 21:30:18 +00:00
Andrew Wang ea64a5a48d HADOOP-100046. Print a log message when SSL is enabled (David S. Wang via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532479 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 18:40:45 +00:00
Chris Nauroth 6f80868079 HADOOP-10040. Merging change r1532136 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532138 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 23:32:56 +00:00
Jonathan Turner Eagles 50ac80a44f HADOOP-9494. Excluded auto-generated and examples code from clover reports (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532014 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 18:25:45 +00:00
Chris Nauroth d8a9841f40 HADOOP-10040. Merging change r1531994 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531996 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:43:52 +00:00
Chris Nauroth a5467739bb HADOOP-10040. Merging change r1531983 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531984 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:14:24 +00:00
Chris Nauroth 4e4e958213 HADOOP-10040. Merging change r1531977 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531978 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:06:42 +00:00
Brandon Li d890e365c8 HDFS-5329. Merging change 1531617 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531618 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 05:33:12 +00:00
Chris Nauroth 4f3386420c HADOOP-10040. Merging change r1531491 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531492 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 03:16:45 +00:00
Jing Zhao c89a36106e HDFS-5322. Merge change r1531436 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531440 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:53:29 +00:00
Jing Zhao 1e24c3cdad HADOOP-10039. Merge change r1531158 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531159 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 01:25:58 +00:00
Suresh Srinivas 1db83edea2 HADOOP-10029. Merging change 1531125 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531126 13f79535-47bb-0310-9956-ffa450edef68
2013-10-10 21:58:41 +00:00
Chris Nauroth e9ae7ba096 HADOOP-10031. Merging change r1530823 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530827 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 23:05:05 +00:00
Daryn Sharp 2031005eeb HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules (Ivan A. Veselovsky via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530671 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:10:43 +00:00
Brandon Li e79cdd2d9c HDFS-5281. Merging change r1530461 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530468 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 00:10:48 +00:00
Chris Nauroth 292259b0b8 HADOOP-10030. Merging change r1530462 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530465 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 23:44:32 +00:00
Jonathan Turner Eagles ea724f0651 HADOOP-9199. Cover package org.apache.hadoop.io with unit tests (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530406 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 19:48:07 +00:00
Arun Murthy c3dff760d9 Moving recent bug-fixes to hadoop-2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530129 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 02:05:03 +00:00
Jing Zhao cd4411ce1c HDFS-5291. Merge change r1530112 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530113 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 00:03:26 +00:00
Jing Zhao 2aee8b321b HADOOP-10028. Merge change r1530100 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530101 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 22:42:01 +00:00
Arun Murthy a4ea3cb43d Release notes for hadoop-2.2.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529757 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:40:48 +00:00
Arun Murthy 3b514585f1 Preparing for hadoop-2.2.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529752 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:32:18 +00:00
Brandon Li 254e87700f HDFS-5259. Merging change r1529730 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529735 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 03:39:43 +00:00
Vinod Kumar Vavilapalli 4b32d6ad9a YARN-1277. Added a policy based configuration for http/https in common HttpServer and using the same in YARN - related
to per project https config support via HADOOP-10022. Contributed by Suresh Srinivas and Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1529662 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529663 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:44:27 +00:00
Jing Zhao 3f0c90f6b5 HADOOP-10017. Merge change r1529571 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529572 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 06:24:32 +00:00
Alejandro Abdelnur 4de1616b82 YARN-1253. Changes to LinuxContainerExecutor to run containers as a single dedicated user in non-secure mode. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529326 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 22:00:01 +00:00
Jason Darrell Lowe bab129d135 svn merge -c 1529296 FIXES: HADOOP-9225. Cover package org.apache.hadoop.compress.Snappy. Contributed by Vadim Bondarev, Andrey Klochkov and Nathan Roberts
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529301 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 21:03:16 +00:00
Jason Darrell Lowe f2e97aad31 svn merge -c 1528620 FIXES: HADOOP-9254. Cover packages org.apache.hadoop.util.bloom, org.apache.hadoop.util.hash. Contributed by Vadim Bondarev
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528621 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 20:55:26 +00:00
Jason Darrell Lowe 0cf79e3e66 svn merge -c 1528502 FIXES: HADOOP-9063. enhance unit-test coverage of class org.apache.hadoop.fs.FileUtil. Contributed by Ivan A. Veselovsky
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528506 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 14:53:28 +00:00
Suresh Srinivas 09d2301b63 HADOOP-10012. Merge 1528301 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528302 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 04:11:26 +00:00
Todd Lipcon 1c48b4d04c HADOOP-8315. Support SASL-authenticated ZooKeeper in ActiveStandbyElector. Contributed by Todd Lipcon
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528292 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 00:44:43 +00:00
Colin McCabe 3631361653 move HADOOP-9758 to the branch-2.1.2 section
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528286 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 00:36:08 +00:00
Suresh Srinivas 67ad6d4a92 HADOOP-10003. Merging 1528256 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528263 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 23:06:28 +00:00
Brandon Li 320c7519ed HDFS-5230. Merging change r1527726 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527741 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 19:37:33 +00:00
Luke Lu 4ff49a7516 HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize ReflectionUtils.printThreadInfo. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527651 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 17:01:51 +00:00
Steve Loughran 905be853a1 HADOOP-10006. Compilation failure in trunk for o.a.h.fs.swift.util.JSONUtil
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527186 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 13:30:09 +00:00
Chris Nauroth f040bd0739 HDFS-5260. Merging change r1527113 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527115 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 22:56:54 +00:00
Steve Loughran c35a34d3ce HADOOP-8545. Filesystem Implementation for OpenStack Swift
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526852 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 11:29:07 +00:00
Steve Loughran d44334158a HADOOP-8545. Filesystem Implementation for OpenStack Swift
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526848 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 11:12:42 +00:00
Brandon Li dfd64df5f1 Merging change r1526728 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526731 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 22:59:13 +00:00
Sanford Ryza d2e94731ee HADOOP-9976. Different versions of avro and avro-maven-plugin (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526668 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 20:26:04 +00:00
Chris Nauroth e45c32fced HADOOP-9948. Merging change r1526606 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526607 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:11:40 +00:00
Colin McCabe fa2a3c94f2 HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:24:40 +00:00
Brandon Li 61a00d87d5 HDFS-5246. Merging change r1526316 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526319 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 22:16:34 +00:00
Colin McCabe 138fd7581f HADOOP-9981. globStatus should minimize its listStatus and getFileStatus calls. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526300 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:58:37 +00:00
Andrew Wang 101664055c Move CHANGES.txt entry for HADOOP-9761
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526291 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:35:55 +00:00
Ivan Mitic 88eb46c7c2 HADOOP-9776. Merging change r1526109 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526110 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 05:22:25 +00:00
Siddharth Seth e23d5672a7 merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:37:14 +00:00
Arpit Agarwal 8f354d141e HDFS-5139. Merge r1525659 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525661 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 18:03:27 +00:00
Chris Nauroth 8338e33f57 HADOOP-9977. Merging change r1525657 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525658 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 17:52:58 +00:00
Brandon Li b7f0156ad8 HDFS-5234. Merging change r1525104 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525109 13f79535-47bb-0310-9956-ffa450edef68
2013-09-20 19:11:33 +00:00
Vinod Kumar Vavilapalli d71bb8385b YARN-1203. Changed YARN web-app proxy to handle http and https URLs from AM registration and finish correctly. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config mapreduce.ssl.enabled to enable https and disabling it by default as MR AM needs
to set up its own certificates etc and not depend on clusters'. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1524864 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524867 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 23:51:14 +00:00
Hitesh Shah 2f97dced61 Merge 1524829 from trunk to branch-2 for YARN-353. Add Zookeeper-based store implementation for RMStateStore. Contributed by Bikas Saha, Jian He and Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524831 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 20:40:52 +00:00
Ivan Mitic fe3e796ed5 HADOOP-9791. Merging change r1524631 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524633 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 06:59:41 +00:00
Colin McCabe 7ce1a859a8 HADOOP-9929. Insufficient permission for a path reported as file not found. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524610 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 02:03:42 +00:00
Jing Zhao 8855a3e0ee HDFS-5212. Merge change r1524298 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524302 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 06:26:57 +00:00
Brandon Li 3a7e3e0881 HADOOP-9669. Merging change r1524259 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524260 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 00:15:12 +00:00
Steve Loughran 5741f754d7 moved location of HADOOP-9350 change as now in branch-2.1.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524007 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 12:30:47 +00:00
Arun Murthy 8ae2d66005 Added ASL2 header to releasenotes.html.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523904 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 05:43:57 +00:00
Arun Murthy 3836473c73 Preparing for hadoop-2.1.1-beta release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523892 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 05:23:39 +00:00
Arun Murthy 1d6a45a02c Merge -c 1523885 from trunk to branch-2 to fix HADOOP-9944. Fix RpcRequestHeaderProto.callId to be sint32 rather than uint32 since ipc.Client.CONNECTION_CONTEXT_CALL_ID is signed (i.e. -3). Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523886 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 04:54:04 +00:00
Chris Nauroth b52ae58928 HADOOP-9935. Revert from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523835 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 23:12:01 +00:00
Alejandro Abdelnur 3638f42a50 HADOOP-9962. in order to avoid dependency divergence within Hadoop itself lets enable DependencyConvergence. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523600 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:41:00 +00:00
Alejandro Abdelnur 89df2ae5c9 HADOOP-9961. versions of a few transitive dependencies diverged between hadoop subprojects. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523597 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:31:17 +00:00
Alejandro Abdelnur 460fd2053b YARN-1137. Add support whitelist for system users to Yarn container-executor.c. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523589 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:02:13 +00:00
Chris Nauroth c2a1353c29 HADOOP-9935. Merging change r1523403 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523404 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 04:40:54 +00:00
Chris Nauroth 7bf877f4ea HADOOP-9557. Merging change r1523185 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523186 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 05:27:46 +00:00
Aaron Myers 6a193d7f8e HADOOP-9960. Upgrade Jersey version to 1.9. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523156 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 00:15:07 +00:00
Aaron Myers 27c1c0079e HADOOP-9945. HAServiceState should have a state for stopped services. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523150 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 23:58:45 +00:00
Steve Loughran 721326be6a HADOOP-9350. Hadoop not building against Java7 on OSX
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522866 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 11:04:02 +00:00
Brandon Li 95b902fb1e HDFS-5067. Merging change r1522774 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522776 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 04:31:51 +00:00
Andrew Wang 15e3c010ec HADOOP-9958. Add old constructor back to DelegationTokenInformation to unbreak downstream builds. (Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522709 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 20:06:15 +00:00
Andrew Wang 1d4d1d8f70 HDFS-4680. Audit logging of delegation tokens for MR tracing. (Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522015 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 20:04:50 +00:00
Jing Zhao b3076b00ce HDFS-5085. Merge change r1521601 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521607 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 19:39:36 +00:00
Ivan Mitic 9fed38f149 HADOOP-9924. Merging addendum change r1520903 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520904 13f79535-47bb-0310-9956-ffa450edef68
2013-09-08 19:57:58 +00:00
Andrew Wang 7cb29ba170 Revert HADOOP-9877 because of issues reported at HADOOP-9912
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520712 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 22:53:26 +00:00
Jonathan Turner Eagles 0dd1c596f3 HADOOP-8704. add request logging to jetty/httpserver (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520676 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 19:46:32 +00:00
Jing Zhao f059931fed HDFS-5118. Merge change r1520637 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520639 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 17:24:44 +00:00
Chris Nauroth 4c66560499 HDFS-4491. Merging change r1520479 and r1520482 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520485 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 03:28:00 +00:00
Todd Lipcon a7b2749114 HADOOP-9908. Fix NPE when versioninfo properties file is missing. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520335 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 14:41:43 +00:00
Colin McCabe a1db4783a4 HADOOP-9915. o.a.h.fs.Stat support on Mac OS X (Contributed by Binglin Chang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520192 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 02:00:06 +00:00
Kihwal Lee 2935b50d85 svn merge -c 1520126 merging from trunk to branch-2 to fix HADOOP-9932.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520127 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 19:59:52 +00:00
Luke Lu 6ebdbd4a0a HADOOP-9916. Fix race in ipc.Client retry. (Binglin Chang via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519974 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 10:34:56 +00:00
Ivan Mitic 5f4abaa3dc HADOOP-9924. Merging change r1519891 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519894 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 01:21:52 +00:00
Brandon Li fa39efe421 Merging change r1519222 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519229 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 21:24:47 +00:00
Sanford Ryza ab02296741 HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519130 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 02:13:11 +00:00
Ivan Mitic f83da5780c HADOOP-9774. Merging change r1518865 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518871 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 01:18:33 +00:00
Andrew Wang 79ef532870 HADOOP-9909. org.apache.hadoop.fs.Stat should permit other LANG. (Shinichi Yamashita via Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518863 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 00:37:09 +00:00
Sanford Ryza b23888256e HADOOP-9889. Refresh the Krb5 configuration when creating a new kdc in Hadoop-MiniKDC (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518849 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 22:41:20 +00:00
Brandon Li bd1c2de914 HDFS-5078. Merging change r1518292 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518813 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 20:33:25 +00:00
Arpit Agarwal 125c68e225 HADOOP-9894. Merging change r1518420 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518421 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 00:11:58 +00:00
Sanford Ryza 07c7db3673 Adding and removing files missed for HADOOP-9906
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518308 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 18:04:55 +00:00
Sanford Ryza f70e947392 HADOOP-9906. Move HAZKUtil to o.a.h.util.ZKUtil and make inner-classes public (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518307 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 18:04:27 +00:00
Harsh J 53b04516fe HADOOP-9910. proxy server start and stop documentation wrong. Contributed by Andre Kelpe. (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518304 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 17:57:39 +00:00
Brandon Li 80ead68bfc HDFS-4947. Merging change r1517040 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517049 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 21:26:23 +00:00
Jonathan Turner Eagles 773cab510f HDFS-4329. DFSShell issues with directories with spaces in name (Cristina L. Abad via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516908 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 15:56:26 +00:00
Tsz-wo Sze 95c4570eb1 HADOOP-9899. Remove the debug message, added by HADOOP-8855, from KerberosAuthenticator.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516745 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 08:40:15 +00:00
Chris Nauroth 0a0466c026 HADOOP-9887. Merging change r1516608 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516612 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 21:18:46 +00:00
Brandon Li 992a046b89 HDFS-5069. Merging change r1516232 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516239 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 18:17:23 +00:00
Andrew Wang 1bc892472c HADOOP-9877. Fix listing of snapshot directories in globStatus. (Binglin Chang via Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516236 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 18:06:58 +00:00
Luke Lu d83061b71b HADOOP-9784. Add a builder for HttpServer. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516130 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 10:13:17 +00:00
Arpit Gupta 16f7870141 HADOOP-9886. Merging change r1516034 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516038 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 23:51:33 +00:00
Jonathan Turner Eagles 017bbeade1 HADOOP-9686. Easy access to final parameters in Configuration (Jason Lowe via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516009 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 22:45:49 +00:00
Andrew Wang d21d74744c Revert HADOOP-9877, patch did not apply cleanly.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515998 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 22:34:46 +00:00
Andrew Wang 81960c2f91 HADOOP-9877. Fix listing of snapshot directories in globStatus. (Binglin Chang via Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515956 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 20:24:03 +00:00
Jing Zhao b7567168db HDFS-5111. Merge change r1515895 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515896 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 17:35:18 +00:00
Sanford Ryza 11123a1b26 HADOOP-9879. Move the version info of zookeeper dependencies to hadoop-project/pom (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515713 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 06:29:34 +00:00
Steve Loughran c3d07a0304 HADOOP-9487 Deprecation warnings in Configuration should go to their own log or otherwise be suppressible
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515671 13f79535-47bb-0310-9956-ffa450edef68
2013-08-19 23:49:11 +00:00
Alejandro Abdelnur 32bdd011ef HADOOP-9866. convert hadoop-auth testcases requiring kerberos to use minikdc. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515658 13f79535-47bb-0310-9956-ffa450edef68
2013-08-19 23:04:23 +00:00
Alejandro Abdelnur 540896b39e HADOOP-9860. Remove class HackedKeytab and HackedKeytabEncoder from hadoop-minikdc once jira DIRSERVER-1882 solved. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515653 13f79535-47bb-0310-9956-ffa450edef68
2013-08-19 22:55:25 +00:00
Brandon Li 1c58240ffc HDFS-5107. Merging change r1515166 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515218 13f79535-47bb-0310-9956-ffa450edef68
2013-08-18 21:20:02 +00:00
Jing Zhao 8c6234aa00 HADOOP-9880. Merge change r1514913 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514915 13f79535-47bb-0310-9956-ffa450edef68
2013-08-16 22:39:26 +00:00
Colin McCabe 15bdf14151 HADOOP-9865. FileContext#globStatus has a regression with respect to relative path. (Contributed by Chaun Lin)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514536 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 23:10:06 +00:00
Arun Murthy b433db32fd Release notes for hadoop-2.1.0-beta rc2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514480 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 20:42:57 +00:00
Arun Murthy aa3f77675b Preparing for hadoop-2.1.0-beta rc2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514471 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 20:34:25 +00:00
Kihwal Lee 47e4c2c121 svn merge -c 1514448 merging from trunk to branch-2 to fix HADOOP-9868.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514453 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 19:31:07 +00:00
Colin McCabe 03420bbb4d HADOOP-9875. TestDoAsEffectiveUser can fail on JDK 7. (Aaron T. Myers via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514153 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 04:06:00 +00:00
Suresh Srinivas ec123f9657 HADOOP-9381. Merge 1514089 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514103 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 00:04:40 +00:00
Colin McCabe bdc291da6a HADOOP-9652. RawLocalFs#getFileLinkStatus does not fill in the link owner and mode. (Andrew Wang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514090 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 23:18:26 +00:00
Alejandro Abdelnur eee2b37a3a HADOOP-9872. Improve protoc version handling and detection. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514074 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:29:46 +00:00
Alejandro Abdelnur 677bbd336d HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514071 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:25:26 +00:00
Luke Lu cc8ea9bf08 HADOOP 9871. Fix intermittent findbugs warnings in DefaultMetricsSystem. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514025 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 20:23:32 +00:00
Luke Lu 8a7cec29fe HADOOP-9446. Support Kerberos SPNEGO for IBM JDK. (Yu Gao via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513688 13f79535-47bb-0310-9956-ffa450edef68
2013-08-13 23:13:07 +00:00
Alejandro Abdelnur 5b9536d368 HADOOP-9848. Create a MiniKDC for use with security testing. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513309 13f79535-47bb-0310-9956-ffa450edef68
2013-08-13 00:27:59 +00:00
Andrew Wang d8a025bb28 HADOOP-9847. TestGlobPath symlink tests fail to cleanup properly. (cmccabe via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513255 13f79535-47bb-0310-9956-ffa450edef68
2013-08-12 20:55:03 +00:00
Chris Nauroth 086934cd59 HADOOP-9802. Merging change r1512872 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512874 13f79535-47bb-0310-9956-ffa450edef68
2013-08-11 06:05:34 +00:00
Chris Nauroth a6c58bc850 HADOOP-9857. Merging change r1512522 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512523 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 23:00:08 +00:00
Brandon Li 375378a0e5 HADOOP-8814. Merging change r1387853 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512510 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 21:57:19 +00:00
Chris Nauroth a21debedec HADOOP-9858. Remove unused private RawLocalFileSystem#execCommand method from branch-2. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512491 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 21:08:38 +00:00
Daryn Sharp 64d681bebf merge -c 1512465 FIXES: HADOOP-9757. Har metadata cache can grow without limit (Cristina Abad via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512466 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 19:44:50 +00:00
Colin McCabe 4382cbe53d HADOOP-9675. use svn:eol-style native for html to prevent line ending issues (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512421 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 18:00:34 +00:00
Daryn Sharp 02aa997ba2 merge -c 1512380 FIXES: HADOOP-9789. Support server advertised kerberos principals (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512381 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 16:30:10 +00:00
Kihwal Lee d90f3fbdbf svn merge -c 1512314 from trunk to branch-2 to fix HADOOP-9672.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512315 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 14:15:30 +00:00
Chris Nauroth e1ee0d049b HADOOP-9831. Merging change r1512101 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512105 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 23:55:56 +00:00
Chris Nauroth 36ac148d1e HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to fix build failures. Contributed by Dennis Y.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512096 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 23:20:01 +00:00
Jitendra Nath Pandey 203fbd2c86 Merge -c 1512091 from trunk for HADOOP-9820. RPCv9 wire protocol is insufficient to support multiplexing. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512094 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 23:11:10 +00:00
Arun Murthy 25038197b5 Merge -c 1512081 from trunk to branch-2 to fix YARN-1043. Push all metrics consistently. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512082 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 22:55:33 +00:00
Steve Loughran 16810177c9 merge r1512026: HADOOP-9833 move slf4j to version 1.7.5
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512048 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 21:32:01 +00:00
Colin McCabe 1af6193879 move HADOOP-9435 to branch-2.1.1-beta
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511919 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 18:26:18 +00:00
Kihwal Lee ea8aeaeab6 svn merge -c 1511823 from trunk to branch-2 to FIX HADOOP-9850. RPC kerberos errors don't trigger relogin.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511824 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 15:05:20 +00:00
Brandon Li 50950fd3ff HDFS-4763. Merging change r1511519 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511522 13f79535-47bb-0310-9956-ffa450edef68
2013-08-07 22:30:51 +00:00
Jing Zhao 8dfe7e0aa4 HDFS-4926. Merge change r1511477 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511478 13f79535-47bb-0310-9956-ffa450edef68
2013-08-07 20:40:36 +00:00
Chris Nauroth 0664a552d2 HADOOP-9527. Merging change r1511118 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511120 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 20:43:13 +00:00
Jing Zhao ce28aebfba HADOOP-9821. Merge change r1511058 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511063 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 18:25:39 +00:00
Andrew Wang afa778b8f9 HADOOP-9817. FileSystem#globStatus and FileContext#globStatus need to work with symlinks. (Colin Patrick McCabe via Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510816 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 23:42:39 +00:00
Daryn Sharp 9186e30af9 HADOOP-9832. [RPC v9] Add RPC header to client ping (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510805 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 23:21:53 +00:00
Chris Nauroth 9541a31f1d HDFS-4905. Merging change r1510773 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510780 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 22:11:30 +00:00
Daryn Sharp 9d28a52b30 merge -c 1510772 FIXES: HADOOP-9816. RPC Sasl QOP is broken (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510774 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 22:05:25 +00:00