Repository: oozie
Updated Branches:
  refs/heads/oya 09c538941 -> cb6be8369


OOZIE-2813 Remove tabs and trailing whitespaces from oozie-defaul.xml (gezapeti)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/59ff7ff9
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/59ff7ff9
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/59ff7ff9

Branch: refs/heads/oya
Commit: 59ff7ff9151103d579d5436374b772e40778aa5e
Parents: d638386
Author: Gezapeti Cseh <[email protected]>
Authored: Tue Mar 21 15:11:06 2017 +0100
Committer: Gezapeti Cseh <[email protected]>
Committed: Tue Mar 21 15:11:06 2017 +0100

----------------------------------------------------------------------
 core/src/main/resources/oozie-default.xml | 186 ++++++++++++-------------
 release-log.txt                           |   1 +
 2 files changed, 94 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/59ff7ff9/core/src/main/resources/oozie-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/oozie-default.xml 
b/core/src/main/resources/oozie-default.xml
index b481887..70c34be 100644
--- a/core/src/main/resources/oozie-default.xml
+++ b/core/src/main/resources/oozie-default.xml
@@ -295,7 +295,7 @@
     </property>
 
     <!--  AuthorizationService -->
-    
+
     <property>
         <name>oozie.service.AuthorizationService.authorization.enabled</name>
         <value>false</value>
@@ -332,7 +332,7 @@
             Completed workflow jobs older than this value, in days, will be 
purged by the PurgeService.
         </description>
     </property>
-    
+
     <property>
         <name>oozie.service.PurgeService.coord.older.than</name>
         <value>7</value>
@@ -340,7 +340,7 @@
             Completed coordinator jobs older than this value, in days, will be 
purged by the PurgeService.
         </description>
     </property>
-    
+
     <property>
         <name>oozie.service.PurgeService.bundle.older.than</name>
         <value>7</value>
@@ -358,15 +358,15 @@
             specified in oozie.service.PurgeService.older.than.
         </description>
     </property>
-    
+
     <property>
-               <name>oozie.service.PurgeService.purge.limit</name>
-               <value>100</value>
-               <description>
-                       Completed Actions purge - limit each purge to this value
+        <name>oozie.service.PurgeService.purge.limit</name>
+        <value>100</value>
+        <description>
+            Completed Actions purge - limit each purge to this value
         </description>
-       </property>
-       
+    </property>
+
     <property>
         <name>oozie.service.PurgeService.purge.interval</name>
         <value>3600</value>
@@ -374,7 +374,7 @@
             Interval at which the purge service will run, in seconds.
         </description>
     </property>
-    
+
     <!-- RecoveryService -->
 
     <property>
@@ -427,7 +427,7 @@
         </description>
     </property>
 
-       <property>
+    <property>
         <name>oozie.service.RecoveryService.bundle.older.than</name>
         <value>600</value>
         <description>
@@ -460,7 +460,7 @@
             the action type as the callable type.
         </description>
     </property>
-    
+
     <property>
         <name>oozie.service.CallableQueueService.callable.next.eligible</name>
         <value>true</value>
@@ -538,23 +538,23 @@
         <value>120</value>
         <description>Default timeout for a coordinator action input check (in 
minutes) for normal job.
             -1 means infinite timeout</description>
-       </property>
+    </property>
 
-       <property>
-               <name>oozie.service.coord.default.max.timeout
-               </name>
-               <value>86400</value>
-               <description>Default maximum timeout for a coordinator action 
input check (in minutes). 86400= 60days
+    <property>
+        <name>oozie.service.coord.default.max.timeout
+        </name>
+        <value>86400</value>
+        <description>Default maximum timeout for a coordinator action input 
check (in minutes). 86400= 60days
         </description>
-       </property>
+    </property>
 
-       <property>
-               <name>oozie.service.coord.input.check.requeue.interval
-               </name>
-               <value>60000</value>
-               <description>Command re-queue interval for coordinator data 
input check (in millisecond).
+    <property>
+        <name>oozie.service.coord.input.check.requeue.interval
+        </name>
+        <value>60000</value>
+        <description>Command re-queue interval for coordinator data input 
check (in millisecond).
         </description>
-       </property>
+    </property>
 
     <property>
         
<name>oozie.service.coord.input.check.requeue.interval.additional.delay</name>
@@ -573,28 +573,28 @@ will be the requeue interval for the actions which are 
waiting for a long time w
     </property>
 
     <property>
