ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [5/5] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18634
Date Tue, 01 Nov 2016 20:10:03 GMT
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 <ncole@hortonworks.com>
Authored: Tue Nov 1 16:09:45 2016 -0400
Committer: Nate Cole <ncole@hortonworks.com>
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(-)
----------------------------------------------------------------------



Mime
View raw message