Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,284 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

1822 Commits

Author SHA1 Message Date
Alejandro Abdelnur e42b889bdb HADOOP-9989. Bug introduced in HADOOP-9374, which parses the -tokenCacheFile as binary file but set it to the configuration as JSON file. (zxu via tucu) 2014-09-09 22:20:49 -07:00
Alejandro Abdelnur d0e2116502 HADOOP-11077. NPE if hosts not specified in ProxyUsers. (gchanan via tucu) 2014-09-09 22:20:43 -07:00
cnauroth 7d9c45f778 HADOOP-11057. checknative command to probe for winutils.exe on windows. Contributed by Xiaoyu Yao. 
(cherry picked from commit 6dae4b430c)
 2014-09-09 21:39:11 -07:00
cnauroth ba44099f8e HADOOP-10925. Change attribution in CHANGES.txt from trunk to 2.6.0. 
(cherry picked from commit 3e8f353c8e)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2014-09-09 14:17:44 -07:00
Chris Nauroth b601e69d9d HADOOP-10925 Compilation fails in native link0 function on Windows. 2014-09-09 16:25:14 +01:00
Colin McCabe da118bb113 HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615223 13f79535-47bb-0310-9956-ffa450edef68

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
 2014-09-08 22:00:51 -07:00
Alejandro Abdelnur d510cefd14 HADOOP-11071. KMSClientProvider should drain the local generated EEK cache on key rollover. (tucu) 2014-09-08 11:32:20 -07:00
cnauroth 17b44f11f8 Credential Provider related Unit Test Failure on Windows. Contributed by Xiaoyu Yao. 
(cherry picked from commit 302d9a0a0d)
 2014-09-08 09:31:32 -07:00
