You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/06/06 10:35:23 UTC
[cloudstack] branch master updated (321712b -> 02996fc)
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" <co...@cloudstack.apache.org>'].
[cloudstack] 01/01: Merge pull request #1779 from
priyankparihar/CLOUDSTACK-9610
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rajani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 02996fcabf5e1ed6c4fb0b5cfd63a7879ab210c4
Merge: 321712b 4b165f1
Author: Rajani Karuturi <ka...@users.noreply.github.com>
AuthorDate: Tue Jun 6 16:05:21 2017 +0530
Merge pull request #1779 from priyankparihar/CLOUDSTACK-9610
CLOUDSTACK-9610: Disabled Host Keeps Being up status after unmanaging …
.../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(-)
diff --cc server/src/com/cloud/resource/ResourceManagerImpl.java
index 88e3ff5,609daaf..af5344c
mode 100644,100755..100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.