Repository: oozie Updated Branches: refs/heads/master ce3976e47 -> 02c115693
OOZIE-2048 HadoopAccessorService should also process ssl_client.xml (venkatnrangan via bzhang) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/02c11569 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/02c11569 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/02c11569 Branch: refs/heads/master Commit: 02c115693bfb38b81c5bea9ff9cf6698aa0187b3 Parents: ce3976e Author: Bowen Zhang <[email protected]> Authored: Fri Oct 31 10:25:52 2014 -0700 Committer: Bowen Zhang <[email protected]> Committed: Fri Oct 31 10:25:52 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/oozie/service/HadoopAccessorService.java | 2 +- docs/src/site/twiki/AG_HadoopConfiguration.twiki | 2 +- release-log.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/02c11569/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java b/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java index db14d11..0be840d 100644 --- a/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java +++ b/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java @@ -186,7 +186,7 @@ public class HadoopAccessorService implements Service { } private static final String[] HADOOP_CONF_FILES = - {"core-site.xml", "hdfs-site.xml", "mapred-site.xml", "yarn-site.xml", "hadoop-site.xml"}; + {"core-site.xml", "hdfs-site.xml", "mapred-site.xml", "yarn-site.xml", "hadoop-site.xml", "ssl-client.xml"}; private Configuration loadHadoopConf(File dir) throws IOException { http://git-wip-us.apache.org/repos/asf/oozie/blob/02c11569/docs/src/site/twiki/AG_HadoopConfiguration.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/AG_HadoopConfiguration.twiki b/docs/src/site/twiki/AG_HadoopConfiguration.twiki index fd01788..d907296 100644 --- a/docs/src/site/twiki/AG_HadoopConfiguration.twiki +++ b/docs/src/site/twiki/AG_HadoopConfiguration.twiki @@ -41,7 +41,7 @@ and its value must follow the pattern =[<AUTHORITY>=<HADOOP_CONF_DIR>,]*=. Where the Hadoop service (JobTracker, HDFS). The =<HADOO_CONF_DIR>= is a Hadoop configuration directory. If the specified directory is a relative path, it will be looked under the Oozie configuration directory. And absolute path can also be specified. Oozie will load the Hadoop =*-site.xml= files in the following order: core-site.xml, hdfs-site.xml, - mapred-site.xml, yarn-site.xml, hadoop-site.xml. + mapred-site.xml, yarn-site.xml, hadoop-site.xml, ssl-client.xml. In addition to explicit authorities, a '*' wildcard is supported. The configuration file associated with the wildcard will be used as default if there is no configuration for the requested Hadoop service. http://git-wip-us.apache.org/repos/asf/oozie/blob/02c11569/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 086707c..83f736e 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.2.0 release (trunk - unreleased) +OOZIE-2048 HadoopAccessorService should also process ssl_client.xml (venkatnrangan via bzhang) OOZIE-2047 Oozie does not support Hive tables that use datatypes introduced since Hive 0.8 (venkatnrangan via bzhang) OOZIE-1808 Change DG_QuickStart.twiki to reflect changes in sharelib installation (ryota) OOZIE-1891 Parametrize surefire argLine to bump up heap memory for testing (ryota)
