897ced1a20
HADOOP-11017. KMS delegation token secret manager should be able to use zookeeper as store. (asuresh via tucu)
...
(cherry picked from commit db890eef32
2014-09-20 08:24:34 -07:00
5d897026e4
HDFS-7006. Test encryption zones with KMS. (Anthony Young-Garner and tucu)
2014-09-16 14:37:04 -07:00
e59f6771e8
HADOOP-10868. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu)
2014-09-15 17:10:43 -07:00
a0c54aeb00
HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang.
2014-09-15 08:30:42 -07:00
5e4cb3d04c
HADOOP-11074. Move s3-related FS connector code to hadoop-aws. (David S. Wang via Colin Patrick McCabe)
...
(cherry picked from commit 5ec7fcd9dd
2014-09-11 15:00:47 -07:00
fb804ed46c
HADOOP-10373 create tools/hadoop-amazon for aws/EMR support (stevel)
...
(cherry picked from commit 59384dfb71
2014-09-11 11:43:52 -07:00
05ae7983c6
HADOOP-11030. Define a variable jackson.version instead of using constant at multiple places. (Juan Yu via kasha)
...
(cherry picked from commit 9ad413b19d
2014-08-29 15:57:29 -07:00
09a0ad328f
HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu)
...
(cherry picked from commit 189abddf0b68ab43978dacaf3a9bf6ee7169cf78)
2014-08-29 11:53:13 -07:00
54202383a9
HADOOP-10911. hadoop.auth cookie after HADOOP-10710 still not proper according to RFC2109. (gchanan via tucu)
...
(cherry picked from commit 6040810df82669f140033d3c6366892640798671)
Conflicts:
hadoop-project/pom.xml
2014-08-29 11:23:14 -07:00
c77bd85b62
HDFS-6134 and HADOOP-10150 subtasks.
2014-08-28 15:03:08 -07:00
f1ee8cec61
HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki.
...
(cherry picked from commit 6962510f72
2014-08-27 14:17:29 -07:00
d637c71e4d
HADOOP-10433. Key Management Server based on KeyProvider API. (tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
hadoop-project/pom.xml
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619518 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:53 +00:00
7a07873c28
HADOOP-10141. Create KeyProvider API to separate encryption key storage
...
from the applications. (omalley)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619506 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:24 +00:00
481ac00c65
HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616674 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:01:12 +00:00
432e5eef56
HDFS-4629. Using com.sun.org.apache.xml.internal.serialize.* in XmlEditsVisitor.java is JVM vendor specific. Breaks IBM JAVA.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614664 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 14:06:05 +00:00
5b832979e1
Mreged from trunk. HDFS-5411. Update Bookkeeper dependency to 4.2.3. Contributed by Rakesh R.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608784 13f79535-47bb-0310-9956-ffa450edef68
2014-07-08 13:53:42 +00:00
9133e3142c
Preparing for 2.6.0 development. Updated versions.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 06:11:57 +00:00
602d3dd926
HADOOP-10711. Cleanup some extra dependencies from hadoop-auth. (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603645 13f79535-47bb-0310-9956-ffa450edef68
2014-06-18 21:50:49 +00:00
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
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
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
1ccccb8534
Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 04:41:01 +00:00
c9b6c3c36c
YARN-1635. Implemented a Leveldb based ApplicationTimelineStore. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1565868 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565869 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 02:18:06 +00:00
f3136cd6b9
HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / refactoring. Contributed by Mikhail Antonov.
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560832 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 22:31:27 +00:00
b9623c6308
HADOOP-10235. Hadoop tarball has 2 versions of stax-api JARs. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559231 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 19:31:01 +00:00
f35f702426
YARN-888. Cleaned up POM files so that non-leaf modules don't include any dependencies and thus compact the dependency list for leaf modules. Contributed by Alejandro Abdelnur.
...
svn merge --ignore-ancestry -c 1557801 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557802 13f79535-47bb-0310-9956-ffa450edef68
2014-01-13 18:34:39 +00:00
b8eb777a43
HADOOP-10147 HDFS-5678 Upgrade to commons-logging 1.1.3 to avoid potential deadlock in MiniDFSCluster
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554802 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 13:37:04 +00:00
9c2534506f
HADOOP-9611 mvn-rpmbuild against google-guice > 3.0 yields missing cglib dependency
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551915 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 11:14:30 +00:00
fb03925549
HADOOP-10102. Update commons IO from 2.1 to 2.4
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547755 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 10:39:36 +00:00
439a690ad1
Setting version to 2.4.0-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547165 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:40:42 +00:00
92d615a37a
HADOOP-10103 commons-lang->2.6
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544173 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 13:36:59 +00:00
2d39336213
HADOOP-10067 Missing POM dependency on jsr305
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541861 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 09:42:35 +00:00
91342b9820
HADOOP-9594 commons-math
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541667 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:29:56 +00:00
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
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
75f9db1c4d
YARN-1021. Yarn Scheduler Load Simulator. (ywskycn via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527065 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:32:06 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Alejandro Abdelnur
Aaron T. Myers
Colin Patrick Mccabe
Steve Loughran
Karthik Kambatla
Alejandro Abdelnur
Uma Maheswara Rao G
Chris Nauroth
Arun Murthy
Zhijie Shen
Konstantin Boudnik
Vinod Kumar Vavilapalli
Colin McCabe
Todd Lipcon
Sanford Ryza