Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack into disk_io_throttling
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8da34d29 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8da34d29 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8da34d29 Branch: refs/heads/disk_io_throttling Commit: 8da34d296493e9d6be346f9521f392cb09bf9146 Parents: 02e5cb3 ecbce6a Author: Wei Zhou <w.z...@leaseweb.com> Authored: Mon Jun 10 23:12:45 2013 +0200 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Mon Jun 10 23:12:45 2013 +0200 ---------------------------------------------------------------------- engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 1 + .../hypervisor/kvm/resource/LibvirtStorageVolumeDef.java | 2 +- ui/scripts/network.js | 7 +++---- ui/scripts/ui-custom/projectSelect.js | 4 ++-- ui/scripts/ui-custom/projects.js | 4 ++-- ui/scripts/ui/utils.js | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