-               <name>oozie.service.coord.default.concurrency
-               </name>
-               <value>1</value>
-               <description>Default concurrency for a coordinator job to 
determine how many maximum action should
-               be executed at the same time. -1 means infinite 
concurrency.</description>
-       </property>
+        <name>oozie.service.coord.default.concurrency
+        </name>
+        <value>1</value>
+        <description>Default concurrency for a coordinator job to determine 
how many maximum action should
+        be executed at the same time. -1 means infinite 
concurrency.</description>
+    </property>
 
     <property>
-               <name>oozie.service.coord.default.throttle
-               </name>
-               <value>12</value>
-               <description>Default throttle for a coordinator job to 
determine how many maximum action should 
-               be in WAITING state at the same time.</description>
-       </property>
+        <name>oozie.service.coord.default.throttle
+        </name>
+        <value>12</value>
+        <description>Default throttle for a coordinator job to determine how 
many maximum action should
+         be in WAITING state at the same time.</description>
+    </property>
 
-       <property>
-               <name>oozie.service.coord.materialization.throttling.factor
-               </name>
-               <value>0.05</value>
-               <description>Determine how many maximum actions should be in 
WAITING state for a single job at any time. The value is calculated by 
-               this factor X the total queue size.</description>
-       </property>
+    <property>
+        <name>oozie.service.coord.materialization.throttling.factor
+        </name>
+        <value>0.05</value>
+        <description>Determine how many maximum actions should be in WAITING 
state for a single job at any time. The value is calculated by
+         this factor X the total queue size.</description>
+    </property>
 
     <property>
         <name>oozie.service.coord.check.maximum.frequency</name>
@@ -606,9 +606,9 @@ will be the requeue interval for the actions which are 
waiting for a long time w
         </description>
     </property>
 
-       <!-- ELService -->
+    <!-- ELService -->
     <!--  List of supported groups for ELService -->
-       <property>
+    <property>
         <name>oozie.service.ELService.groups</name>
         
<value>job-submit,workflow,wf-sla-submit,coord-job-submit-freq,coord-job-submit-nofuncs,coord-job-submit-data,coord-job-submit-instances,coord-sla-submit,coord-action-create,coord-action-create-inst,coord-sla-create,coord-action-start,coord-job-wait-timeout,bundle-submit,coord-job-submit-initial-instance</value>
         <description>List of groups for different ELServices</description>
@@ -745,7 +745,7 @@ will be the requeue interval for the actions which are 
waiting for a long time w
     </property>
 
     <!-- Resolve SLA information during Workflow job submission -->
-       <property>
+    <property>
         <name>oozie.service.ELService.constants.wf-sla-submit</name>
         <value>
             MINUTES=org.apache.oozie.util.ELConstantsFunctions#SUBMIT_MINUTES,
@@ -1061,7 +1061,7 @@ will be the requeue interval for the actions which are 
waiting for a long time w
     </property>
 
     <!-- Resolve SLA information during Coordinator job submission -->
-       <property>
+    <property>
         <name>oozie.service.ELService.constants.coord-sla-submit</name>
         <value>
             MINUTES=org.apache.oozie.coord.CoordELConstants#SUBMIT_MINUTES,
@@ -1247,9 +1247,9 @@ will be the requeue interval for the actions which are 
waiting for a long time w
             include all the built in ones.
         </description>
     </property>
-    
+
         <!-- Resolve SLA information during Action creation/materialization -->
-       <property>
+    <property>
         <name>oozie.service.ELService.constants.coord-sla-create</name>
         <value> </value>
         <description>
@@ -1442,17 +1442,17 @@ will be the requeue interval for the actions which are 
waiting for a long time w
             If the 'oozie.service.JPAService.create.db.schema' property is set 
to true, this property is ignored.
         </description>
     </property>
-    
+
     <property>
         
<name>oozie.service.JPAService.validate.db.connection.eviction.interval</name>
         <value>300000</value>
         <description>
             Validates DB connections from the DB connection pool.
-            When validate db connection 'TestWhileIdle' is true, the number of 
milliseconds to sleep 
-            between runs of the idle object evictor thread.
+            When validate db connection 'TestWhileIdle' is true, the number of 
milliseconds to sleep
+             between runs of the idle object evictor thread.
         </description>
     </property>
-    
+
     <property>
         
<name>oozie.service.JPAService.validate.db.connection.eviction.num</name>
         <value>10</value>
@@ -1745,7 +1745,7 @@ will be the requeue interval for the actions which are 
waiting for a long time w
             The frequency in seconds at which the StatusTransitService will 
run.
         </description>
     </property>
-    
+
     <property>
         
<name>oozie.service.StatusTransitService.backward.support.for.coord.status</name>
         <value>false</value>
