Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ambari-dev@ambari.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jluniya@apache.org
To: commits@ambari.apache.org
Message-Id: <60a711417f79447e87a9d10a30acc62f@git.apache.org>
Subject: ambari git commit: AMBARI-16463: Change Falcon startup properties to
 specify actimq-all.jar instead of active-mq for 2.5 version of the HDP stack
 (Venkat Ranganathan via jluniya)
Date: Fri, 13 May 2016 23:48:49 +0000 (UTC)
archived-at: Fri, 13 May 2016 23:48:50 -0000

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 dfac1a7e0 -> 0515d6e21


AMBARI-16463: Change Falcon startup properties to specify actimq-all.jar instead of active-mq for 2.5 version of the HDP stack (Venkat Ranganathan via jluniya)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0515d6e2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0515d6e2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0515d6e2

Branch: refs/heads/branch-2.4
Commit: 0515d6e211b61a89bbb2975f311fbf12e8f44e93
Parents: dfac1a7
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Fri May 13 16:48:00 2016 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Fri May 13 16:48:41 2016 -0700

----------------------------------------------------------------------
 .../configuration/falcon-startup.properties.xml | 29 ++++++++++++++++++++
 .../configuration/falcon-startup.properties.xml | 29 --------------------
 2 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0515d6e2/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml
new file mode 100644
index 0000000..77dd386
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/FALCON/configuration/falcon-startup.properties.xml
@@ -0,0 +1,29 @@
+<?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 supports_final="false">
+
+  <property>
+    <name>*.shared.libs</name>
+    <value>activemq-all,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3,commons-el</value>
+    <description></description>
+  </property>
+
+</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0515d6e2/ambari-server/src/main/resources/stacks/HDP/2.5/services/configuration/falcon-startup.properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/configuration/falcon-startup.properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/configuration/falcon-startup.properties.xml
deleted file mode 100644
index 77dd386..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/configuration/falcon-startup.properties.xml
+++ /dev/null
@@ -1,29 +0,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 supports_final="false">
-
-  <property>
-    <name>*.shared.libs</name>
-    <value>activemq-all,ant,geronimo-j2ee-management,jms,json-simple,oozie-client,spring-jms,commons-lang3,commons-el</value>
-    <description></description>
-  </property>
-
-</configuration>