Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Date: Tue, 06 Jun 2017 10:35:23 +0000
To: ,
	"' commits@cloudstack.apache.org" <commits@cloudstack.apache.org>,
	'@gitbox.apache.org,
Subject: [cloudstack] branch master updated (321712b -> 02996fc)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Message-ID: <149674532371.6344.7609152386293437302@gitbox.apache.org>
From: rajani@apache.org
Reply-To: "commits@cloudstack.apache.org" <commits@cloudstack.apache.org>
Auto-Submitted: auto-generated
archived-at: Tue, 06 Jun 2017 10:35:26 -0000

This is an automated email from the ASF dual-hosted git repository.

rajani pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 321712b  Merge pull request #1841 from sateesh-chodapuneedi/pr-cloudstack-9684
     add 4b165f1  CLOUDSTACK-9610: Disabled Host Keeps Being up status after unmanging cluster.
     new 02996fc  Merge pull request #1779 from priyankparihar/CLOUDSTACK-9610

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/com/cloud/resource/ResourceManager.java        |  2 ++
 server/src/com/cloud/resource/ResourceManagerImpl.java | 18 +++++++++++++++++-
 .../com/cloud/resource/MockResourceManagerImpl.java    |  5 +++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 engine/components-api/src/com/cloud/resource/ResourceManager.java
 mode change 100644 => 100755 server/src/com/cloud/resource/ResourceManagerImpl.java
 mode change 100644 => 100755 server/test/com/cloud/resource/MockResourceManagerImpl.java

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].