[cloudstack] branch master updated (44f38ea -> 0dc55f1)

[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 44f38ea  Merge pull request #1756 from yvsubhash/CLOUDSTACK-9585
     add 732be53  CLOUDSTACK-9567 Difference in the api call outputs for CAPACITY_TYPE_CPU = 1
     new 0dc55f1  Merge pull request #1734 from SudharmaJain/cs-9567

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:
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |   8 +-
 test/integration/component/test_list_pod.py        | 110 +++++++++++++++++++++
 2 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100644 test/integration/component/test_list_pod.py

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

[cloudstack] 01/01: Merge pull request #1734 from SudharmaJain/cs-9567

[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 0dc55f1144185ea9017d937bbe5673602581b595
Merge: 44f38ea 732be53
Author: Rajani Karuturi <ka...@users.noreply.github.com>
AuthorDate: Tue Jun 6 16:15:13 2017 +0530

    Merge pull request #1734 from SudharmaJain/cs-9567
    
    CLOUDSTACK-9567 Difference in the api call outputs for CAPACITY_TYPE_…

 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |   8 +-
 test/integration/component/test_list_pod.py        | 110 +++++++++++++++++++++
 2 files changed, 114 insertions(+), 4 deletions(-)


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