Alejandro Abdelnur 8bf2a0de69 HADOOP-11069. KMSClientProvider should use getAuthenticationMethod() to determine if in proxyuser mode or not. (tucu) 2014-09-05 22:01:13 -07:00
Alejandro Abdelnur e98c244730 HADOOP-11070. Create MiniKMS for testing. (tucu) 2014-09-05 22:01:06 -07:00
Karthik Kambatla e392229676 HADOOP-11065. Rat check should exclude **/build/**. (kasha) 
(cherry picked from commit 0571b4561b)
 2014-09-05 13:10:12 -07:00
arp 27c53a1d67 HADOOP-11067 [HDFS-6998]. Fix CHANGES.txt 2014-09-05 11:18:30 -07:00
arp 624e793ad6 HDFS-6998. warning message 'ssl.client.truststore.location has not been set' gets printed for hftp command. (Contributed by Xiaoyu Yao) 2014-09-05 11:14:24 -07:00
cnauroth c035365338 HADOOP-11063. KMS cannot deploy on Windows, because class names are too long. Contributed by Chris Nauroth. 
(cherry picked from commit b44b2ee4ad)
 2014-09-04 12:09:34 -07:00
Alejandro Abdelnur 2267ba1af7 HADOOP-11060. Create a CryptoCodec test that verifies interoperability between the JCE and OpenSSL implementations. (hitliuyi via tucu) 2014-09-04 09:22:10 -07:00
Alejandro Abdelnur dc2e38780b HADOOP-11015. Http server/client utils to propagate and recreate Exceptions from server to client. (tucu) 2014-09-04 09:14:07 -07:00
Alejandro Abdelnur dd55461cda HADOOP-11054. Add a KeyProvider instantiation based on a URI. (tucu) 2014-09-04 09:14:02 -07:00
Colin Patrick Mccabe 7b287d5ba6 HADOOP-11056. OsSecureRandom.setConf() might leak file descriptors. Contributed by Yongjun Zhang. 
(cherry picked from commit 8f1a668575)
 2014-09-03 19:39:37 -07:00
Alejandro Abdelnur a7d8ede309 HADOOP-10863. KMS should have a blacklist for decrypting EEKs. (asuresh via tucu) 
Conflicts:
	hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMS.java
 2014-09-03 15:20:28 -07:00
Karthik Kambatla 9855e884cb HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha) 
(cherry picked from commit ce0462129f)
 2014-09-03 09:39:32 -07:00
Andrew Wang 9daf035fbc HDFS-6954. With crypto, no native lib systems are too verbose. Contributed by Charles Lamb. 
(cherry picked from commit a0ccf83dfd)
 2014-09-02 14:22:46 -07:00
Steve Loughran c50371c8b5 Fix hadoop-common-project/hadoop-common/src/main/native/README to current mail list and URL 2014-09-02 20:28:11 +01:00
Brandon Li ee3e812605 HADOOP-10990. Add missed NFSv3 request and response classes. Contributed by Brandon Li 
(cherry picked from commit bad5f38d47)
 2014-09-02 11:29:35 -07:00
Jason Lowe 0a582c77ef HADOOP-11012. hadoop fs -text of zero-length file causes EOFException. Contributed by Eric Payne 
(cherry picked from commit 01e8f056d9)
 2014-09-02 18:25:03 +00:00
Allen Wittenauer a96696bdc3 HADOOP-11036. Add build directory to .gitignore (Tsuyoshi OZAWA via aw) 
(cherry picked from commit e1109fb656)
 2014-09-02 10:12:09 -07:00
Benoy Antony 39352a7a82 HADOOP-10833. Remove unused cache in UserProvider. (Benoy Antony) 
(cherry picked from commit 258c7d0f53)
 2014-08-30 13:08:04 -07:00
Karthik Kambatla 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
Andrew Wang 21bb77f997 Add CHANGES.txt for HADOOP-11021. 
(cherry picked from commit 93010faf10)
 2014-08-29 14:56:15 -07:00
Alejandro Abdelnur 5889f4d5f3 HADOOP-10994. KeyProviderCryptoExtension should use CryptoCodec for generation/decryption of keys. (tucu) 2014-08-29 14:22:15 -07:00
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Andrew Wang 7cdb619cc5 HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. Contributed by Lei Xu. 
(cherry picked from commit 7119bd49c8)
 2014-08-28 17:41:43 -07:00
Todd Lipcon ed2a997f49 HDFS-6865. Byte array native checksumming on client side. Contributed by James Thomas. 
(cherry picked from commit ab638e77b8)
 2014-08-28 16:49:32 -07:00
Alejandro Abdelnur 1a65717ffa Removing CHANGES-fs-encryption.txt files 2014-08-28 15:13:24 -07:00
Alejandro Abdelnur 5c37f02e27 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-08-28 15:05:07 -07:00
Alejandro Abdelnur c77bd85b62 HDFS-6134 and HADOOP-10150 subtasks. 2014-08-28 15:03:08 -07:00
Suresh Srinivas 631dea88d8 HADOOP-8815. RandomDatum needs to override hashCode(). Contributed by Brandon Li. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1389661 13f79535-47bb-0310-9956-ffa450edef68

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

(cherry picked from commit 3ede27f4557c9e90430a7a3f385b8be243e89688)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2014-08-28 15:02:57 -07:00
Alejandro Abdelnur b7367dc6a2 HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) 2014-08-28 14:47:23 -07:00
Karthik Kambatla fc99a6b80d HADOOP-11001. Fix test-patch to work with the git repo. (kasha) 
(cherry picked from commit c4c9a78411)
 2014-08-27 23:13:49 -07:00
Colin Patrick Mccabe 66ba7b2e7c HADOOP-10957. The globber will sometimes erroneously return a permission denied exception when there is a non-terminal wildcard. 
(cherry picked from commit 7a16731191)
 2014-08-27 19:52:23 -07:00
Colin Patrick Mccabe 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
Colin Patrick Mccabe fdc15db2e1 HDFS-4486. Add log category for long-running DFSClient notices. Contributed by Zhe Zhang. 
(cherry picked from commit 225569ece2)
 2014-08-27 13:45:10 -07:00
brandonli 99d8434511 HDFS-6892. Add XDR packaging method for each NFS request. Contributed by Brandon Li 
(cherry picked from commit cd9182d8b5)
 2014-08-27 11:15:13 -07:00
Karthik Kambatla 2a3c8331fe Add a section for 2.5.1 in CHANGES.txt 
(cherry picked from commit dc154ab86d)
 2014-08-27 00:56:17 -07:00
Arpit Agarwal 33229c1299 HADOOP-10282: Merging r1619938 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619939 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 22:16:37 +00:00
Allen Wittenauer 64abf82242 HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619888 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 18:25:57 +00:00
Christopher Douglas 7ca74a025e Revert HADOOP-10759 due to aw veto 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619692 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 07:17:51 +00:00
Chris Nauroth a6f5f71a12 HADOOP-10989. Merging change r1619659 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619660 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 04:05:56 +00:00
Allen Wittenauer 20ab9d7d4a HADOOP-8896. Javadoc points to Wrong Reader and Writer classes in SequenceFile (Ray Chiang via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619633 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 23:59:48 +00:00
Jason Darrell Lowe 23b4c0b6c1 HADOOP-10893. isolated classloader on the client side. Contributed by Sangjin Lee 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619605 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 21:41:24 +00:00
Alejandro Abdelnur 572a158cf8 HADOOP-10488. TestKeyProviderFactory fails randomly. (tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619554 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 19:00:08 +00:00
Alejandro Abdelnur dce6f78df6 Fix hadoop-common CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619553 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 19:00:07 +00:00
Alejandro Abdelnur eff192af69 HADOOP-10698. KMS, add proxyuser support. (tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619552 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 19:00:06 +00:00
Alejandro Abdelnur c065137496 HADOOP-10967. Improve DefaultCryptoExtension#generateEncryptedKey performance. (hitliuyi via tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619551 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 19:00:03 +00:00
Alejandro Abdelnur 4dea3e8192 HADOOP-10770. KMS add delegation token support. (tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619550 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 19:00:01 +00:00
Alejandro Abdelnur 59c16d7947 HADOOP-10224. JavaKeyStoreProvider has to protect against corrupting underlying store. (asuresh via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619549 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:56 +00:00
Alejandro Abdelnur 6d2281b4c6 HADOOP-10862. Miscellaneous trivial corrections to KMS classes. (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@1619548 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:54 +00:00
Alejandro Abdelnur daed032553 HADOOP-10939. Fix TestKeyProviderFactory testcases to use default 128 bit length keys. Contributed by Arun Suresh. 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619547 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:52 +00:00
Alejandro Abdelnur bcff355417 HADOOP-10918. JMXJsonServlet fails when used within Tomcat. (tucu) 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619546 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:51 +00:00
Alejandro Abdelnur 05daefb1a8 HADOOP-10936. Change default KeyProvider bitlength to 128. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619545 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:48 +00:00
Alejandro Abdelnur 331421c2a4 HADOOP-10937. Need to set version name correctly before decrypting EEK. Contributed by Arun Suresh. 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619544 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:46 +00:00
Alejandro Abdelnur c111c9379b HADOOP-10920. site plugin couldn't parse hadoop-kms index.apt.vm. Contributed by Akira Ajisaka. 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619543 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:44 +00:00
Alejandro Abdelnur e12d421ca2 HADOOP-10793. KeyShell args should use single-dash style. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619542 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:59:43 +00:00
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Alejandro Abdelnur 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
Karthik Kambatla 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