Author: tucu
Date: Mon Apr 2 13:24:20 2012
New Revision: 1308345
URL: http://svn.apache.org/viewvc?rev=1308345&view=rev
Log:
OOZIE-798 it would be nice to keep action specific configs in action-conf
instead of hadoop-conf (rvs via tucu)
Added:
incubator/oozie/trunk/core/src/main/conf/action-conf/
incubator/oozie/trunk/core/src/main/conf/action-conf/hive.xml
Modified:
incubator/oozie/trunk/core/src/main/resources/oozie-default.xml
incubator/oozie/trunk/release-log.txt
Added: incubator/oozie/trunk/core/src/main/conf/action-conf/hive.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/conf/action-conf/hive.xml?rev=1308345&view=auto
==============================================================================
--- incubator/oozie/trunk/core/src/main/conf/action-conf/hive.xml (added)
+++ incubator/oozie/trunk/core/src/main/conf/action-conf/hive.xml Mon Apr 2
13:24:20 2012
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration>
+ <!-- An example of setting default properties for Hive action.
+ This could be useful with Hadoop versions that have deprecated
+ HADOOP_HOME that Hive still relies on.
+
+ <property>
+ <name>hadoop.bin.path</name>
+ <value>/usr/bin/hadoop</value>
+ </property>
+
+ <property>
+ <name>hadoop.config.dir</name>
+ <value>/etc/hadoop/conf</value>
+ </property>
+ -->
+</configuration>
Modified: incubator/oozie/trunk/core/src/main/resources/oozie-default.xml
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/resources/oozie-default.xml?rev=1308345&r1=1308344&r2=1308345&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/resources/oozie-default.xml (original)
+++ incubator/oozie/trunk/core/src/main/resources/oozie-default.xml Mon Apr 2
13:24:20 2012
@@ -1379,7 +1379,7 @@
<property>
<name>oozie.service.HadoopAccessorService.action.configurations</name>
- <value>*=hadoop-conf</value>
+ <value>*=action-conf</value>
<description>
Comma separated AUTHORITY=ACTION_CONF_DIR, where AUTHORITY is the
HOST:PORT of
the Hadoop MapReduce service (JobTracker, YARN). The wildcard '*'
configuration is
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1308345&r1=1308344&r2=1308345&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Mon Apr 2 13:24:20 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-798 it would be nice to keep action specific configs in action-conf
instead of hadoop-conf (rvs via tucu)
OOZIE-790 default concurrency value is inconsistent between doc and
implementation.(Mohammad)
OOZIE-793 remove HiveMain check for HADOOP_HOME (tucu)
OOZIE-792 add default action configs per cluster (tucu)
