This is an automated email from the ASF dual-hosted git repository. mtutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 4c89b5b97a435771430d030d204e9ebb30c0d9c2 Merge: 3985c68 6bb0ca2 Author: Mike Tutkowski <[email protected]> AuthorDate: Wed Oct 18 14:25:45 2017 -0600 Merge branch 'pr-2081' api/src/com/cloud/storage/Snapshot.java | 2 + api/src/com/cloud/storage/VolumeApiService.java | 2 +- .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../command/user/snapshot/CreateSnapshotCmd.java | 13 +- .../api/command/test/CreateSnapshotCmdTest.java | 4 +- .../engine/subsystem/api/storage/SnapshotInfo.java | 4 + .../subsystem/api/storage/SnapshotService.java | 6 + .../subsystem/api/storage/SnapshotStrategy.java | 3 + .../src/com/cloud/vm/VmWorkTakeVolumeSnapshot.java | 8 +- .../schema/src/com/cloud/storage/SnapshotVO.java | 5 + .../storage/motion/AncientDataMotionStrategy.java | 6 +- .../storage/snapshot/SnapshotBackupException.java | 29 ++++ .../storage/snapshot/SnapshotObject.java | 16 ++ .../storage/snapshot/SnapshotServiceImpl.java | 70 ++++++-- .../snapshot/SnapshotStateMachineManagerImpl.java | 1 + .../snapshot/StorageSystemSnapshotStrategy.java | 32 ++-- .../snapshot/XenserverSnapshotStrategy.java | 102 ++++++------ .../storage/snapshot/SnapshotEntityImpl.java | 6 + .../apache/cloudstack/framework/jobs/AsyncJob.java | 2 + .../framework/jobs/impl/AsyncJobManagerImpl.java | 22 +++ server/src/com/cloud/configuration/Config.java | 8 - .../com/cloud/storage/CreateSnapshotPayload.java | 9 ++ .../com/cloud/storage/VolumeApiServiceImpl.java | 27 ++-- .../cloud/storage/snapshot/SnapshotManager.java | 12 +- .../storage/snapshot/SnapshotManagerImpl.java | 75 +++++++-- server/src/com/cloud/vm/UserVmManagerImpl.java | 51 +++++- .../cloud/storage/VolumeApiServiceImplTest.java | 4 +- setup/db/db/schema-41000to41100-cleanup.sql | 1 + .../test_separate_backup_from_snapshot.py | 177 +++++++++++++++++++++ tools/marvin/marvin/lib/base.py | 4 +- ui/l10n/en.js | 1 + ui/scripts/storage.js | 7 +- .../java/com/cloud/utils/SerialVersionUID.java | 1 + 33 files changed, 593 insertions(+), 118 deletions(-) diff --cc api/src/org/apache/cloudstack/api/ApiConstants.java index af722bf,fdad463..582ead6 --- a/api/src/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/org/apache/cloudstack/api/ApiConstants.java @@@ -25,8 -25,8 +25,9 @@@ public class ApiConstants public static final String ADDRESS = "address"; public static final String ALGORITHM = "algorithm"; public static final String ALLOCATED_ONLY = "allocatedonly"; + public static final String ANNOTATION = "annotation"; public static final String API_KEY = "apikey"; + public static final String ASYNC_BACKUP = "asyncbackup"; public static final String USER_API_KEY = "userapikey"; public static final String APPLIED = "applied"; public static final String LIST_LB_VMIPS = "lbvmips"; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
