Updated Branches: refs/heads/javelin 224621197 -> 4a9cf4b4a
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4a9cf4b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4a9cf4b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4a9cf4b4 Branch: refs/heads/javelin Commit: 4a9cf4b4a8429575bbd49c22ee9f0e6b1909dd92 Parents: fe6f045 2246211 Author: Alex Huang <[email protected]> Authored: Fri Jan 18 15:59:24 2013 -0800 Committer: Alex Huang <[email protected]> Committed: Fri Jan 18 15:59:24 2013 -0800 ---------------------------------------------------------------------- .../resource/NfsSecondaryStorageResource.java | 6 ++- .../storage/image/store/TemplateObject.java | 4 +- .../storage/command/CreateObjectCommand.java | 45 +++++++++++++++ .../storage/command/CreateVolumeCommand.java | 45 --------------- .../storage/endpoint/DefaultEndPointSelector.java | 26 +++++++- .../storage/endpoint/EndPointSelector.java | 6 ++ .../driver/DefaultPrimaryDataStoreDriverImpl.java | 25 ++++----- .../xen/resource/XenServerStorageResource.java | 8 +- 8 files changed, 95 insertions(+), 70 deletions(-) ----------------------------------------------------------------------
