Merge branch 'master' into marvin_refactor
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa9b3873 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa9b3873 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa9b3873 Branch: refs/heads/marvin_refactor Commit: fa9b3873293654827c99fd62e48412f8a5569a07 Parents: 7b72473 32c7e1d Author: Prasanna Santhanam <[email protected]> Authored: Tue Apr 16 13:55:15 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Tue Apr 16 13:55:15 2013 +0530 ---------------------------------------------------------------------- .../agent/api/DeleteSnapshotBackupCommand.java | 6 +- client/tomcatconf/simulatorComponentContext.xml.in | 9 +- docs/en-US/Admin_Guide.xml | 2 +- docs/en-US/Book_Info.xml | 2 +- docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 2 +- docs/en-US/Developers_Guide.xml | 2 +- docs/en-US/Installation_Guide.xml | 2 +- docs/en-US/images/VMSnapshotButton.png | Bin 0 -> 967 bytes docs/en-US/images/revert-vm.png | Bin 0 -> 860 bytes docs/en-US/virtual-machines.xml | 1 + docs/en-US/vm-snapshots.xml | 146 +++++++++++++++ .../driver/AncientImageDataStoreDriverImpl.java | 10 +- .../storage/snapshot/SnapshotObject.java | 2 +- .../storage/snapshot/SnapshotManagerImpl.java | 11 +- tools/cli/cloudmonkey/requester.py | 4 +- 15 files changed, 179 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
