Merge branch 'bugfix/CID-1240106'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a5401f8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a5401f8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a5401f8 Branch: refs/heads/statscollector-graphite Commit: 3a5401f8f9a940d26f5dc7a970802f299e713f61 Parents: 5a6ff41 c20336c Author: Hugo Trippaers <htrippa...@schubergphilis.com> Authored: Wed Sep 24 09:07:20 2014 +0200 Committer: Hugo Trippaers <htrippa...@schubergphilis.com> Committed: Wed Sep 24 09:07:20 2014 +0200 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++-- server/src/com/cloud/template/TemplateManagerImpl.java | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
