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 BBC3D200BB4 for ; Tue, 1 Nov 2016 21:10:01 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BA57F160B0B; Tue, 1 Nov 2016 20:10:01 +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 3A882160B0A for ; Tue, 1 Nov 2016 21:10:01 +0100 (CET) Received: (qmail 22103 invoked by uid 500); 1 Nov 2016 20:10:00 -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 21997 invoked by uid 99); 1 Nov 2016 20:10:00 -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, 01 Nov 2016 20:10:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1EBE2E7DFC; Tue, 1 Nov 2016 20:10:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Tue, 01 Nov 2016 20:10:03 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18634 archived-at: Tue, 01 Nov 2016 20:10:01 -0000 Merge branch 'trunk' into branch-feature-AMBARI-18634 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0d90ba35 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0d90ba35 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0d90ba35 Branch: refs/heads/branch-feature-AMBARI-18634 Commit: 0d90ba353d5df972ffddbc37b01ab350f1844c06 Parents: 1b46747 cc14719 Author: Nate Cole Authored: Tue Nov 1 16:09:45 2016 -0400 Committer: Nate Cole Committed: Tue Nov 1 16:09:45 2016 -0400 ---------------------------------------------------------------------- .../orm/entities/ServiceDesiredStateEntity.java | 42 +++++++++ .../org/apache/ambari/server/state/Service.java | 31 +++++++ .../apache/ambari/server/state/ServiceImpl.java | 95 ++++++++++++++++++++ .../server/upgrade/UpgradeCatalog250.java | 21 ++++- .../main/python/ambari_server/serverUpgrade.py | 2 +- .../src/main/python/ambari_server/utils.py | 12 ++- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 2 + .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 + .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 4 +- .../resources/Ambari-DDL-Postgres-CREATE.sql | 2 + .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 + .../resources/Ambari-DDL-SQLServer-CREATE.sql | 2 + .../server/upgrade/UpgradeCatalog250Test.java | 24 +++++ 13 files changed, 234 insertions(+), 7 deletions(-) ----------------------------------------------------------------------