You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/09 14:53:59 UTC

[1/2] git commit: updated refs/heads/master to fddf59f

Repository: cloudstack
Updated Branches:
  refs/heads/master ca9e934e9 -> fddf59f88


CLOUDSTACK-8879: Depend in rados-java 0.2.0

This should fix the CloudStack Agent from crashing when it has to
handle more then 16 RBD snapshots on one Volume.


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

Branch: refs/heads/master
Commit: d413b2c375c2e5c2a0ebeca1fae07c942892ac71
Parents: 6841ba6
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Fri Sep 25 10:16:24 2015 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Fri Sep 25 11:01:03 2015 +0200

----------------------------------------------------------------------
 .../kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java  | 2 +-
 .../com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java    | 2 +-
 pom.xml                                                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d413b2c3/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java
index ad33945..b2a8d06 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java
@@ -34,7 +34,7 @@ import org.libvirt.LibvirtException;
 
 import com.ceph.rados.IoCTX;
 import com.ceph.rados.Rados;
-import com.ceph.rados.RadosException;
+import com.ceph.rados.exceptions.RadosException;
 import com.ceph.rbd.Rbd;
 import com.ceph.rbd.RbdException;
 import com.ceph.rbd.RbdImage;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d413b2c3/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index f656982..65c4c53 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -35,7 +35,7 @@ import org.libvirt.StorageVol;
 
 import com.ceph.rados.IoCTX;
 import com.ceph.rados.Rados;
-import com.ceph.rados.RadosException;
+import com.ceph.rados.exceptions.RadosException;
 import com.ceph.rbd.Rbd;
 import com.ceph.rbd.RbdException;
 import com.ceph.rbd.RbdImage;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d413b2c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 219402c..c85f8ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
     <cs.java-ipv6.version>0.15</cs.java-ipv6.version>
     <cs.replace.properties>build/replace.properties</cs.replace.properties>
     <cs.libvirt-java.version>0.5.1</cs.libvirt-java.version>
-    <cs.rados-java.version>0.1.4</cs.rados-java.version>
+    <cs.rados-java.version>0.2.0</cs.rados-java.version>
     <cs.target.dir>target</cs.target.dir>
     <cs.daemon.version>1.0.15</cs.daemon.version>
     <cs.jna.version>4.0.0</cs.jna.version>


[2/2] git commit: updated refs/heads/master to fddf59f

Posted by re...@apache.org.
Merge pull request #889 from wido/CLOUDSTACK-8879

CLOUDSTACK-8879: Depend in rados-java 0.2.0This should fix the CloudStack Agent from crashing when it has to
handle more then 16 RBD snapshots on one Volume.

* pr/889:
  CLOUDSTACK-8879: Depend in rados-java 0.2.0

Signed-off-by: Remi Bergsma <gi...@remi.nl>


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

Branch: refs/heads/master
Commit: fddf59f8852000c5f3905197508d4cd129f6cc1b
Parents: ca9e934 d413b2c
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Oct 9 13:52:27 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Oct 9 13:52:28 2015 +0100

----------------------------------------------------------------------
 .../kvm/resource/wrapper/LibvirtBackupSnapshotCommandWrapper.java  | 2 +-
 .../com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java    | 2 +-
 pom.xml                                                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------