Return-Path: 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 C01B1200BDC for ; Wed, 14 Dec 2016 14:26:47 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BEC88160B19; Wed, 14 Dec 2016 13:26:47 +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 1067E160B13 for ; Wed, 14 Dec 2016 14:26:46 +0100 (CET) Received: (qmail 13420 invoked by uid 500); 14 Dec 2016 13:26:46 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 13411 invoked by uid 99); 14 Dec 2016 13:26:46 -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; Wed, 14 Dec 2016 13:26:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DDD2AE35C8; Wed, 14 Dec 2016 13:26:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dsen@apache.org To: commits@ambari.apache.org Message-Id: <6f30f118c83248fc9301baa838828169@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-19199 AMS config types created by upgrade were never marked as selected (dsen) Date: Wed, 14 Dec 2016 13:26:45 +0000 (UTC) archived-at: Wed, 14 Dec 2016 13:26:47 -0000 Repository: ambari Updated Branches: refs/heads/trunk 1f38a7094 -> b50546e0c AMBARI-19199 AMS config types created by upgrade were never marked as selected (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b50546e0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b50546e0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b50546e0 Branch: refs/heads/trunk Commit: b50546e0cfa1fdb415d10d0e197c72fd7c9a195f Parents: 1f38a70 Author: Dmytro Sen Authored: Wed Dec 14 15:26:22 2016 +0200 Committer: Dmytro Sen Committed: Wed Dec 14 15:26:22 2016 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b50546e0/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java index 380a1e6..90a6ed6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java @@ -561,7 +561,6 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog { return; } else if (oldConfig == null) { oldConfigProperties = new HashMap(); - newTag = "version1"; } else { oldConfigProperties = oldConfig.getProperties(); }