[cloudstack] branch master updated (6bf3769 -> c3e3f0f)

[ro...@apache.org]

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

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


    from 6bf3769  Display image store disk size used and total disk size in (#4046)
     add fef4458  kvm: Fixed HA migrated storage error (#4079)
     add 5335971  Merge remote-tracking branch 'origin/4.13' into 4.14
     new c3e3f0f  Merge remote-tracking branch 'origin/4.14'

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:
 .../java/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.14'

[ro...@apache.org]

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

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

commit c3e3f0f0b3157e80e46b368843faef3ee7883ca9
Merge: 6bf3769 5335971
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Jun 8 07:09:04 2020 +0530

    Merge remote-tracking branch 'origin/4.14'

 .../java/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)