Return-Path: <commits-return-29884-archive-asf-public=cust-asf.ponee.io@ambari.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id B1A28200B38
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 23 Jun 2016 14:05:12 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id B0448160A58; Thu, 23 Jun 2016 12:05:12 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 081DF160A59
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 23 Jun 2016 14:05:11 +0200 (CEST)
Received: (qmail 73444 invoked by uid 500); 23 Jun 2016 12:05: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 73430 invoked by uid 99); 23 Jun 2016 12:05: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; Thu, 23 Jun 2016 12:05:11 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 05DC3E943A; Thu, 23 Jun 2016 12:05:11 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aonishuk@apache.org
To: commits@ambari.apache.org
Date: Thu, 23 Jun 2016 12:05:11 -0000
Message-Id: <c6ae9ec3bc044f8c8e66949ff93166c7@git.apache.org>
In-Reply-To: <a807cd644d05474bafcb63329c425ba8@git.apache.org>
References: <a807cd644d05474bafcb63329c425ba8@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] ambari git commit: AMBARI-17397. Ambari-server start failed
 (aonishuk)
archived-at: Thu, 23 Jun 2016 12:05:12 -0000

AMBARI-17397. Ambari-server start failed (aonishuk)


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

Branch: refs/heads/branch-2.4
Commit: b4d85b3b1c344a1ca964ee29527c2953bd763151
Parents: 19fe75d
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Thu Jun 23 15:04:56 2016 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Thu Jun 23 15:04:56 2016 +0300

----------------------------------------------------------------------
 .../common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b4d85b3b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
index 2778a72..cdb6972 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
@@ -16,7 +16,7 @@
 ~ See the License for the specific language governing permissions and
 ~ limitations under the License.
 -->
-<configuration supports_final="true" supports_do_not_extend="true">
+<configuration supports_final="true">
   <property>
     <name>oozie.service.SparkConfigurationService.spark.configurations</name>
     <value>*=spark-conf</value>