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/817aed4b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/817aed4b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/817aed4b Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 817aed4bdd800801cc9c21cc265ce577f4b16476 Parents: f0da4fa 5fa2d9b Author: Jonathan Hurley <[email protected]> Authored: Thu Sep 29 13:21:14 2016 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Thu Sep 29 13:21:14 2016 -0400 ---------------------------------------------------------------------- ambari-server/pom.xml | 23 +- .../checks/ServiceCheckValidityCheck.java | 16 +- .../internal/HostResourceProvider.java | 130 ++++-- .../server/controller/internal/RequestImpl.java | 2 +- .../python/ambari_server/dbConfiguration.py | 52 ++- .../AMBARI_METRICS/0.1.0/metainfo.xml | 17 +- .../stacks/HDP/2.5/services/ATLAS/metainfo.xml | 2 +- .../stacks/HDP/2.5/services/SPARK/kerberos.json | 2 +- .../stacks/HDP/2.5/services/YARN/metainfo.xml | 5 + .../main/resources/stacks/HDP/2.6/metainfo.xml | 23 + .../resources/stacks/HDP/2.6/repos/repoinfo.xml | 132 ++++++ .../HDP/2.6/services/ACCUMULO/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/ATLAS/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/FALCON/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/FLUME/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/HBASE/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/HDFS/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/HIVE/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/KAFKA/metainfo.xml | 26 ++ .../HDP/2.6/services/KERBEROS/metainfo.xml | 25 ++ .../stacks/HDP/2.6/services/KNOX/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/MAHOUT/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/OOZIE/metainfo.xml | 25 ++ .../stacks/HDP/2.6/services/PIG/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/RANGER/metainfo.xml | 29 ++ .../HDP/2.6/services/RANGER_KMS/metainfo.xml | 29 ++ .../stacks/HDP/2.6/services/SLIDER/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/SPARK/metainfo.xml | 29 ++ .../stacks/HDP/2.6/services/SPARK2/metainfo.xml | 29 ++ .../stacks/HDP/2.6/services/SQOOP/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/STORM/metainfo.xml | 27 ++ .../stacks/HDP/2.6/services/TEZ/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/YARN/metainfo.xml | 27 ++ .../HDP/2.6/services/ZEPPELIN/metainfo.xml | 27 ++ .../HDP/2.6/services/ZOOKEEPER/metainfo.xml | 26 ++ .../stacks/HDP/2.6/services/stack_advisor.py | 21 + .../server/agent/TestHeartbeatMonitor.java | 32 +- .../server/api/services/AmbariMetaInfoTest.java | 14 +- .../checks/ServiceCheckValidityCheckTest.java | 4 +- .../server/checks/UpgradeCheckOrderTest.java | 4 +- .../AmbariManagementControllerTest.java | 106 +++++ .../ConfigGroupResourceProviderTest.java | 229 +++++----- .../internal/HostResourceProviderTest.java | 15 +- ...ThreadPoolExecutorCompletionServiceTest.java | 2 +- .../metadata/AgentAlertDefinitionsTest.java | 2 +- .../apache/ambari/server/orm/OrmTestHelper.java | 12 +- .../apache/ambari/server/orm/TestOrmImpl.java | 94 ++--- .../server/orm/dao/AlertDispatchDAOTest.java | 419 ++++++------------- .../security/authorization/TestUsers.java | 369 ++++++---------- .../upgrades/ConfigureActionTest.java | 104 ++--- .../upgrades/UpgradeActionTest.java | 150 ++----- .../apache/ambari/server/state/ServiceTest.java | 106 ++--- .../svccomphost/ServiceComponentHostTest.java | 167 +++----- .../server/upgrade/UpgradeCatalog210Test.java | 34 +- .../src/test/python/TestAmbariServer.py | 107 ++--- 55 files changed, 1745 insertions(+), 1287 deletions(-) ----------------------------------------------------------------------
