hadoop/hadoop-common-project/hadoop-kms
Xiao Chen b6a60d715d HDFS-10489. Deprecate dfs.encryption.key.provider.uri for HDFS encryption zones. Contributed by Xiao Chen.
(cherry picked from commit ea839bd48e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
2016-09-19 16:38:18 -07:00
..
dev-support HADOOP-10433. Key Management Server based on KeyProvider API. (tucu) 2014-08-21 18:58:53 +00:00
src HDFS-10489. Deprecate dfs.encryption.key.provider.uri for HDFS encryption zones. Contributed by Xiao Chen. 2016-09-19 16:38:18 -07:00
pom.xml Preparing for 2.9.0 development: mvn versions:set -DnewVersion=2.9.0 2015-11-25 17:47:22 -08:00