You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by tu...@apache.org on 2012/03/10 00:47:53 UTC
svn commit: r1299105 - in /incubator/oozie/trunk:
core/src/main/conf/hadoop-conf/core-site.xml
core/src/main/conf/hadoop-conf/hadoop-site.xml
docs/src/site/twiki/AG_HadoopConfiguration.twiki release-log.txt
src/main/assemblies/distro.xml
Author: tucu
Date: Fri Mar 9 23:47:52 2012
New Revision: 1299105
URL: http://svn.apache.org/viewvc?rev=1299105&view=rev
Log:
OOZIE-753 default hadoop config file does not endup in the distro and hadoop config doc typo (tucu)
Added:
incubator/oozie/trunk/core/src/main/conf/hadoop-conf/core-site.xml
Removed:
incubator/oozie/trunk/core/src/main/conf/hadoop-conf/hadoop-site.xml
Modified:
incubator/oozie/trunk/docs/src/site/twiki/AG_HadoopConfiguration.twiki
incubator/oozie/trunk/release-log.txt
incubator/oozie/trunk/src/main/assemblies/distro.xml
Added: incubator/oozie/trunk/core/src/main/conf/hadoop-conf/core-site.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/conf/hadoop-conf/core-site.xml?rev=1299105&view=auto
==============================================================================
--- incubator/oozie/trunk/core/src/main/conf/hadoop-conf/core-site.xml (added)
+++ incubator/oozie/trunk/core/src/main/conf/hadoop-conf/core-site.xml Fri Mar 9 23:47:52 2012
@@ -0,0 +1,42 @@
+<?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>
+
+ <property>
+ <name>mapreduce.jobtracker.kerberos.principal</name>
+ <value>mapred/_HOST@LOCALREALM</value>
+ </property>
+
+ <property>
+ <name>yarn.resourcemanager.principal</name>
+ <value>yarn/_HOST@LOCALREALM</value>
+ </property>
+
+ <property>
+ <name>dfs.namenode.kerberos.principal</name>
+ <value>hdfs/_HOST@LOCALREALM</value>
+ </property>
+
+ <property>
+ <name>mapreduce.framework.name</name>
+ <value>yarn</value>
+ </property>
+
+</configuration>
Modified: incubator/oozie/trunk/docs/src/site/twiki/AG_HadoopConfiguration.twiki
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/docs/src/site/twiki/AG_HadoopConfiguration.twiki?rev=1299105&r1=1299104&r2=1299105&view=diff
==============================================================================
--- incubator/oozie/trunk/docs/src/site/twiki/AG_HadoopConfiguration.twiki (original)
+++ incubator/oozie/trunk/docs/src/site/twiki/AG_HadoopConfiguration.twiki Fri Mar 9 23:47:52 2012
@@ -63,13 +63,17 @@ By default Oozie defines =*=hadoop-conf=
<verbatim>
<configuration>
- <property>
+ <property>
<name>mapreduce.jobtracker.kerberos.principal</name>
- <value>map/_HOST@${localRealm}</value>
+ <value>mapred/_HOST@LOCALREALM</value>
+ </property>
+ <property>
+ <name>yarn.resourcemanager.principal</name>
+ <value>yarn/_HOST@LOCALREALM</value>
</property>
<property>
<name>dfs.namenode.kerberos.principal</name>
- <value>hdfs/_HOST@${localRealm}</value>
+ <value>hdfs/_HOST@LOCALREALM</value>
</property>
<property>
<name>mapreduce.framework.name</name>
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1299105&r1=1299104&r2=1299105&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Fri Mar 9 23:47:52 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-753 default hadoop config file does not endup in the distro and hadoop config doc typo (tucu)
OOZIE-747 HadoopAccessorService hadoop-configs should be loaded from Hadoop -site.xml files (tucu)
OOZIE-746 JobConf/Configuration creation is inconsistent and makes things fail in odd ways (tucu)
OOZIE-744 HadoopAccessorService hadoop-configs loading logic is not 100% correct (tucu)
Modified: incubator/oozie/trunk/src/main/assemblies/distro.xml
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/src/main/assemblies/distro.xml?rev=1299105&r1=1299104&r2=1299105&view=diff
==============================================================================
--- incubator/oozie/trunk/src/main/assemblies/distro.xml (original)
+++ incubator/oozie/trunk/src/main/assemblies/distro.xml Fri Mar 9 23:47:52 2012
@@ -29,7 +29,7 @@
<directory>${basedir}/../core/src/main/conf/</directory>
<outputDirectory>/conf</outputDirectory>
<includes>
- <include>*</include>
+ <include>**</include>
</includes>
</fileSet>
<!-- Distro files, readme, licenses, etc -->