This is an automated email from the ASF dual-hosted git repository.
gabriel pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from ff07c17 Foward merge #3139 from 4.11 to master (4.12)
new bf805d1 Add back ability to disable backup of snapshot to secondary
(#3122)
new 460d312 Fix conflict and merge forward PR #3122 from 4.11 to master
(4.12)
The 31812 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../engine/subsystem/api/storage/SnapshotInfo.java | 3 +
.../storage/snapshot/SnapshotObject.java | 11 ++
.../storage/snapshot/SnapshotManagerImpl.java | 52 +++----
.../cloud/storage/snapshot/SnapshotManager.java | 3 +
.../storage/snapshot/SnapshotManagerImpl.java | 164 +++++++++++----------
5 files changed, 122 insertions(+), 111 deletions(-)
copy server/src/{main/java =>
}/com/cloud/storage/snapshot/SnapshotManagerImpl.java (97%)
