[7/7] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456

2016-12-02 Thread jonathanhurley 
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/3bbe75c3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3bbe75c3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3bbe75c3

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 3bbe75c3bd7b1a913905137465c19b2c7f7c9ba9
Parents: a58c39c 3096c79
Author: Jonathan Hurley 
Authored: Fri Dec 2 22:40:18 2016 -0500
Committer: Jonathan Hurley 
Committed: Fri Dec 2 22:40:18 2016 -0500

--
 ambari-agent/conf/unix/ambari-agent.ini |   3 +
 .../ambari_agent/CustomServiceOrchestrator.py   | 120 +++
 ambari-agent/src/packages/tarball/all.xml   |  30 +
 .../ambari/server/agent/ExecutionCommand.java   |  28 +
 .../ambari/server/agent/HeartBeatHandler.java   |   2 +-
 .../AmbariManagementControllerImpl.java |   5 +
 .../configuration/logsearch-properties.xml  |   2 +-
 .../HDP/2.6/services/ACCUMULO/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/FALCON/metainfo.xml |   2 +-
 .../stacks/HDP/2.6/services/FLUME/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/HBASE/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/HDFS/metainfo.xml   |   2 +-
 .../stacks/HDP/2.6/services/HIVE/metainfo.xml   |   2 +-
 .../stacks/HDP/2.6/services/KAFKA/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/KNOX/metainfo.xml   |   2 +-
 .../stacks/HDP/2.6/services/MAHOUT/metainfo.xml |   2 +-
 .../stacks/HDP/2.6/services/OOZIE/metainfo.xml  |   1 +
 .../stacks/HDP/2.6/services/PIG/metainfo.xml|   2 +-
 .../stacks/HDP/2.6/services/RANGER/metainfo.xml |   2 +-
 .../HDP/2.6/services/RANGER_KMS/metainfo.xml|   2 +-
 .../stacks/HDP/2.6/services/SLIDER/metainfo.xml |   2 +-
 .../stacks/HDP/2.6/services/SPARK/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/SPARK2/metainfo.xml |   2 +-
 .../stacks/HDP/2.6/services/SQOOP/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/STORM/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/TEZ/metainfo.xml|   2 +-
 .../stacks/HDP/2.6/services/YARN/metainfo.xml   |   4 +-
 .../HDP/2.6/services/ZOOKEEPER/metainfo.xml |   2 +-
 .../HAPPY/configuration/happy-alert-config.xml  |   5 +
 .../HBASE/configuration/hbase-alert-config.xml  |   5 +
 .../HDFS/configuration/hdfs-alert-config.xml|   5 +
 .../configuration/sleepy-alert-config.xml   |   5 +
 .../SNOW/configuration/snow-alert-config.xml|   5 +
 .../YARN/configuration/yarn-alert-config.xml|   5 +
 .../ZOOKEEPER/configuration/zk-alert-config.xml |   5 +
 .../server/agent/TestHeartbeatHandler.java  |  28 +++--
 ambari-web/app/messages.js  |   1 -
 .../configs/objects/service_config_property.js  |   7 --
 .../widgets/slider_config_widget_view.js|   7 +-
 contrib/views/ambari-views-package/pom.xml  |   4 +-
 40 files changed, 269 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3bbe75c3/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--

[7/7] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456

2016-10-13 Thread jonathanhurley 
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 
Authored: Thu Oct 13 08:31:03 2016 -0400
Committer: Jonathan Hurley 
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
--

[7/7] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456

2016-10-07 Thread jonathanhurley 
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/197a37f0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/197a37f0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/197a37f0

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 197a37f034b2bc10f483d558cde7ab0f874c8d4c
Parents: 78a875c f6124a0
Author: Jonathan Hurley 
Authored: Fri Oct 7 14:21:34 2016 -0400
Committer: Jonathan Hurley 
Committed: Fri Oct 7 14:21:34 2016 -0400

--
 ambari-agent/conf/unix/ambari-agent |  17 ++
 .../TestDataStructureUtils.py   |  47 
 .../libraries/functions/data_structure_utils.py |  57 
 .../server/state/DependencyConditionInfo.java   | 102 +++
 .../ambari/server/state/DependencyInfo.java |  36 ++-
 .../server/topology/BlueprintValidatorImpl.java |  13 +
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |  44 +++
 .../4.0.0.2.0/package/scripts/oozie_service.py  |   5 +
 .../stacks/HDP/2.0.6/services/stack_advisor.py  | 269 ---
 .../stacks/HDP/2.3/services/stack_advisor.py|  13 +-
 .../topology/BlueprintValidatorImplTest.java|  75 +-
 .../stacks/2.0.6/OOZIE/test_oozie_server.py |   8 +
 .../stacks/2.0.6/common/test_stack_advisor.py   | 215 +++
 .../MICROSOFT_R/8.0.0/kerberos.json |  15 --
 .../MICROSOFT_R/8.0.0/metainfo.xml  |  53 
 .../package/files/microsoft_r_serviceCheck.r|  28 --
 .../8.0.0/package/scripts/microsoft_r.py|  47 
 .../MICROSOFT_R/8.0.0/package/scripts/params.py |  31 ---
 .../8.0.0/package/scripts/params_linux.py   |  79 --
 .../8.0.0/package/scripts/params_windows.py |  26 --
 .../8.0.0/package/scripts/service_check.py  |  89 --
 .../MICROSOFT_R/8.0.0/role_command_order.json   |   6 -
 .../MICROSOFT_R/8.0.0/service_advisor.py|  73 -
 .../MICROSOFT_R/8.0.5/kerberos.json |  15 ++
 .../MICROSOFT_R/8.0.5/metainfo.xml  |  53 
 .../package/files/microsoft_r_serviceCheck.r|  28 ++
 .../8.0.5/package/scripts/microsoft_r.py|  47 
 .../MICROSOFT_R/8.0.5/package/scripts/params.py |  31 +++
 .../8.0.5/package/scripts/params_linux.py   |  79 ++
 .../8.0.5/package/scripts/params_windows.py |  26 ++
 .../8.0.5/package/scripts/service_check.py  |  89 ++
 .../MICROSOFT_R/8.0.5/role_command_order.json   |   6 +
 .../MICROSOFT_R/8.0.5/service_advisor.py|  73 +
 .../MICROSOFT_R/8.0.0/metainfo.xml  |  28 --
 .../MICROSOFT_R/8.0.0/repos/repoinfo.xml|  33 ---
 .../MICROSOFT_R/8.0.5/metainfo.xml  |  28 ++
 .../MICROSOFT_R/8.0.5/repos/repoinfo.xml|  33 +++
 .../src/main/resources/mpack.json   |   2 +-
 .../ui/hueambarimigration-view/package.json |   2 +-
 .../src/main/resources/ui/package.json  |   2 +-
 40 files changed, 1304 insertions(+), 619 deletions(-)
--