You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2014/12/02 15:31:23 UTC
incubator-falcon git commit: FALCON-909 Remove names of the
contributors from xmls and code. Contributed by Ruslan Ostafiychuk
Repository: incubator-falcon
Updated Branches:
refs/heads/master 96c18c3c5 -> 9f1efe096
FALCON-909 Remove names of the contributors from xmls and code. Contributed by Ruslan Ostafiychuk
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/9f1efe09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/9f1efe09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/9f1efe09
Branch: refs/heads/master
Commit: 9f1efe09675c0eddc4a0ad04722b365d47047ca9
Parents: 96c18c3
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Tue Dec 2 15:52:01 2014 +0200
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Tue Dec 2 16:28:09 2014 +0200
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 +
.../workflows/impression_rc_workflow.xml | 69 --------------------
.../resources/workflows/phailFs_workflow.xml | 32 ---------
3 files changed, 2 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9f1efe09/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 09cd3b5..51fca02 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -33,6 +33,8 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-909 Remove names of the contributors from xmls and code (Ruslan Ostafiychuk)
+
FALCON-926 Fix problems found by findbugs in merlin and merlin-core (Ruslan Ostafiychuk and
Raghav Kumar Gautam via Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9f1efe09/falcon-regression/merlin/src/test/resources/workflows/impression_rc_workflow.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/workflows/impression_rc_workflow.xml b/falcon-regression/merlin/src/test/resources/workflows/impression_rc_workflow.xml
deleted file mode 100644
index f62fc8b..0000000
--- a/falcon-regression/merlin/src/test/resources/workflows/impression_rc_workflow.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--
- 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.
--->
-<workflow-app xmlns='uri:oozie:workflow:0.3' name='impressionrc-conversion'>
- <start to='impressionrc-conversion-store' />
- <action name='impressionrc-conversion-store'>
- <java>
- <job-tracker>${jobTracker}</job-tracker>
- <name-node>${nameNode}</name-node>
- <prepare>
- <delete path="${Output}"/>
- <delete path="${wf:conf('Output.stats')}"/>
- <delete path="${wf:conf('Output.tmp')}"/>
- <delete path="${ImpressionPath}"/>
- </prepare>
- <configuration>
- <property>
- <name>mapred.job.queue.name</name>
- <value>${queueName}</value>
- </property>
- <property>
- <name>mapred.job.priority</name>
- <value>${jobPriority}</value>
- </property>
- <property>
- <name>oozie.launcher.mapred.job.priority</name>
- <value>${jobPriority}</value>
- </property>
- </configuration>
- <main-class>com.inmobi.grid.io.Driver</main-class>
- <arg>-Dmapred.job.queue.name=${queueName}</arg>
- <arg>-Dmapred.job.priority=${jobPriority}</arg>
- <arg>-Dlibpath=${wf:conf("oozie.libpath")}</arg>
- <arg>-Dhbase.zookeeper.quorum=${wf:conf("hbase.zookeeper.quorum")}</arg>
- <arg>-Dhbase.zookeeper.property.clientPort=${wf:conf("hbase.zookeeper.property.clientPort")}</arg>
- <arg>-Dcolo.name=${wf:conf("colo.name")}</arg>
- <arg>-Dimpression.out.path=${ImpressionPath}</arg>
- <arg>-logtype</arg><arg>${logType}</arg>
- <arg>-inputpath</arg><arg>${Input}</arg>
- <arg>-outputpath</arg><arg>${Output}</arg>
- <arg>-statspath</arg><arg>${wf:conf("Output.stats")}</arg>
- <arg>-stagingpath</arg><arg>${wf:conf("Output.tmp")}</arg>
- </java>
- <ok to="end" />
- <error to="fail" />
- </action>
-
- <kill name="fail">
- <message>Workflow failed, error
- message[${wf:errorMessage(wf:lastErrorNode())}]
- </message>
- </kill>
- <end name='end' />
-</workflow-app>
-
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/9f1efe09/falcon-regression/merlin/src/test/resources/workflows/phailFs_workflow.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/workflows/phailFs_workflow.xml b/falcon-regression/merlin/src/test/resources/workflows/phailFs_workflow.xml
deleted file mode 100644
index 4c52ef2..0000000
--- a/falcon-regression/merlin/src/test/resources/workflows/phailFs_workflow.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- 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.
--->
-<workflow-app xmlns="uri:oozie:workflow:0.2" name="aggregator-wf">
- <start to="aggregator"/>
- <action name="aggregator">
- <fs>
- <delete path="${outputData}/${nominalTime}"/>
- <mkdir path='${outputData}/${nominalTime}'/>
- </fs>
- <ok to="end"/>
- <error to="fail"/>
- </action>
- <kill name="fail">
- <message>Map/Reduce failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
- </kill>
- <end name="end"/>
-</workflow-app>