Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BFA3D200B9D for ; Wed, 28 Sep 2016 20:32:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BD352160AB8; Wed, 28 Sep 2016 18:32:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F38C1160AD3 for ; Wed, 28 Sep 2016 20:32:02 +0200 (CEST) Received: (qmail 7400 invoked by uid 500); 28 Sep 2016 18:32:02 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 7384 invoked by uid 99); 28 Sep 2016 18:32:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2016 18:32:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D3EA7E055E; Wed, 28 Sep 2016 18:32:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tthorpe@apache.org To: commits@ambari.apache.org Date: Wed, 28 Sep 2016 18:32:02 -0000 Message-Id: <32581f404cd14464aa118e7bc56ff758@git.apache.org> In-Reply-To: <077f0ed7b05e4c2a8d98a0ca27dd6801@git.apache.org> References: <077f0ed7b05e4c2a8d98a0ca27dd6801@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ambari git commit: Merge branch 'branch-2.5' of https://git-wip-us.apache.org/repos/asf/ambari into tthorpe/AMBARI-18051 archived-at: Wed, 28 Sep 2016 18:32:03 -0000 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 Authored: Wed Sep 28 11:31:31 2016 -0700 Committer: Tim Thorpe 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(-) ----------------------------------------------------------------------