yes, I'll create a new patch based on the master. Thanks
On Tue, Aug 14, 2012 at 3:50 PM, edison su <edison...@citrix.com> wrote: > > >> On Aug. 10, 2012, 8:36 p.m., edison su wrote: >> > Ship It! >> >> Marcus Sorensen wrote: >> please ship r3, looks like I beat you by only a minute, so I'm not sure >> you saw it... > > I added a comment on Review board, but seems I forgot to submit it... > Could you please resend a new patch, which based on both 4.0 and master HEAD? > I manually resolved the conflict when I applied your patch, but not sure > that's enough. > > > - edison > > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/6470/#review10152 > ----------------------------------------------------------- > > > On Aug. 10, 2012, 8:35 p.m., Marcus Sorensen wrote: >> >> ----------------------------------------------------------- >> This is an automatically generated e-mail. To reply, visit: >> https://reviews.apache.org/r/6470/ >> ----------------------------------------------------------- >> >> (Updated Aug. 10, 2012, 8:35 p.m.) >> >> >> Review request for cloudstack. >> >> >> Description >> ------- >> >> Adds CLVM as an option for primary storage. It copies most of the RBD bits, >> in most cases simply adding an 'else if' or similar. In the >> managesnapshot.sh we add the ability to manipulate snapshots for the CLVM >> volumes, as well as a few minor fixes like adjusting the usage for the -b >> option to reflect that it accepts four arguments (note that it already >> accepted four args, it just wasn't reflected in the usage). >> >> >> Diffs >> ----- >> >> api/src/com/cloud/storage/Storage.java d6bd04e >> >> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java >> 4a22e73 >> >> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java >> 491f772 >> >> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java >> 85c64ba >> >> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java >> bc428e1 >> scripts/storage/qcow2/managesnapshot.sh a305ba8 >> server/src/com/cloud/storage/StorageManagerImpl.java c7dda00 >> ui/scripts/system.js 9d9936c >> ui/scripts/zoneWizard.js 261668f >> >> Diff: https://reviews.apache.org/r/6470/diff/ >> >> >> Testing >> ------- >> >> Create system VMs on CLVM : passed >> Create instances on CLVM : passed >> Create data volumes on CLVM : passed >> Delete CLVM data volumes : passed >> New CLVM vol snapshot : passed >> Create CLVM vol from snapshot : passed >> >> >> Thanks, >> >> Marcus Sorensen >> >> >
