Return-Path: 
 <commits-return-22201-apmail-ambari-commits-archive=ambari.apache.org@ambari.apache.org>
X-Original-To: apmail-ambari-commits-archive@www.apache.org
Delivered-To: apmail-ambari-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1BC49186BC
	for <apmail-ambari-commits-archive@www.apache.org>;
 Tue, 17 Nov 2015 02:40:12 +0000 (UTC)
Received: (qmail 34827 invoked by uid 500); 17 Nov 2015 02:40:12 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 34616 invoked by uid 500); 17 Nov 2015 02:40:11 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 34513 invoked by uid 99); 17 Nov 2015 02:40:11 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2015 02:40:11 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 71E90E0B31; Tue, 17 Nov 2015 02:40:11 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: alejandro@apache.org
To: commits@ambari.apache.org
Message-Id: <d5b72fc140be4e1a8dfc53f741ab2b52@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-13867. Stop-and-Start Upgrade: Falcon
 Server Web UI alert after EU HDP-2.1 -> HDP-2.3 (Swapan Shridhad via
 alejandro)
Date: Tue, 17 Nov 2015 02:40:11 +0000 (UTC)

Repository: ambari
Updated Branches:
  refs/heads/trunk 819e4e799 -> b5ad10adc


AMBARI-13867. Stop-and-Start Upgrade: Falcon Server Web UI alert after EU HDP-2.1 -> HDP-2.3 (Swapan Shridhad via alejandro)


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

Branch: refs/heads/trunk
Commit: b5ad10adcb1626162ccf64e67f8ee87140c3f8d1
Parents: 819e4e7
Author: Alejandro Fernandez <afernandez@hortonworks.com>
Authored: Mon Nov 16 18:38:53 2015 -0800
Committer: Alejandro Fernandez <afernandez@hortonworks.com>
Committed: Mon Nov 16 18:38:53 2015 -0800

----------------------------------------------------------------------
 .../stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml   |  4 ++++
 .../resources/stacks/HDP/2.2/upgrades/config-upgrade.xml | 11 +++++++++++
 2 files changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ad10ad/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
index 449b077..a21baf1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml
@@ -306,6 +306,10 @@
         <task xsi:type="configure" id="hdp_2_3_0_0_oozie_remove_redundant_configurations"/>
       </execute-stage>
 
+      <!--FALCON-->
+      <execute-stage service="FALCON" component="FALCON_SERVER" title="Apply config changes for Falcon Server">
+        <task xsi:type="configure" id="hdp_2_2_0_0_falcon_application_services"/>
+      </execute-stage>
 
       <!--STORM-->
       <execute-stage service="STORM" component="NIMBUS" title="Apply config changes for Nimbus">

http://git-wip-us.apache.org/repos/asf/ambari/blob/b5ad10ad/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
index 9b3ab73..8c3e7da 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/config-upgrade.xml
@@ -30,6 +30,17 @@
       </component>
     </service>
 
+    <service name="FALCON">
+      <component name="FALCON_SERVER">
+        <changes>
+          <definition xsi:type="configure" id="hdp_2_2_0_0_falcon_application_services">
+            <type>falcon-startup.properties</type>
+            <set key="*.application.services" value="org.apache.falcon.security.AuthenticationInitializationService,&#92;&#xA;      org.apache.falcon.workflow.WorkflowJobEndNotificationService,&#92;&#xA;      org.apache.falcon.service.ProcessSubscriberService,&#92;&#xA;      org.apache.falcon.entity.store.ConfigurationStore,&#92;&#xA;      org.apache.falcon.rerun.service.RetryService,&#92;&#xA;      org.apache.falcon.rerun.service.LateRunService,&#92;&#xA;      org.apache.falcon.service.LogCleanupService,&#92;&#xA;      org.apache.falcon.metadata.MetadataMappingService"/>
+          </definition>
+        </changes>
+      </component>
+    </service>
+
     <service name="HIVE">
       <component name="HIVE_SERVER">
         <changes>