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

2016-10-11 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/10f44bca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10f44bca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10f44bca

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 10f44bcadbac846e0719c8d91c81f18a16b2d764
Parents: ed2018b 1d54fef
Author: Jonathan Hurley 
Authored: Tue Oct 11 21:42:08 2016 -0400
Committer: Jonathan Hurley 
Committed: Tue Oct 11 21:42:08 2016 -0400

--
 .../python/ambari_agent/apscheduler/scheduler.py |  1 +
 .../ambari_agent/apscheduler/threadpool.py   |  1 +
 ambari-server/pom.xml|  3 +++
 ...rnTimelineServerStatePreservingCheckTest.java |  3 +++
 .../server/security/SecurityFilterTest.java  | 19 +++
 .../state/cluster/ClusterDeadlockTest.java   | 15 ---
 .../server/testing/DeadlockWarningThread.java| 13 ++---
 .../server/upgrade/UpgradeCatalog150Test.java|  7 ++-
 .../server/upgrade/UpgradeCatalog151Test.java|  3 +++
 .../server/upgrade/UpgradeCatalog160Test.java|  3 +++
 .../server/upgrade/UpgradeCatalog161Test.java|  3 +++
 .../server/upgrade/UpgradeCatalog170Test.java|  3 +++
 12 files changed, 59 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/10f44bca/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java
--

[4/4] 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/fbfcf98a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fbfcf98a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fbfcf98a

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: fbfcf98abd5b8ced11b9b5ef35f73a9d319d0c5e
Parents: 197a37f 8813b1f
Author: Jonathan Hurley 
Authored: Fri Oct 7 15:58:00 2016 -0400
Committer: Jonathan Hurley 
Committed: Fri Oct 7 15:58:00 2016 -0400

--
 .../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 
 .../topology/BlueprintValidatorImplTest.java|  75 +-
 .../ambari/view/hive2/ConnectionFactory.java|  37 ---
 .../ambari/view/hive2/PropertyValidator.java|   8 ++
 .../savedQueries/SavedQueryService.java |  47 -
 .../ui/hive-web/app/controllers/queries.js  |  24 -
 .../ui/hive-web/app/initializers/i18n.js|   5 +
 .../views/hive-next/src/main/resources/view.xml |   9 ++
 .../savedQueries/SavedQueryService.java |  48 +++--
 .../ui/hive-web/app/controllers/queries.js  |  22 +++-
 .../ui/hive-web/app/initializers/i18n.js|   5 +-
 .../savedQueries/SavedQueryServiceTest.java |  16 ++-
 15 files changed, 193 insertions(+), 298 deletions(-)
--

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

2016-10-04 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/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 
Authored: Tue Oct 4 09:42:38 2016 -0400
Committer: Jonathan Hurley 
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(-)
--