[cloudstack] branch master updated (278514f -> d962cc1)

[ra...@apache.org]

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 278514f  Merge pull request #1900 from anshul1886/CLOUDSTACK-8862
     add e06e3b7  CLOUDSTACK-9701: When host is disabled/removed, capacity_type for local storage in op_host_capacity is still enabled
     new d962cc1  Merge pull request #1869 from sudhansu7/CLOUDSTACK-9701

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:
 server/src/com/cloud/resource/ResourceManagerImpl.java |  7 +++++++
 server/src/com/cloud/storage/StorageManagerImpl.java   | 13 +++++++++++++
 2 files changed, 20 insertions(+)

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

[cloudstack] 01/01: Merge pull request #1869 from sudhansu7/CLOUDSTACK-9701

[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 d962cc1b60c674ff94e4d5b9ade41f727b06cc7a
Merge: 278514f e06e3b7
Author: Rajani Karuturi <ka...@users.noreply.github.com>
AuthorDate: Tue Jun 6 15:52:51 2017 +0530

    Merge pull request #1869 from sudhansu7/CLOUDSTACK-9701
    
    CLOUDSTACK-9701: Local storage capacity is not handled properly

 server/src/com/cloud/resource/ResourceManagerImpl.java |  7 +++++++
 server/src/com/cloud/storage/StorageManagerImpl.java   | 13 +++++++++++++
 2 files changed, 20 insertions(+)


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