Commit Graph

1266 Commits

Author SHA1 Message Date
Chris Nauroth 2cdd8f1b63 HADOOP-10093. Merging change r1541343 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541344 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 01:17:57 +00:00
Brandon Li 65fd32800d HDFS-5469. Merging change r1540443 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540444 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 04:25:57 +00:00
Chris Nauroth b13c6bda43 HADOOP-10088. Merging change r1540270 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540271 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 07:38:16 +00:00
Jing Zhao 76a7119930 HDFS-5371. Merge change r1540197 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540200 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 21:43:15 +00:00
Brandon Li 5f82524fe3 HDFS-5364. Merging change r1539834 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539891 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 01:03:10 +00:00
Brandon Li f87469c7aa HDFS-5252. Merging change r1539740 form trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539742 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 18:10:33 +00:00
Chris Nauroth 5406659b12 HADOOP-9660. Merging change r1539535 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539536 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 06:52:19 +00:00
Colin McCabe 825103c331 move HADOOP-9623 to 2.2.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539261 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 08:08:33 +00:00
Colin McCabe 60dd68f4bb HADOOP-9623. Update jet3t dependency to 0.9.0 (Amandeep Khurana via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539256 13f79535-47bb-0310-9956-ffa450edef68
2013-11-06 08:02:55 +00:00
Colin McCabe 5324b77a60 HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538252 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 18:51:14 +00:00
Colin McCabe 2946a3afdf HADOOP-10079. log a warning message if group resolution takes too long (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538114 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 00:48:29 +00:00
Andrew Wang 4dfa0bf99f HADOOP-9898. Set SO_KEEPALIVE on all our sockets. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537638 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 20:56:42 +00:00
Bikas Saha 330ada83eb Merge r1536888 from trunk to branch-2 for YARN-1068. Add admin support for HA operations (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536899 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:21:06 +00:00
Chris Nauroth abddbcd9bf HADOOP-10072. Merging change r1535918 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535919 13f79535-47bb-0310-9956-ffa450edef68
2013-10-26 04:32:25 +00:00
Jonathan Turner Eagles 076e78d021 HADOOP-10064. Upgrade to maven antrun plugin version 1.7 (Arpit Agarwal via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535267 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 02:40:49 +00:00
Jonathan Turner Eagles 16cc6640b7 HADOOP-9016. HarFsInputStream.skip(long) must never return negative value. (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535088 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 18:12:02 +00:00
Jonathan Turner Eagles f64cb91d67 HADOOP-9291. enhance unit-test coverage of package o.a.h.metrics2 (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534476 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 03:48:37 +00:00
Colin McCabe 75968551bd HDFS-5276. FileSystem.Statistics should use thread-local counters to avoid multi-threaded performance issues on read/write. (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533670 13f79535-47bb-0310-9956-ffa450edef68
2013-10-19 00:38:13 +00:00
Chris Nauroth 2c1afcf3d0 HADOOP-10055. Merging change r1533188 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533189 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:16:02 +00:00
Andrew Wang 5776b0b324 HDFS-5360. Improvement of usage message of renameSnapshot and deleteSnapshot. Contributed by Shinichi Yamashita.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532938 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 23:16:13 +00:00
Jonathan Turner Eagles 186581fef2 HADOOP-9078. enhance unit-test coverage of class org.apache.hadoop.fs.FileContext (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532929 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:47:16 +00:00
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