You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/03/23 05:35:55 UTC
[2/2] git commit: updated refs/heads/volume-upload to 4807828
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/48078289
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/48078289
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/48078289
Branch: refs/heads/volume-upload
Commit: 48078289f5942f5c5ecc7338a82272e0df95c93f
Parents: f22bd7a 018023c
Author: sailajamada <sa...@citrix.com>
Authored: Mon Mar 23 09:59:58 2015 +0530
Committer: sailajamada <sa...@citrix.com>
Committed: Mon Mar 23 09:59:58 2015 +0530
----------------------------------------------------------------------
.../template/GetUploadParamsForTemplateCmd.java | 3 +
.../template/HttpTemplateDownloader.java | 4 +-
.../TemplateOrVolumePostUploadCommand.java | 10 ++
.../com/cloud/storage/VolumeApiServiceImpl.java | 4 +-
.../template/HypervisorTemplateAdapter.java | 3 +-
.../com/cloud/template/TemplateManagerImpl.java | 2 +-
.../resource/HttpUploadServerHandler.java | 49 +++++++--
.../resource/NfsSecondaryStorageResource.java | 38 +++++--
.../storage/template/UploadEntity.java | 9 ++
utils/src/com/cloud/utils/ImageStoreUtil.java | 39 -------
.../utils/imagestore/ImageStoreUtil.java | 110 +++++++++++++++++++
.../utils/template/TemplateUtils.java | 97 ----------------
.../utils/imagestore/ImageStoreUtilTest.java | 38 +++++++
13 files changed, 241 insertions(+), 165 deletions(-)
----------------------------------------------------------------------