You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/11/03 11:28:09 UTC
[1/4] git commit: updated refs/heads/master to cdb4945
Repository: cloudstack
Updated Branches:
refs/heads/master 41c71576c -> cdb494520
CLOUDSTACK-9553 Usage event is not getting recorded for snapshots in a specific scenario
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3987b8c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3987b8c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3987b8c6
Branch: refs/heads/master
Commit: 3987b8c6b4549360ff2b0a14296e65cf3d437d49
Parents: 9eb8b2e
Author: subhash_y <ve...@accelerite.com>
Authored: Thu Sep 22 12:59:07 2016 +0530
Committer: subhash_y <ve...@accelerite.com>
Committed: Mon Oct 24 11:47:53 2016 +0530
----------------------------------------------------------------------
.../src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3987b8c6/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index 65f5140..bee2cf5 100644
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -390,9 +390,10 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager,
SnapshotVO snapshot = _snapshotDao.findById(snapshotId);
if (policyId != Snapshot.MANUAL_POLICY_ID) {
SnapshotScheduleVO snapshotSchedule = _snapshotScheduleDao.getCurrentSchedule(volumeId, policyId, true);
- assert snapshotSchedule != null;
- snapshotSchedule.setSnapshotId(snapshotId);
- _snapshotScheduleDao.update(snapshotSchedule.getId(), snapshotSchedule);
+ if (snapshotSchedule !=null) {
+ snapshotSchedule.setSnapshotId(snapshotId);
+ _snapshotScheduleDao.update(snapshotSchedule.getId(), snapshotSchedule);
+ }
}
if (snapshot != null && snapshot.isRecursive()) {
[2/4] git commit: updated refs/heads/master to cdb4945
Posted by bh...@apache.org.
Merge pull request #1714 from yvsubhash/CLOUDSTACK-9553
CLOUDSTACK-9553 Usage event is not getting recorded for snapshots in a specific scenario
* pr/1714:
CLOUDSTACK-9553 Usage event is not getting recorded for snapshots in a specific scenario
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c0a6fc2b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0a6fc2b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0a6fc2b
Branch: refs/heads/master
Commit: c0a6fc2bfb5126fad5d8cfb7b179d120d6b935a4
Parents: 41ed00a 3987b8c
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 3 16:55:09 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 3 16:55:21 2016 +0530
----------------------------------------------------------------------
.../src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[3/4] git commit: updated refs/heads/master to cdb4945
Posted by bh...@apache.org.
Merge branch '4.8' into 4.9
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/240f4439
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/240f4439
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/240f4439
Branch: refs/heads/master
Commit: 240f44392caa553348c4bb67535b6366f7ade0b7
Parents: e2e5cdb c0a6fc2
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 3 16:55:47 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 3 16:55:47 2016 +0530
----------------------------------------------------------------------
.../src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/240f4439/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
[4/4] git commit: updated refs/heads/master to cdb4945
Posted by bh...@apache.org.
Merge branch '4.9'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cdb49452
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cdb49452
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cdb49452
Branch: refs/heads/master
Commit: cdb49452057debc3d369ccdeea2a84d036cc66e1
Parents: 41c7157 240f443
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 3 16:57:40 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 3 16:57:45 2016 +0530
----------------------------------------------------------------------
.../src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdb49452/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------