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/23fbfe48 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23fbfe48 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23fbfe48 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 23fbfe48021fdd739ecc882698bb70fcadb8423b Parents: aee49b6 98ba7e0 Author: Jonathan Hurley <[email protected]> Authored: Tue Oct 4 09:42:38 2016 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Tue Oct 4 09:42:38 2016 -0400 ---------------------------------------------------------------------- ambari-logsearch/pom.xml | 13 +++ .../ambari-metrics-timelineservice/pom.xml | 9 ++ ambari-metrics/pom.xml | 26 +++++- ambari-server/pom.xml | 11 +++ .../src/main/python/ambari_server/utils.py | 42 ++++++++- .../src/main/python/ambari_server_main.py | 12 ++- .../HIVE/configuration/hive-interactive-env.xml | 11 +++ .../stacks/HDP/2.5/services/stack_advisor.py | 23 ++++- .../alerts/AggregateAlertListenerTest.java | 2 + .../alerts/AlertDefinitionEqualityTest.java | 2 + .../state/alerts/AlertDefinitionHashTest.java | 2 + .../state/alerts/AlertEventPublisherTest.java | 2 + .../state/alerts/AlertReceivedListenerTest.java | 2 + .../alerts/AlertStateChangedEventTest.java | 2 + .../state/alerts/InitialAlertEventTest.java | 2 + .../KerberosComponentDescriptorTest.java | 2 + .../KerberosConfigurationDescriptorTest.java | 2 + .../state/kerberos/KerberosDescriptorTest.java | 2 + .../KerberosDescriptorUpdateHelperTest.java | 2 + .../KerberosIdentityDescriptorTest.java | 2 + .../kerberos/KerberosKeytabDescriptorTest.java | 2 + .../KerberosPrincipalDescriptorTest.java | 2 + .../kerberos/KerberosServiceDescriptorTest.java | 2 + .../kerberos/VariableReplacementHelperTest.java | 2 + .../state/stack/ConfigUpgradePackTest.java | 2 + .../state/stack/ConfigUpgradeValidityTest.java | 2 + .../ambari/server/state/stack/OSFamilyTest.java | 3 + .../server/state/stack/UpgradePackTest.java | 2 + ambari-server/src/test/python/TestUtils.py | 12 ++- pom.xml | 92 +++++++++++++++++++- utility/pom.xml | 19 ++++ utility/src/main/java/category/AlertTest.java | 27 ++++++ .../main/java/category/AmbariUpgradeTest.java | 27 ++++++ .../src/main/java/category/BlueprintTest.java | 27 ++++++ utility/src/main/java/category/FastTest.java | 27 ++++++ .../src/main/java/category/KerberosTest.java | 27 ++++++ utility/src/main/java/category/MetricsTest.java | 27 ++++++ utility/src/main/java/category/SlowTest.java | 27 ++++++ .../main/java/category/StackUpgradeTest.java | 27 ++++++ 39 files changed, 514 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
