Repository: oozie Updated Branches: refs/heads/master 665ed3e0d -> d0921f691
OOZIE-2284 HBaseCredentials should only add hbase-default.xml and hbase-site.xml to actionConf (rohini) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/d0921f69 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/d0921f69 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/d0921f69 Branch: refs/heads/master Commit: d0921f6912ec32b1e574598a1a9b8f3ffafffc05 Parents: 665ed3e Author: Rohini Palaniswamy <[email protected]> Authored: Wed Jul 1 16:49:52 2015 -0700 Committer: Rohini Palaniswamy <[email protected]> Committed: Wed Jul 1 16:49:52 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/oozie/action/hadoop/HbaseCredentials.java | 3 ++- release-log.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/d0921f69/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java b/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java index c4633ed..d716379 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java @@ -58,7 +58,8 @@ public class HbaseCredentials extends Credentials { void copyHbaseConfToJobConf(JobConf jobConf, CredentialsProperties props) { // Create configuration using hbase-site.xml/hbase-default.xml - Configuration hbaseConf = HBaseConfiguration.create(); + Configuration hbaseConf = new Configuration(false); + HBaseConfiguration.addHbaseResources(hbaseConf); // copy cred props to hbaseconf and override if values already exists addPropsConf(props, hbaseConf); // copy cred props to jobconf and override if values already exist http://git-wip-us.apache.org/repos/asf/oozie/blob/d0921f69/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 7b85fea..521a6ca 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2284 HBaseCredentials should only add hbase-default.xml and hbase-site.xml to actionConf (rohini) OOZIE-2286 Update Log4j and Log4j-extras to latest 1.2.x release (rkanter) OOZIE-2250 Show log for WAITING and TIMEDOUT coord actions (kailongs via rohini) OOZIE-2262 Fix log streaming from other server with start/end filter (kailongs via rohini)
