2b327abe86
HADOOP-10607. Addendum, bringing in changes, KMS related, which were left out in the original merge.
...
Conflicts:
hadoop-common-project/hadoop-common/src/main/bin/hadoop
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/JavaKeyStoreProvider.java
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/alias/TestCredShell.java
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619523 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:03 +00:00
137ecfc74f
HADOOP-10611. KMS, keyVersion name should not be assumed to be keyName@versionNumber. (tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619522 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:02 +00:00
2b0016ec18
HADOOP-10645. TestKMS fails because race condition writing acl files. (tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619521 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:59 +00:00
a5892e519c
HADOOP-10586. KeyShell doesn't allow setting Options via CLI. (clamb via tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619520 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:57 +00:00
eebaaa3f16
HADOOP-10583. bin/hadoop key throws NPE with no args and assorted other fixups. (clamb via tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619519 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:55 +00: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
91e6a452b5
HADOOP-10534. KeyProvider getKeysMetadata should take a list of names
...
rather than returning all keys. (omalley)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619517 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:45 +00:00
bb0a609e19
HADOOP-10431. Change visibility of KeyStore.Options getter methods to public. (tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619516 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:43 +00:00
bd3cff6027
HADOOP-10430. KeyProvider Metadata should have an optional description, there should be a method to retrieve the metadata from all keys. (tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619515 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:42 +00:00
32134d7386
HADOOP-10244. TestKeyShell improperly tests the results of delete (Larry
...
McCay via omalley)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619514 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:40 +00:00
e0729c3871
HADOOP-10428. JavaKeyStoreProvider should accept keystore password via configuration falling back to ENV VAR. (tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619513 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:39 +00:00
93cb3cb6d9
HADOOP-10427. KeyProvider implementations should be thread safe. (tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619512 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:37 +00:00
64bb8b4449
HADOOP-10429. KeyStores should have methods to generate the materials themselves, KeyShell should use them. (tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619511 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:35 +00:00
82945ccfcc
HADOOP-10432. Refactor SSLFactory to expose static method to determine HostnameVerifier. (tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619510 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:33 +00:00
90c9ffcb3c
HADOOP-10237. JavaKeyStoreProvider needs to set keystore permissions
...
correctly. (Larry McCay via omalley)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619509 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:32 +00:00
48289796d2
HADOOP-10177. Create CLI tools for managing keys. (Larry McCay via omalley)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619508 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:29 +00:00
4a689777ae
HADOOP-10201. Add listing to KeyProvider API. (Larry McCay via omalley)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619507 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:58:27 +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
d887700240
HDFS-6890. Merging change r1619500 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619501 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:03:55 +00:00
c9d7647826
MAPREDUCE-5974. Allow specifying multiple MapOutputCollectors with fallback. (Todd Lipcon via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619496 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 17:39:54 +00:00
5d965f2f3c
YARN-2424. LCE should support non-cgroups, non-secure mode (Chris Douglas via aw)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619424 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 14:57:53 +00:00
f7e3b6e761
HDFS-6758: Merging r1619275 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619276 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 01:14:14 +00:00
3e9b4f1950
HDFS-6878: Merging r1619271 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619272 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 00:42:42 +00:00
fd50cd9150
HDFS-6858. Merging change r1619256 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619258 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 22:49:38 +00:00
bf0e9e894d
YARN-1919. Potential NPE in EmbeddedElectorService#stop. (Tsuyoshi Ozawa via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619253 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 22:14:13 +00:00
8b8fe3a425
Set the release date for 2.5.0 in CHANGES.txt
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619238 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 21:33:42 +00:00
f87e8dc4b8
HDFS-6870. Merge r1619192 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619193 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 18:14:43 +00:00
8991c7d1b2
svn merge -c 1619176 FIXES: YARN-2034. Description for yarn.nodemanager.localizer.cache.target-size-mb is incorrect. Contributed by Chen He
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619178 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 17:40:55 +00:00
146d00eb0f
Merge r1619160 from trunk. YARN-2174. Enable HTTPs for the writer REST API of TimelineServer. Contributed by Zhijie Shen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619162 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 17:07:12 +00:00
12e216ad29
Merged revision(s) 1617799 from hadoop/common/trunk:
...
HDFS-6247. Avoid timeouts for replaceBlock() call by sending intermediate responses to Balancer (vinayakumarb)
........
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619084 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 12:14:42 +00:00
388d6cffe5
HDFS-6868. Merging change r1619001 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619002 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 22:33:23 +00:00
400f6131d4
YARN-2249. Avoided AM release requests being lost on work preserving RM restart. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1618972 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618973 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 20:40:37 +00:00
96455a564a
HADOOP-10968. hadoop native build fails to detect java_libarch on ppc64le (Dinar Valeev via Colin Patrick McCabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618920 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 18:10:35 +00:00
aeab638ce2
Merge r1618915 from trunk. YARN-2409. RM ActiveToStandBy transition missing stoping previous rmDispatcher. Contributed by Rohith
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618916 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 17:50:48 +00:00
d926fd12cf
HDFS-6569. Merging change r1618742 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618747 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 21:26:45 +00:00
ab1c7bee12
HDFS-6188: Merging r1618727 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618728 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 20:50:27 +00:00
7962bf3820
HADOOP-10873. Fix dead link in Configuration javadoc (Akira AJISAKA via aw)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618720 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 20:05:01 +00:00
ec15f91acc
HADOOP-10972. Native Libraries Guide contains mis-spelt build line (Peter Klavins via aw)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618718 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 20:00:50 +00:00
c9702526a0
MAPREDUCE-6012. DBInputSplit creates invalid ranges on Oracle. (Wei Yan via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618696 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:33:59 +00:00
e06838038e
svn merge -c 1618691 FIXES: MAPREDUCE-6036. TestJobEndNotifier fails intermittently in branch-2. Contributed by chang li
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618692 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:19:09 +00:00
9b38a6ab23
HDFS-6825. Edit log corruption due to delayed block removal. Contributed by Yongjun Zhang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618689 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:10:50 +00:00
f7593e1650
Update CHANGES.txt for HDFS-6561 which was renamed to HADOOP-10975.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618687 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:09:43 +00:00
d9ce68dd42
HADOOP-10973: Merging r1618682 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618683 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:06:31 +00:00
34165c9286
HDFS-6561. org.apache.hadoop.util.DataChecksum should support native checksumming (James Thomas via Colin Patrick McCabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618681 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:05:02 +00:00
570183a437
MAPREDUCE-6024. Shortened the time when Fetcher is stuck in retrying before concluding the failure by configuration. Contributed by Yunjiong Zhao.
...
svn merge --ignore-ancestry -c 1618677 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618679 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 17:59:32 +00:00
03a33d0f91
svn merge -c 1618659 FIXES: HADOOP-10059. RPC authentication and authorization metrics overflow to negative values on busy clusters. Contributed by Tsuyoshi OZAWA and Akira AJISAKA
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618661 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 16:35:11 +00:00
0b20086da1
MAPREDUCE-6033. Updated access check for displaying job information
...
(Yu Gao via Eric Yang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618649 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 16:14:27 +00:00
e4b1a7696c
HDFS-6783: Merging r1618635 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618636 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 15:35:21 +00:00
f9c07bd3f9
Merge r1618542 from trunk. YARN-2411. Support simple user and group mappings to queues. Contributed by Ram Venkatesh
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618543 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 06:10:14 +00:00
6f7d1fba94
HADOOP-10335: Merging r1618503 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618504 13f79535-47bb-0310-9956-ffa450edef68
2014-08-17 19:03:39 +00:00
Alejandro Abdelnur
Brandon Li
Karthik Kambatla
Allen Wittenauer
Arpit Agarwal
Chris Nauroth
Jing Zhao
Jason Darrell Lowe
Jian He
Vinayakumar B
Zhijie Shen
Colin McCabe
Andrew Wang
Todd Lipcon
Eric Yang