cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 6f2a193
Date Tue, 20 May 2014 11:44:29 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 2b325afb4 -> 6f2a193b7


CLOUDSTACK-6721: VolumeApiServiceImpl is sending wrong type for
updateAsyncJobAttachment

fix sends 'Volume' instead of 'volume'

Conflicts:
	server/src/com/cloud/storage/VolumeApiServiceImpl.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/17fe6cdd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17fe6cdd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17fe6cdd

Branch: refs/heads/master
Commit: 17fe6cdda4fd7452554c5ceac8724a76a99a477c
Parents: 2b325af
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Tue May 20 16:56:03 2014 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
Committed: Tue May 20 17:13:20 2014 +0530

----------------------------------------------------------------------
 server/src/com/cloud/storage/VolumeApiServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17fe6cdd/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 5778725..06773c7 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1227,7 +1227,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
                 s_logger.info("Trying to attaching volume " + volumeId + " to vm instance:"
+ vm.getId() + ", update async job-" + job.getId() + " progress status");
             }
 
-            _jobMgr.updateAsyncJobAttachment(job.getId(), "volume", volumeId);
+            _jobMgr.updateAsyncJobAttachment(job.getId(), "Volume", volumeId);
         }
 
         VolumeVO newVol = _volsDao.findById(newVolumeOnPrimaryStorage.getId());
@@ -1399,7 +1399,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
                 s_logger.info("Trying to attaching volume " + volumeId + "to vm instance:"
+ vm.getId() + ", update async job-" + job.getId() + " progress status");
             }
 
-            _jobMgr.updateAsyncJobAttachment(job.getId(), "volume", volumeId);
+            _jobMgr.updateAsyncJobAttachment(job.getId(), "Volume", volumeId);
         }
 
         AsyncJobExecutionContext jobContext = AsyncJobExecutionContext.getCurrentExecutionContext();


Mime
View raw message