Merge branch 'volume-upload' of https://git-wip-us.apache.org/repos/asf/cloudstack into volume-upload
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e864b93a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e864b93a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e864b93a Branch: refs/heads/master Commit: e864b93a231dcef028731da0951bda91519f7dac Parents: 5c06f2b c32a669 Author: sailajamada <sailaja.m...@citrix.com> Authored: Mon Mar 23 15:20:27 2015 +0530 Committer: sailajamada <sailaja.m...@citrix.com> Committed: Mon Mar 23 15:20:27 2015 +0530 ---------------------------------------------------------------------- .../template/HypervisorTemplateAdapter.java | 120 ++++++++++--------- 1 file changed, 65 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
