ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [7/7] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456
Date Thu, 13 Oct 2016 12:31:58 GMT
Merge branch 'trunk' into branch-feature-AMBARI-18456


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: a851d8f128b6ea5f1b247a931f48f35fdc35db2a
Parents: 18c7412 2131466
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Thu Oct 13 08:31:03 2016 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Thu Oct 13 08:31:03 2016 -0400

----------------------------------------------------------------------
 ambari-server/conf/windows/ambari.properties    |  1 +
 .../server/actionmanager/ActionDBAccessor.java  | 13 +++
 .../actionmanager/ActionDBAccessorImpl.java     | 14 +++
 .../server/actionmanager/ActionScheduler.java   |  4 +-
 .../server/configuration/Configuration.java     | 23 +++++
 .../ambari/server/controller/AmbariServer.java  | 50 +++++++++++
 .../apache/ambari/server/orm/dao/StageDAO.java  | 10 +++
 .../ambari/server/orm/entities/StageEntity.java |  5 +-
 .../0.1.0/package/scripts/metrics_grafana.py    |  6 +-
 .../0.1.0/package/scripts/params_linux.py       |  6 ++
 .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml     |  2 +-
 .../actionmanager/TestActionScheduler.java      | 12 +--
 .../scheduler/ExecutionScheduleManagerTest.java | 90 ++++++++++----------
 .../server/upgrade/UpgradeCatalog221Test.java   | 42 +++++----
 .../AMBARI_METRICS/test_metrics_grafana.py      |  5 +-
 .../2.0.6/configs/default_ams_embedded.json     |  9 +-
 ambari-web/app/controllers/installer.js         |  3 +
 ambari-web/app/views/wizard/step1_view.js       |  8 +-
 18 files changed, 223 insertions(+), 80 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a851d8f1/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------


Mime
View raw message