Merge branch 'branch-2.5' of https://git-wip-us.apache.org/repos/asf/ambari into tthorpe/AMBARI-18051
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/17c09d94 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/17c09d94 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/17c09d94 Branch: refs/heads/branch-2.5 Commit: 17c09d9465e86fa710ba21de7c4b607c706fb1d3 Parents: 380f72d e02ffaa Author: Tim Thorpe <ttho...@apache.org> Authored: Wed Sep 28 11:31:31 2016 -0700 Committer: Tim Thorpe <ttho...@apache.org> Committed: Wed Sep 28 11:31:31 2016 -0700 ---------------------------------------------------------------------- .../server/checks/ServiceCheckValidityCheck.java | 16 +++++++++------- .../checks/ServiceCheckValidityCheckTest.java | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
