b781c3bc88
HADOOP-10756. KMS audit log should consolidate successful similar requests. (asuresh via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619541 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:41 +00:00
c6eee38b81
HADOOP-10891. Add EncryptedKeyVersion factory method to KeyProviderCryptoExtension. (wang)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619540 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:38 +00:00
30fe1849c3
HADOOP-10881. Clarify usage of encryption and encrypted encryption key in KeyProviderCryptoExtension. (wang)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619539 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:36 +00:00
27609a184d
HADOOP-10826. Iteration on KeyProviderFactory.serviceLoader is thread-unsafe. (benoyantony viat tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619538 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:34 +00:00
03f9e28a7e
HADOOP-10720. KMS: Implement generateEncryptedKey and decryptEncryptedKey in the REST API. (asuresh via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619537 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:32 +00:00
7f8ac5b812
HADOOP-10750. KMSKeyProviderCache should be in hadoop-common. (asuresh via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619536 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:29 +00:00
f21bd86958
HADOOP-10842. CryptoExtension generateEncryptedKey method should receive the key name. (asuresh via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619535 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:25 +00:00
0197f57ff4
HADOOP-10841. EncryptedKeyVersion should have a key name property. (asuresh via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619534 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:24 +00:00
db646f04f3
HADOOP-10817. ProxyUsers configuration should support configurable prefixes. (tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619533 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:22 +00:00
9467bef8ea
HADOOP-10816. KeyShell returns -1 on error to the shell, should be 1. (Mike Yoder via wang)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619532 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:21 +00:00
0ef751797e
HADOOP-10824. Refactor KMSACLs to avoid locking. (Benoy Antony via umamahesh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619531 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:19 +00:00
b3904630d6
HADOOP-10736. Add key attributes to the key shell. Contributed by Mike Yoder.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619530 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:18 +00:00
1b65ed7795
HADOOP-10812. Delegate KeyProviderExtension#toString to underlying KeyProvider. (wang)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619529 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:16 +00:00
bd7e551bc1
HADOOP-10769. Create KeyProvider extension to handle delegation tokens. Contributed by Arun Suresh.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619528 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:15 +00:00
65923ca24e
HADOOP-10719. Add generateEncryptedKey and decryptEncryptedKey methods to KeyProvider. (asuresh via tucu)
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619527 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:13 +00:00
edb969c3ff
HADOOP-10757. KeyProvider KeyVersion should provide the key name. (asuresh via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619526 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:11 +00:00
2b3010483d
HADOOP-10695. KMSClientProvider should respect a configurable timeout. (yoderme via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619525 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:09 +00:00
27b1f41455
HADOOP-10696. Add optional attributes to KeyProvider Options and Metadata. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619524 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:59:07 +00:00
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
Alejandro Abdelnur
Brandon Li
Karthik Kambatla
Allen Wittenauer
Arpit Agarwal
Chris Nauroth
Jing Zhao
Jason Darrell Lowe
Jian He
Vinayakumar B
Zhijie Shen