Merge release branch 4.7 to 4.8 * 4.7: CLOUDSTACK-6928: fix issue disk I/O throttling not applied CLOUDSTACK-6975: Prevent dnsmasq from starting on backup redundant RvR.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b80696cb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b80696cb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b80696cb Branch: refs/heads/4.8 Commit: b80696cbc023858cb0d7482137edd7cb3f72302f Parents: 091ca56 5ccebf0 Author: Will Stevens <[email protected]> Authored: Wed May 25 22:53:42 2016 -0400 Committer: Will Stevens <[email protected]> Committed: Wed May 25 22:53:42 2016 -0400 ---------------------------------------------------------------------- .../src/com/cloud/storage/StorageManager.java | 137 +++++++++++++++++++ .../orchestration/VolumeOrchestrator.java | 20 ++- .../kvm/storage/KVMStorageProcessor.java | 21 ++- .../src/com/cloud/storage/StorageManager.java | 128 ----------------- .../com/cloud/storage/StorageManagerImpl.java | 53 ++++++- .../com/cloud/storage/VolumeApiServiceImpl.java | 5 +- .../debian/config/opt/cloud/bin/cs/CsDhcp.py | 3 +- 7 files changed, 223 insertions(+), 144 deletions(-) ----------------------------------------------------------------------
