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 <[email protected]> Authored: Tue Oct 11 21:42:08 2016 -0400 Committer: Jonathan Hurley <[email protected]> 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 ----------------------------------------------------------------------