@@ -1758,7 +1758,7 @@ will be the requeue interval for the actions which are 
waiting for a long time w
             4. PREPSUSPENDED becomes SUSPENDED in coordinator job
         </description>
     </property>
-    
+
     <property>
         
<name>oozie.service.StatusTransitService.backward.support.for.states.without.error</name>
         <value>true</value>
@@ -1972,7 +1972,7 @@ will be the requeue interval for the actions which are 
waiting for a long time w
             Used when the ouptut of the ssh action is captured.
         </description>
     </property>
-    
+
     <property>
         <name>oozie.action.ssh.allow.user.at.host</name>
         <value>true</value>
@@ -2178,7 +2178,7 @@ will be the requeue interval for the actions which are 
waiting for a long time w
             ALL is the any kind of error in action executor.
         </description>
     </property>
-    
+
     <property>
         
<name>oozie.service.LiteWorkflowStoreService.user.retry.error.code.ext</name>
         <value> </value>
@@ -2187,7 +2187,7 @@ will be the requeue interval for the actions which are 
waiting for a long time w
             ALL is the any kind of error in action executor.
         </description>
     </property>
-    
+
     <property>
         <name>oozie.service.LiteWorkflowStoreService.node.def.version</name>
         <value>_oozie_inst_v_2</value>
@@ -2280,22 +2280,22 @@ will be the requeue interval for the actions which are 
waiting for a long time w
     </property>
 
     <!-- Coordinator Actions default length -->
-       <property>
-               <name>oozie.coord.actions.default.length</name>
-               <value>1000</value>
-               <description>
-                       Default number of coordinator actions to be retrieved 
by the info command
-               </description>
-       </property>
-
-       <!-- ForkJoin validation -->
-       <property>
-               <name>oozie.validate.ForkJoin</name>
-               <value>true</value>
-               <description>
-                       If true, fork and join should be validated at wf 
submission time.
-               </description>
-       </property>
+    <property>
+        <name>oozie.coord.actions.default.length</name>
+        <value>1000</value>
+        <description>
+            Default number of coordinator actions to be retrieved by the info 
command
+        </description>
+    </property>
+
+    <!-- ForkJoin validation -->
+    <property>
+        <name>oozie.validate.ForkJoin</name>
+        <value>true</value>
+        <description>
+            If true, fork and join should be validated at wf submission time.
+        </description>
+    </property>
 
     <property>
         <name>oozie.workflow.parallel.fork.action.start</name>
@@ -2306,23 +2306,23 @@ will be the requeue interval for the actions which are 
waiting for a long time w
         </description>
     </property>
 
-       <property>
-               <name>oozie.coord.action.get.all.attributes</name>
-               <value>false</value>
-               <description>
-                       Setting to true is not recommended as coord job/action 
info will bring all columns of the action in memory.
-                       Set it true only if backward compatibility for 
action/job info is required.
-               </description>
-       </property>
-
-       <property>
-               
<name>oozie.service.HadoopAccessorService.supported.filesystems</name>
-               <value>hdfs,hftp,webhdfs</value>
-               <description>
-                       Enlist the different filesystems supported for 
federation. If wildcard "*" is specified,
-                       then ALL file schemes will be allowed.
-               </description>
-       </property>
+    <property>
+        <name>oozie.coord.action.get.all.attributes</name>
+        <value>false</value>
+        <description>
+            Setting to true is not recommended as coord job/action info will 
bring all columns of the action in memory.
+            Set it true only if backward compatibility for action/job info is 
required.
+        </description>
+    </property>
+
+    <property>
+        <name>oozie.service.HadoopAccessorService.supported.filesystems</name>
+        <value>hdfs,hftp,webhdfs</value>
+        <description>
+            Enlist the different filesystems supported for federation. If 
wildcard "*" is specified,
+            then ALL file schemes will be allowed.
+        </description>
+    </property>
 
     <property>
         <name>oozie.service.URIHandlerService.uri.handlers</name>

http://git-wip-us.apache.org/repos/asf/oozie/blob/59ff7ff9/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 8358124..f461753 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.4.0 release (trunk - unreleased)
 
+OOZIE-2813 Remove tabs and trailing whitespaces from oozie-defaul.xml 
(gezapeti)
 OOZIE-2830 Use tarLongFileMode with 'gnu' in the assembly plugin's 
configuration (asasvari via gezapeti)
 OOZIE-2819 Make Oozie REST API accept multibyte characters for script Actions 
(asasvari via rkanter)
 OOZIE-2750 Spelling errors in the log messages and exception messages (gsohn 
via rkanter)

Reply via email to