You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Hugo Trippaers <hu...@trippaers.nl> on 2014/03/12 09:28:32 UTC
Differences between 4.3 and 4.3-forward
Hey,
There is a sizable number of differences between the two branch. Maybe it’s time to ditch 4.3-forward and recreate it based on current 4.3?
Cheers,
Hugo
Hugos-MacBook-Pro:cloudstack hugo (4.3-forward)$ git diff --stat 4.3-forward 4.3
api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java | 3 +-
api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java | 2 +-
awsapi/pom.xml | 2 +-
client/pom.xml | 20 ++-
client/tomcatconf/catalina.properties.in | 2 +-
debian/changelog | 7 +-
developer/pom.xml | 1 -
engine/components-api/src/com/cloud/template/TemplateManager.java | 9 +-
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 36 +----
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java | 10 +-
engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml | 2 +-
engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java | 2 -
engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java | 48 +-----
engine/storage/integration-test/pom.xml | 5 -
engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java | 8 +-
framework/db/pom.xml | 5 -
framework/db/src/com/cloud/utils/db/StaticStrategy.java | 130 ----------------
plugins/database/mysql-ha/pom.xml | 28 ++++
plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java | 133 ++++++++++++++++
plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs | 2 +-
plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config | 7 +-
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 6 +-
plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java | 6 +-
plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/driver/SimulatorImageStoreDriverImpl.java | 6 -
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 85 +++++-----
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 7 +-
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 70 +++++++--
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java | 5 +
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java | 452 ++++++++++++++++++++++++++++++++++++++++++++++++-----
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
plugins/pom.xml | 11 ++
pom.xml | 2 +-
scripts/vm/network/security_group.py | 2 +-
server/src/com/cloud/api/doc/Argument.java | 14 +-
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 4 +-
server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java | 14 +-
server/src/com/cloud/network/ExternalIpAddressAllocator.java | 9 +-
server/src/com/cloud/network/NetworkServiceImpl.java | 20 ++-
server/src/com/cloud/network/guru/GuestNetworkGuru.java | 4 +-
server/src/com/cloud/projects/ProjectManagerImpl.java | 46 +++---
server/src/com/cloud/template/TemplateManagerImpl.java | 35 -----
server/src/com/cloud/vm/UserVmManagerImpl.java | 35 ++++-
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 1 +
server/test/resources/createNetworkOffering.xml | 2 -
setup/db/hypervisor_capabilities.simulator.sql | 19 ---
systemvm/patches/debian/config/etc/init.d/cloud-early-config | 10 --
test/integration/component/test_multiple_ips_per_nic.py | 452 -----------------------------------------------------
test/integration/component/test_persistent_networks.py | 2045 ++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
test/integration/component/test_portable_ip.py | 132 +++++-----------
test/integration/smoke/test_vm_life_cycle.py | 84 ++++------
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud/pom.xml | 2 +-
tools/marvin/marvin/codes.py | 4 -
tools/marvin/marvin/config/config.cfg | 233 ----------------------------
tools/marvin/marvin/integration/lib/base.py | 36 -----
tools/marvin/marvin/integration/lib/common.py | 107 ++-----------
usage/pom.xml | 5 -
utils/pom.xml | 5 -
58 files changed, 1098 insertions(+), 3338 deletions(-)
Re: Differences between 4.3 and 4.3-forward
Posted by Daan Hoogland <da...@gmail.com>.
Paul, they might be disapproved patches as well.
On Fri, Mar 14, 2014 at 9:38 AM, Paul Angus <pa...@shapeblue.com> wrote:
> Will these automatically go into 4.3.1, do we know if they've gone into master as well?
>
> Otherwise does this mean we have a load of bug fixes which we're not putting into 4.3.0 which could potentially become orphaned in the 4.3-forward branch? (this query may be just my ignorance regarding ACS branching)
>
> Regards,
>
> Paul Angus
> Cloud Architect
> S: +44 20 3603 0540 | M: +447711418784 | T: @CloudyAngus
> paul.angus@shapeblue.com
>
> -----Original Message-----
> From: Trippie [mailto:trippie@gmail.com] On Behalf Of Hugo Trippaers
> Sent: 12 March 2014 08:29
> To: <de...@cloudstack.apache.org>
> Subject: Differences between 4.3 and 4.3-forward
>
> Hey,
>
> There is a sizable number of differences between the two branch. Maybe it's time to ditch 4.3-forward and recreate it based on current 4.3?
>
> Cheers,
>
> Hugo
>
>
> Hugos-MacBook-Pro:cloudstack hugo (4.3-forward)$ git diff --stat 4.3-forward 4.3
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java | 3 +-
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java | 2 +-
> awsapi/pom.xml | 2 +-
> client/pom.xml | 20 ++-
> client/tomcatconf/catalina.properties.in | 2 +-
> debian/changelog | 7 +-
> developer/pom.xml | 1 -
> engine/components-api/src/com/cloud/template/TemplateManager.java | 9 +-
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 36 +----
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java | 10 +-
> engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml | 2 +-
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java | 2 -
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java | 48 +-----
> engine/storage/integration-test/pom.xml | 5 -
> engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java | 8 +-
> framework/db/pom.xml | 5 -
> framework/db/src/com/cloud/utils/db/StaticStrategy.java | 130 ----------------
> plugins/database/mysql-ha/pom.xml | 28 ++++
> plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java | 133 ++++++++++++++++
> plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs | 2 +-
> plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config | 7 +-
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 6 +-
> plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java | 6 +-
> plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/driver/SimulatorImageStoreDriverImpl.java | 6 -
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 85 +++++-----
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 7 +-
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 70 +++++++--
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java | 5 +
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java | 452 ++++++++++++++++++++++++++++++++++++++++++++++++-----
> plugins/network-elements/juniper-contrail/pom.xml | 2 +-
> plugins/pom.xml | 11 ++
> pom.xml | 2 +-
> scripts/vm/network/security_group.py | 2 +-
> server/src/com/cloud/api/doc/Argument.java | 14 +-
> server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 4 +-
> server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java | 14 +-
> server/src/com/cloud/network/ExternalIpAddressAllocator.java | 9 +-
> server/src/com/cloud/network/NetworkServiceImpl.java | 20 ++-
> server/src/com/cloud/network/guru/GuestNetworkGuru.java | 4 +-
> server/src/com/cloud/projects/ProjectManagerImpl.java | 46 +++---
> server/src/com/cloud/template/TemplateManagerImpl.java | 35 -----
> server/src/com/cloud/vm/UserVmManagerImpl.java | 35 ++++-
> server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 1 +
> server/test/resources/createNetworkOffering.xml | 2 -
> setup/db/hypervisor_capabilities.simulator.sql | 19 ---
> systemvm/patches/debian/config/etc/init.d/cloud-early-config | 10 --
> test/integration/component/test_multiple_ips_per_nic.py | 452 -----------------------------------------------------
> test/integration/component/test_persistent_networks.py | 2045 ++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
> test/integration/component/test_portable_ip.py | 132 +++++-----------
> test/integration/smoke/test_vm_life_cycle.py | 84 ++++------
> tools/devcloud-kvm/pom.xml | 2 +-
> tools/devcloud/pom.xml | 2 +-
> tools/marvin/marvin/codes.py | 4 -
> tools/marvin/marvin/config/config.cfg | 233 ----------------------------
> tools/marvin/marvin/integration/lib/base.py | 36 -----
> tools/marvin/marvin/integration/lib/common.py | 107 ++-----------
> usage/pom.xml | 5 -
> utils/pom.xml | 5 -
> 58 files changed, 1098 insertions(+), 3338 deletions(-)
>
>
> Need Enterprise Grade Support for Apache CloudStack?
> Our CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/> offers the best 24/7 SLA for CloudStack Environments.
>
> Apache CloudStack Bootcamp training courses
>
> **NEW!** CloudStack 4.2.1 training<http://shapeblue.com/cloudstack-training/>
> 18th-19th February 2014, Brazil. Classroom<http://shapeblue.com/cloudstack-training/>
> 17th-23rd March 2014, Region A. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
> 24th-28th March 2014, Region B. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
> 16th-20th June 2014, Region A. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
> 23rd-27th June 2014, Region B. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
>
> This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
--
Daan
RE: Differences between 4.3 and 4.3-forward
Posted by Animesh Chaturvedi <an...@citrix.com>.
> -----Original Message-----
> From: Mike Tutkowski [mailto:mike.tutkowski@solidfire.com]
> Sent: Friday, March 14, 2014 7:43 AM
> To: dev@cloudstack.apache.org
> Subject: Re: Differences between 4.3 and 4.3-forward
>
> Yes, and we definitely cannot just take all of 4.3.1 and put it in 4.3 as many
> of those changes are intended for 4.3.1 and not 4.3.
[Animesh] Yes that is correct. I was pulling in commits that I was asked to cherry-pick from 4.3-forward and the one that I thought were important. There were some that I had not picked up and had followed up with few folks like Marcus in case they need to be pulled in.
We cannot pull in 4.3-forward into 4.3. 4.3-forward branch will be merged into 4.3 after 4.3 is released
>
>
> On Fri, Mar 14, 2014 at 8:40 AM, Sudha Ponnaganti <
> sudha.ponnaganti@citrix.com> wrote:
>
> > Yes - 4.3-forward is unstable branch and should be merged while 4.3 is
> > going through RC. It is meant for maintenance release.
> >
> > -----Original Message-----
> > From: Mike Tutkowski [mailto:mike.tutkowski@solidfire.com]
> > Sent: Friday, March 14, 2014 7:36 AM
> > To: dev@cloudstack.apache.org
> > Subject: Re: Differences between 4.3 and 4.3-forward
> >
> > Right, I think it's dangerous to sync 4.3.1 to 4.3 because developers
> > might have changes in 4.3.1 that are not yet in master.
> >
> > This is not my situation personally, but I imagine some devs might be
> > in this state.
> >
> >
> > On Fri, Mar 14, 2014 at 8:18 AM, Sudha Ponnaganti <
> > sudha.ponnaganti@citrix.com> wrote:
> >
> > > Yes that is my understanding that all of these would go in to next
> > > maintenance that is why they are staged in forward branch.
> > >
> > > -----Original Message-----
> > > From: Paul Angus [mailto:paul.angus@shapeblue.com]
> > > Sent: Friday, March 14, 2014 1:38 AM
> > > To: dev@cloudstack.apache.org
> > > Subject: RE: Differences between 4.3 and 4.3-forward
> > >
> > > Will these automatically go into 4.3.1, do we know if they've gone
> > > into master as well?
> > >
> > > Otherwise does this mean we have a load of bug fixes which we're not
> > > putting into 4.3.0 which could potentially become orphaned in the
> > > 4.3-forward branch? (this query may be just my ignorance regarding
> > > ACS
> > > branching)
> > >
> > > Regards,
> > >
> > > Paul Angus
> > > Cloud Architect
> > > S: +44 20 3603 0540 | M: +447711418784 | T: @CloudyAngus
> > > paul.angus@shapeblue.com
> > >
> > > -----Original Message-----
> > > From: Trippie [mailto:trippie@gmail.com] On Behalf Of Hugo Trippaers
> > > Sent: 12 March 2014 08:29
> > > To: <de...@cloudstack.apache.org>
> > > Subject: Differences between 4.3 and 4.3-forward
> > >
> > > Hey,
> > >
> > > There is a sizable number of differences between the two branch.
> > > Maybe it's time to ditch 4.3-forward and recreate it based on current 4.3?
> > >
> > > Cheers,
> > >
> > > Hugo
> > >
> > >
> > > Hugos-MacBook-Pro:cloudstack hugo (4.3-forward)$ git diff --stat
> > > 4.3-forward 4.3
> > >
> >
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCert
> > ToLoadBalancerCmd.java
> > > | 3 +-
> > >
> >
> >
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCer
> t
> > FromLoadBalancerCmd.java
> > > | 2 +-
> > > awsapi/pom.xml
> > > | 2 +-
> > > client/pom.xml
> > > | 20 ++-
> > > client/tomcatconf/catalina.properties.in
> > > | 2 +-
> > > debian/changelog
> > > | 7 +-
> > > developer/pom.xml
> > > | 1 -
> > > engine/components-
> api/src/com/cloud/template/TemplateManager.java
> > > | 9 +-
> > >
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
> > > | 36 +----
> > >
> >
> > engine/orchestration/src/org/apache/cloudstack/engine/orchestration/Vo
> > lumeOrchestrator.java
> > > | 10 +-
> > >
> >
> > engine/schema/resources/META-INF/cloudstack/core/spring-engine-
> schema-
> > core-daos-context.xml
> > > | 2 +-
> > >
> >
> >
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDa
> > taStoreDao.java
> > > | 2 -
> > >
> >
> >
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDa
> > taStoreDaoImpl.java
> > > | 48 +-----
> > > engine/storage/integration-test/pom.xml
> > > | 5 -
> > >
> >
> > engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStorag
> > ePoolAllocator.java
> > > | 8 +-
> > > framework/db/pom.xml
> > > | 5 -
> > > framework/db/src/com/cloud/utils/db/StaticStrategy.java
> > > | 130 ----------------
> > > plugins/database/mysql-ha/pom.xml
> > > | 28 ++++
> > > plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
> > > | 133 ++++++++++++++++
> > >
> > plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentServi
> > ce.Designer.cs
> > > | 2 +-
> > >
> plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config
> > > | 7 +-
> > >
> >
> > plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtC
> > omputingResource.java
> > > | 6 +-
> > >
> >
> >
> plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorMan
> > agerImpl.java
> > > | 6 +-
> > >
> > > plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/data
> > > st ore/driver/SimulatorImageStoreDriverImpl.java
> > > | 6 -
> > >
> >
> >
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/V
> mw
> > areManagerImpl.java
> > > | 85 +++++-----
> > >
> >
> > plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpSer
> > verDiscoverer.java
> > > | 7 +-
> > >
> >
> > plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixRe
> > sourceBase.java
> > > | 70 +++++++--
> > >
> >
> > plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssRe
> > source.java
> > > | 5 +
> > >
> >
> > plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServe
> > rConnectionPool.java
> > > | 452
> > > ++++++++++++++++++++++++++++++++++++++++++++++++-----
> > > plugins/network-elements/juniper-contrail/pom.xml
> > > | 2 +-
> > > plugins/pom.xml
> > > | 11 ++
> > > pom.xml
> > > | 2 +-
> > > scripts/vm/network/security_group.py
> > > | 2 +-
> > > server/src/com/cloud/api/doc/Argument.java
> > > | 14 +-
> > > server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
> > > | 4 +-
> > >
> >
> > server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer
> > .java
> > > | 14 +-
> > > server/src/com/cloud/network/ExternalIpAddressAllocator.java
> > > | 9 +-
> > > server/src/com/cloud/network/NetworkServiceImpl.java
> > > | 20 ++-
> > > server/src/com/cloud/network/guru/GuestNetworkGuru.java
> > > | 4 +-
> > > server/src/com/cloud/projects/ProjectManagerImpl.java
> > > | 46 +++---
> > > server/src/com/cloud/template/TemplateManagerImpl.java
> > > | 35 -----
> > > server/src/com/cloud/vm/UserVmManagerImpl.java
> > > | 35 ++++-
> > > server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
> > > | 1 +
> > > server/test/resources/createNetworkOffering.xml
> > > | 2 -
> > > setup/db/hypervisor_capabilities.simulator.sql
> > > | 19 ---
> > > systemvm/patches/debian/config/etc/init.d/cloud-early-config
> > > | 10 --
> > > test/integration/component/test_multiple_ips_per_nic.py
> > > | 452
> > > -----------------------------------------------------
> > > test/integration/component/test_persistent_networks.py
> > > | 2045
> > > ++++++++++++++++++++------------------------------------------------
> > > ++++++++++++++++++++--
> > > ++++++++++++++++++++------------------------------------------------
> > > ++++++++++++++++++++--
> > > ++++++++++++++++++++------------------------------------------------
> > > ++++++++++++++++++++--
> > > ++++++++++++++++++++------------------------------------------------
> > > ++++++++++++++++++++--
> > > ++++++++++++++++++++-------------------
> > > test/integration/component/test_portable_ip.py
> > > | 132 +++++-----------
> > > test/integration/smoke/test_vm_life_cycle.py
> > > | 84 ++++------
> > > tools/devcloud-kvm/pom.xml
> > > | 2 +-
> > > tools/devcloud/pom.xml
> > > | 2 +-
> > > tools/marvin/marvin/codes.py
> > > | 4 -
> > > tools/marvin/marvin/config/config.cfg
> > > | 233
> > > ----------------------------
> > > tools/marvin/marvin/integration/lib/base.py
> > > | 36 -----
> > > tools/marvin/marvin/integration/lib/common.py
> > > | 107 ++-----------
> > > usage/pom.xml
> > > | 5 -
> > > utils/pom.xml
> > > | 5 -
> > > 58 files changed, 1098 insertions(+), 3338 deletions(-)
> > >
> > >
> > > Need Enterprise Grade Support for Apache CloudStack?
> > > Our CloudStack Infrastructure Support<
> > > http://shapeblue.com/cloudstack-infrastructure-support/> offers the
> > > best
> > > 24/7 SLA for CloudStack Environments.
> > >
> > > Apache CloudStack Bootcamp training courses
> > >
> > > **NEW!** CloudStack 4.2.1 training<
> > > http://shapeblue.com/cloudstack-training/>
> > > 18th-19th February 2014, Brazil. Classroom<
> > > http://shapeblue.com/cloudstack-training/>
> > > 17th-23rd March 2014, Region A. Instructor led, On-line<
> > > http://shapeblue.com/cloudstack-training/>
> > > 24th-28th March 2014, Region B. Instructor led, On-line<
> > > http://shapeblue.com/cloudstack-training/>
> > > 16th-20th June 2014, Region A. Instructor led, On-line<
> > > http://shapeblue.com/cloudstack-training/>
> > > 23rd-27th June 2014, Region B. Instructor led, On-line<
> > > http://shapeblue.com/cloudstack-training/>
> > >
> > > This email and any attachments to it may be confidential and are
> > > intended solely for the use of the individual to whom it is addressed.
> > > Any views or opinions expressed are solely those of the author and
> > > do not necessarily represent those of Shape Blue Ltd or related
> > > companies. If you are not the intended recipient of this email, you
> > > must neither take any action based upon its contents, nor copy or
> > > show it to anyone. Please contact the sender if you believe you have
> > > received this email in error. Shape Blue Ltd is a company
> > > incorporated in England & Wales. ShapeBlue Services India LLP is a
> > > company incorporated in India and is operated under license from
> > > Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company
> > > incorporated in Brasil and is operated under license from Shape Blue
> > > Ltd. ShapeBlue is a
> > registered trademark.
> > >
> >
> >
> >
> > --
> > *Mike Tutkowski*
> > *Senior CloudStack Developer, SolidFire Inc.*
> > e: mike.tutkowski@solidfire.com
> > o: 303.746.7302
> > Advancing the way the world uses the
> > cloud<http://solidfire.com/solution/overview/?video=play>
> > *(tm)*
> >
>
>
>
> --
> *Mike Tutkowski*
> *Senior CloudStack Developer, SolidFire Inc.*
> e: mike.tutkowski@solidfire.com
> o: 303.746.7302
> Advancing the way the world uses the
> cloud<http://solidfire.com/solution/overview/?video=play>
> *(tm)*
Re: Differences between 4.3 and 4.3-forward
Posted by Mike Tutkowski <mi...@solidfire.com>.
Yes, and we definitely cannot just take all of 4.3.1 and put it in 4.3 as
many of those changes are intended for 4.3.1 and not 4.3.
On Fri, Mar 14, 2014 at 8:40 AM, Sudha Ponnaganti <
sudha.ponnaganti@citrix.com> wrote:
> Yes - 4.3-forward is unstable branch and should be merged while 4.3 is
> going through RC. It is meant for maintenance release.
>
> -----Original Message-----
> From: Mike Tutkowski [mailto:mike.tutkowski@solidfire.com]
> Sent: Friday, March 14, 2014 7:36 AM
> To: dev@cloudstack.apache.org
> Subject: Re: Differences between 4.3 and 4.3-forward
>
> Right, I think it's dangerous to sync 4.3.1 to 4.3 because developers
> might have changes in 4.3.1 that are not yet in master.
>
> This is not my situation personally, but I imagine some devs might be in
> this state.
>
>
> On Fri, Mar 14, 2014 at 8:18 AM, Sudha Ponnaganti <
> sudha.ponnaganti@citrix.com> wrote:
>
> > Yes that is my understanding that all of these would go in to next
> > maintenance that is why they are staged in forward branch.
> >
> > -----Original Message-----
> > From: Paul Angus [mailto:paul.angus@shapeblue.com]
> > Sent: Friday, March 14, 2014 1:38 AM
> > To: dev@cloudstack.apache.org
> > Subject: RE: Differences between 4.3 and 4.3-forward
> >
> > Will these automatically go into 4.3.1, do we know if they've gone
> > into master as well?
> >
> > Otherwise does this mean we have a load of bug fixes which we're not
> > putting into 4.3.0 which could potentially become orphaned in the
> > 4.3-forward branch? (this query may be just my ignorance regarding ACS
> > branching)
> >
> > Regards,
> >
> > Paul Angus
> > Cloud Architect
> > S: +44 20 3603 0540 | M: +447711418784 | T: @CloudyAngus
> > paul.angus@shapeblue.com
> >
> > -----Original Message-----
> > From: Trippie [mailto:trippie@gmail.com] On Behalf Of Hugo Trippaers
> > Sent: 12 March 2014 08:29
> > To: <de...@cloudstack.apache.org>
> > Subject: Differences between 4.3 and 4.3-forward
> >
> > Hey,
> >
> > There is a sizable number of differences between the two branch. Maybe
> > it's time to ditch 4.3-forward and recreate it based on current 4.3?
> >
> > Cheers,
> >
> > Hugo
> >
> >
> > Hugos-MacBook-Pro:cloudstack hugo (4.3-forward)$ git diff --stat
> > 4.3-forward 4.3
> >
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
> > | 3 +-
> >
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
> > | 2 +-
> > awsapi/pom.xml
> > | 2 +-
> > client/pom.xml
> > | 20 ++-
> > client/tomcatconf/catalina.properties.in
> > | 2 +-
> > debian/changelog
> > | 7 +-
> > developer/pom.xml
> > | 1 -
> > engine/components-api/src/com/cloud/template/TemplateManager.java
> > | 9 +-
> > engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
> > | 36 +----
> >
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
> > | 10 +-
> >
> engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
> > | 2 +-
> >
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java
> > | 2 -
> >
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
> > | 48 +-----
> > engine/storage/integration-test/pom.xml
> > | 5 -
> >
> engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java
> > | 8 +-
> > framework/db/pom.xml
> > | 5 -
> > framework/db/src/com/cloud/utils/db/StaticStrategy.java
> > | 130 ----------------
> > plugins/database/mysql-ha/pom.xml
> > | 28 ++++
> > plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
> > | 133 ++++++++++++++++
> >
> plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs
> > | 2 +-
> > plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config
> > | 7 +-
> >
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
> > | 6 +-
> >
> plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
> > | 6 +-
> >
> > plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datast
> > ore/driver/SimulatorImageStoreDriverImpl.java
> > | 6 -
> >
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
> > | 85 +++++-----
> >
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
> > | 7 +-
> >
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
> > | 70 +++++++--
> >
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
> > | 5 +
> >
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
> > | 452
> > ++++++++++++++++++++++++++++++++++++++++++++++++-----
> > plugins/network-elements/juniper-contrail/pom.xml
> > | 2 +-
> > plugins/pom.xml
> > | 11 ++
> > pom.xml
> > | 2 +-
> > scripts/vm/network/security_group.py
> > | 2 +-
> > server/src/com/cloud/api/doc/Argument.java
> > | 14 +-
> > server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
> > | 4 +-
> >
> server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
> > | 14 +-
> > server/src/com/cloud/network/ExternalIpAddressAllocator.java
> > | 9 +-
> > server/src/com/cloud/network/NetworkServiceImpl.java
> > | 20 ++-
> > server/src/com/cloud/network/guru/GuestNetworkGuru.java
> > | 4 +-
> > server/src/com/cloud/projects/ProjectManagerImpl.java
> > | 46 +++---
> > server/src/com/cloud/template/TemplateManagerImpl.java
> > | 35 -----
> > server/src/com/cloud/vm/UserVmManagerImpl.java
> > | 35 ++++-
> > server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
> > | 1 +
> > server/test/resources/createNetworkOffering.xml
> > | 2 -
> > setup/db/hypervisor_capabilities.simulator.sql
> > | 19 ---
> > systemvm/patches/debian/config/etc/init.d/cloud-early-config
> > | 10 --
> > test/integration/component/test_multiple_ips_per_nic.py
> > | 452
> > -----------------------------------------------------
> > test/integration/component/test_persistent_networks.py
> > | 2045
> > ++++++++++++++++++++--------------------------------------------------
> > ++++++++++++++++++++--------------------------------------------------
> > ++++++++++++++++++++--------------------------------------------------
> > ++++++++++++++++++++--------------------------------------------------
> > ++++++++++++++++++++-------------------
> > test/integration/component/test_portable_ip.py
> > | 132 +++++-----------
> > test/integration/smoke/test_vm_life_cycle.py
> > | 84 ++++------
> > tools/devcloud-kvm/pom.xml
> > | 2 +-
> > tools/devcloud/pom.xml
> > | 2 +-
> > tools/marvin/marvin/codes.py
> > | 4 -
> > tools/marvin/marvin/config/config.cfg
> > | 233
> > ----------------------------
> > tools/marvin/marvin/integration/lib/base.py
> > | 36 -----
> > tools/marvin/marvin/integration/lib/common.py
> > | 107 ++-----------
> > usage/pom.xml
> > | 5 -
> > utils/pom.xml
> > | 5 -
> > 58 files changed, 1098 insertions(+), 3338 deletions(-)
> >
> >
> > Need Enterprise Grade Support for Apache CloudStack?
> > Our CloudStack Infrastructure Support<
> > http://shapeblue.com/cloudstack-infrastructure-support/> offers the
> > best
> > 24/7 SLA for CloudStack Environments.
> >
> > Apache CloudStack Bootcamp training courses
> >
> > **NEW!** CloudStack 4.2.1 training<
> > http://shapeblue.com/cloudstack-training/>
> > 18th-19th February 2014, Brazil. Classroom<
> > http://shapeblue.com/cloudstack-training/>
> > 17th-23rd March 2014, Region A. Instructor led, On-line<
> > http://shapeblue.com/cloudstack-training/>
> > 24th-28th March 2014, Region B. Instructor led, On-line<
> > http://shapeblue.com/cloudstack-training/>
> > 16th-20th June 2014, Region A. Instructor led, On-line<
> > http://shapeblue.com/cloudstack-training/>
> > 23rd-27th June 2014, Region B. Instructor led, On-line<
> > http://shapeblue.com/cloudstack-training/>
> >
> > This email and any attachments to it may be confidential and are
> > intended solely for the use of the individual to whom it is addressed.
> > Any views or opinions expressed are solely those of the author and do
> > not necessarily represent those of Shape Blue Ltd or related
> > companies. If you are not the intended recipient of this email, you
> > must neither take any action based upon its contents, nor copy or show
> > it to anyone. Please contact the sender if you believe you have
> > received this email in error. Shape Blue Ltd is a company incorporated
> > in England & Wales. ShapeBlue Services India LLP is a company
> > incorporated in India and is operated under license from Shape Blue
> > Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in
> > Brasil and is operated under license from Shape Blue Ltd. ShapeBlue is a
> registered trademark.
> >
>
>
>
> --
> *Mike Tutkowski*
> *Senior CloudStack Developer, SolidFire Inc.*
> e: mike.tutkowski@solidfire.com
> o: 303.746.7302
> Advancing the way the world uses the
> cloud<http://solidfire.com/solution/overview/?video=play>
> *(tm)*
>
--
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkowski@solidfire.com
o: 303.746.7302
Advancing the way the world uses the
cloud<http://solidfire.com/solution/overview/?video=play>
*(tm)*
RE: Differences between 4.3 and 4.3-forward
Posted by Sudha Ponnaganti <su...@citrix.com>.
Yes - 4.3-forward is unstable branch and should be merged while 4.3 is going through RC. It is meant for maintenance release.
-----Original Message-----
From: Mike Tutkowski [mailto:mike.tutkowski@solidfire.com]
Sent: Friday, March 14, 2014 7:36 AM
To: dev@cloudstack.apache.org
Subject: Re: Differences between 4.3 and 4.3-forward
Right, I think it's dangerous to sync 4.3.1 to 4.3 because developers might have changes in 4.3.1 that are not yet in master.
This is not my situation personally, but I imagine some devs might be in this state.
On Fri, Mar 14, 2014 at 8:18 AM, Sudha Ponnaganti < sudha.ponnaganti@citrix.com> wrote:
> Yes that is my understanding that all of these would go in to next
> maintenance that is why they are staged in forward branch.
>
> -----Original Message-----
> From: Paul Angus [mailto:paul.angus@shapeblue.com]
> Sent: Friday, March 14, 2014 1:38 AM
> To: dev@cloudstack.apache.org
> Subject: RE: Differences between 4.3 and 4.3-forward
>
> Will these automatically go into 4.3.1, do we know if they've gone
> into master as well?
>
> Otherwise does this mean we have a load of bug fixes which we're not
> putting into 4.3.0 which could potentially become orphaned in the
> 4.3-forward branch? (this query may be just my ignorance regarding ACS
> branching)
>
> Regards,
>
> Paul Angus
> Cloud Architect
> S: +44 20 3603 0540 | M: +447711418784 | T: @CloudyAngus
> paul.angus@shapeblue.com
>
> -----Original Message-----
> From: Trippie [mailto:trippie@gmail.com] On Behalf Of Hugo Trippaers
> Sent: 12 March 2014 08:29
> To: <de...@cloudstack.apache.org>
> Subject: Differences between 4.3 and 4.3-forward
>
> Hey,
>
> There is a sizable number of differences between the two branch. Maybe
> it's time to ditch 4.3-forward and recreate it based on current 4.3?
>
> Cheers,
>
> Hugo
>
>
> Hugos-MacBook-Pro:cloudstack hugo (4.3-forward)$ git diff --stat
> 4.3-forward 4.3
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
> | 3 +-
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
> | 2 +-
> awsapi/pom.xml
> | 2 +-
> client/pom.xml
> | 20 ++-
> client/tomcatconf/catalina.properties.in
> | 2 +-
> debian/changelog
> | 7 +-
> developer/pom.xml
> | 1 -
> engine/components-api/src/com/cloud/template/TemplateManager.java
> | 9 +-
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
> | 36 +----
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
> | 10 +-
> engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
> | 2 +-
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java
> | 2 -
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
> | 48 +-----
> engine/storage/integration-test/pom.xml
> | 5 -
> engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java
> | 8 +-
> framework/db/pom.xml
> | 5 -
> framework/db/src/com/cloud/utils/db/StaticStrategy.java
> | 130 ----------------
> plugins/database/mysql-ha/pom.xml
> | 28 ++++
> plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
> | 133 ++++++++++++++++
> plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs
> | 2 +-
> plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config
> | 7 +-
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
> | 6 +-
> plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
> | 6 +-
>
> plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datast
> ore/driver/SimulatorImageStoreDriverImpl.java
> | 6 -
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
> | 85 +++++-----
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
> | 7 +-
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
> | 70 +++++++--
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
> | 5 +
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
> | 452
> ++++++++++++++++++++++++++++++++++++++++++++++++-----
> plugins/network-elements/juniper-contrail/pom.xml
> | 2 +-
> plugins/pom.xml
> | 11 ++
> pom.xml
> | 2 +-
> scripts/vm/network/security_group.py
> | 2 +-
> server/src/com/cloud/api/doc/Argument.java
> | 14 +-
> server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
> | 4 +-
> server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
> | 14 +-
> server/src/com/cloud/network/ExternalIpAddressAllocator.java
> | 9 +-
> server/src/com/cloud/network/NetworkServiceImpl.java
> | 20 ++-
> server/src/com/cloud/network/guru/GuestNetworkGuru.java
> | 4 +-
> server/src/com/cloud/projects/ProjectManagerImpl.java
> | 46 +++---
> server/src/com/cloud/template/TemplateManagerImpl.java
> | 35 -----
> server/src/com/cloud/vm/UserVmManagerImpl.java
> | 35 ++++-
> server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
> | 1 +
> server/test/resources/createNetworkOffering.xml
> | 2 -
> setup/db/hypervisor_capabilities.simulator.sql
> | 19 ---
> systemvm/patches/debian/config/etc/init.d/cloud-early-config
> | 10 --
> test/integration/component/test_multiple_ips_per_nic.py
> | 452
> -----------------------------------------------------
> test/integration/component/test_persistent_networks.py
> | 2045
> ++++++++++++++++++++--------------------------------------------------
> ++++++++++++++++++++--------------------------------------------------
> ++++++++++++++++++++--------------------------------------------------
> ++++++++++++++++++++--------------------------------------------------
> ++++++++++++++++++++-------------------
> test/integration/component/test_portable_ip.py
> | 132 +++++-----------
> test/integration/smoke/test_vm_life_cycle.py
> | 84 ++++------
> tools/devcloud-kvm/pom.xml
> | 2 +-
> tools/devcloud/pom.xml
> | 2 +-
> tools/marvin/marvin/codes.py
> | 4 -
> tools/marvin/marvin/config/config.cfg
> | 233
> ----------------------------
> tools/marvin/marvin/integration/lib/base.py
> | 36 -----
> tools/marvin/marvin/integration/lib/common.py
> | 107 ++-----------
> usage/pom.xml
> | 5 -
> utils/pom.xml
> | 5 -
> 58 files changed, 1098 insertions(+), 3338 deletions(-)
>
>
> Need Enterprise Grade Support for Apache CloudStack?
> Our CloudStack Infrastructure Support<
> http://shapeblue.com/cloudstack-infrastructure-support/> offers the
> best
> 24/7 SLA for CloudStack Environments.
>
> Apache CloudStack Bootcamp training courses
>
> **NEW!** CloudStack 4.2.1 training<
> http://shapeblue.com/cloudstack-training/>
> 18th-19th February 2014, Brazil. Classroom<
> http://shapeblue.com/cloudstack-training/>
> 17th-23rd March 2014, Region A. Instructor led, On-line<
> http://shapeblue.com/cloudstack-training/>
> 24th-28th March 2014, Region B. Instructor led, On-line<
> http://shapeblue.com/cloudstack-training/>
> 16th-20th June 2014, Region A. Instructor led, On-line<
> http://shapeblue.com/cloudstack-training/>
> 23rd-27th June 2014, Region B. Instructor led, On-line<
> http://shapeblue.com/cloudstack-training/>
>
> This email and any attachments to it may be confidential and are
> intended solely for the use of the individual to whom it is addressed.
> Any views or opinions expressed are solely those of the author and do
> not necessarily represent those of Shape Blue Ltd or related
> companies. If you are not the intended recipient of this email, you
> must neither take any action based upon its contents, nor copy or show
> it to anyone. Please contact the sender if you believe you have
> received this email in error. Shape Blue Ltd is a company incorporated
> in England & Wales. ShapeBlue Services India LLP is a company
> incorporated in India and is operated under license from Shape Blue
> Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in
> Brasil and is operated under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
>
--
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkowski@solidfire.com
o: 303.746.7302
Advancing the way the world uses the
cloud<http://solidfire.com/solution/overview/?video=play>
*(tm)*
Re: Differences between 4.3 and 4.3-forward
Posted by Mike Tutkowski <mi...@solidfire.com>.
Right, I think it's dangerous to sync 4.3.1 to 4.3 because developers might
have changes in 4.3.1 that are not yet in master.
This is not my situation personally, but I imagine some devs might be in
this state.
On Fri, Mar 14, 2014 at 8:18 AM, Sudha Ponnaganti <
sudha.ponnaganti@citrix.com> wrote:
> Yes that is my understanding that all of these would go in to next
> maintenance that is why they are staged in forward branch.
>
> -----Original Message-----
> From: Paul Angus [mailto:paul.angus@shapeblue.com]
> Sent: Friday, March 14, 2014 1:38 AM
> To: dev@cloudstack.apache.org
> Subject: RE: Differences between 4.3 and 4.3-forward
>
> Will these automatically go into 4.3.1, do we know if they've gone into
> master as well?
>
> Otherwise does this mean we have a load of bug fixes which we're not
> putting into 4.3.0 which could potentially become orphaned in the
> 4.3-forward branch? (this query may be just my ignorance regarding ACS
> branching)
>
> Regards,
>
> Paul Angus
> Cloud Architect
> S: +44 20 3603 0540 | M: +447711418784 | T: @CloudyAngus
> paul.angus@shapeblue.com
>
> -----Original Message-----
> From: Trippie [mailto:trippie@gmail.com] On Behalf Of Hugo Trippaers
> Sent: 12 March 2014 08:29
> To: <de...@cloudstack.apache.org>
> Subject: Differences between 4.3 and 4.3-forward
>
> Hey,
>
> There is a sizable number of differences between the two branch. Maybe
> it's time to ditch 4.3-forward and recreate it based on current 4.3?
>
> Cheers,
>
> Hugo
>
>
> Hugos-MacBook-Pro:cloudstack hugo (4.3-forward)$ git diff --stat
> 4.3-forward 4.3
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
> | 3 +-
> api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
> | 2 +-
> awsapi/pom.xml
> | 2 +-
> client/pom.xml
> | 20 ++-
> client/tomcatconf/catalina.properties.in
> | 2 +-
> debian/changelog
> | 7 +-
> developer/pom.xml
> | 1 -
> engine/components-api/src/com/cloud/template/TemplateManager.java
> | 9 +-
> engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
> | 36 +----
> engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
> | 10 +-
> engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml
> | 2 +-
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java
> | 2 -
> engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java
> | 48 +-----
> engine/storage/integration-test/pom.xml
> | 5 -
> engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java
> | 8 +-
> framework/db/pom.xml
> | 5 -
> framework/db/src/com/cloud/utils/db/StaticStrategy.java
> | 130 ----------------
> plugins/database/mysql-ha/pom.xml
> | 28 ++++
> plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
> | 133 ++++++++++++++++
> plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs
> | 2 +-
> plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config
> | 7 +-
> plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
> | 6 +-
> plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java
> | 6 +-
> plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/driver/SimulatorImageStoreDriverImpl.java
> | 6 -
> plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
> | 85 +++++-----
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
> | 7 +-
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
> | 70 +++++++--
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java
> | 5 +
> plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
> | 452
> ++++++++++++++++++++++++++++++++++++++++++++++++-----
> plugins/network-elements/juniper-contrail/pom.xml
> | 2 +-
> plugins/pom.xml
> | 11 ++
> pom.xml
> | 2 +-
> scripts/vm/network/security_group.py
> | 2 +-
> server/src/com/cloud/api/doc/Argument.java
> | 14 +-
> server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
> | 4 +-
> server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java
> | 14 +-
> server/src/com/cloud/network/ExternalIpAddressAllocator.java
> | 9 +-
> server/src/com/cloud/network/NetworkServiceImpl.java
> | 20 ++-
> server/src/com/cloud/network/guru/GuestNetworkGuru.java
> | 4 +-
> server/src/com/cloud/projects/ProjectManagerImpl.java
> | 46 +++---
> server/src/com/cloud/template/TemplateManagerImpl.java
> | 35 -----
> server/src/com/cloud/vm/UserVmManagerImpl.java
> | 35 ++++-
> server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
> | 1 +
> server/test/resources/createNetworkOffering.xml
> | 2 -
> setup/db/hypervisor_capabilities.simulator.sql
> | 19 ---
> systemvm/patches/debian/config/etc/init.d/cloud-early-config
> | 10 --
> test/integration/component/test_multiple_ips_per_nic.py
> | 452
> -----------------------------------------------------
> test/integration/component/test_persistent_networks.py
> | 2045
> ++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
> test/integration/component/test_portable_ip.py
> | 132 +++++-----------
> test/integration/smoke/test_vm_life_cycle.py
> | 84 ++++------
> tools/devcloud-kvm/pom.xml
> | 2 +-
> tools/devcloud/pom.xml
> | 2 +-
> tools/marvin/marvin/codes.py
> | 4 -
> tools/marvin/marvin/config/config.cfg
> | 233
> ----------------------------
> tools/marvin/marvin/integration/lib/base.py
> | 36 -----
> tools/marvin/marvin/integration/lib/common.py
> | 107 ++-----------
> usage/pom.xml
> | 5 -
> utils/pom.xml
> | 5 -
> 58 files changed, 1098 insertions(+), 3338 deletions(-)
>
>
> Need Enterprise Grade Support for Apache CloudStack?
> Our CloudStack Infrastructure Support<
> http://shapeblue.com/cloudstack-infrastructure-support/> offers the best
> 24/7 SLA for CloudStack Environments.
>
> Apache CloudStack Bootcamp training courses
>
> **NEW!** CloudStack 4.2.1 training<
> http://shapeblue.com/cloudstack-training/>
> 18th-19th February 2014, Brazil. Classroom<
> http://shapeblue.com/cloudstack-training/>
> 17th-23rd March 2014, Region A. Instructor led, On-line<
> http://shapeblue.com/cloudstack-training/>
> 24th-28th March 2014, Region B. Instructor led, On-line<
> http://shapeblue.com/cloudstack-training/>
> 16th-20th June 2014, Region A. Instructor led, On-line<
> http://shapeblue.com/cloudstack-training/>
> 23rd-27th June 2014, Region B. Instructor led, On-line<
> http://shapeblue.com/cloudstack-training/>
>
> This email and any attachments to it may be confidential and are intended
> solely for the use of the individual to whom it is addressed. Any views or
> opinions expressed are solely those of the author and do not necessarily
> represent those of Shape Blue Ltd or related companies. If you are not the
> intended recipient of this email, you must neither take any action based
> upon its contents, nor copy or show it to anyone. Please contact the sender
> if you believe you have received this email in error. Shape Blue Ltd is a
> company incorporated in England & Wales. ShapeBlue Services India LLP is a
> company incorporated in India and is operated under license from Shape Blue
> Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil
> and is operated under license from Shape Blue Ltd. ShapeBlue is a
> registered trademark.
>
--
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkowski@solidfire.com
o: 303.746.7302
Advancing the way the world uses the
cloud<http://solidfire.com/solution/overview/?video=play>
*(tm)*
RE: Differences between 4.3 and 4.3-forward
Posted by Sudha Ponnaganti <su...@citrix.com>.
Yes that is my understanding that all of these would go in to next maintenance that is why they are staged in forward branch.
-----Original Message-----
From: Paul Angus [mailto:paul.angus@shapeblue.com]
Sent: Friday, March 14, 2014 1:38 AM
To: dev@cloudstack.apache.org
Subject: RE: Differences between 4.3 and 4.3-forward
Will these automatically go into 4.3.1, do we know if they've gone into master as well?
Otherwise does this mean we have a load of bug fixes which we're not putting into 4.3.0 which could potentially become orphaned in the 4.3-forward branch? (this query may be just my ignorance regarding ACS branching)
Regards,
Paul Angus
Cloud Architect
S: +44 20 3603 0540 | M: +447711418784 | T: @CloudyAngus paul.angus@shapeblue.com
-----Original Message-----
From: Trippie [mailto:trippie@gmail.com] On Behalf Of Hugo Trippaers
Sent: 12 March 2014 08:29
To: <de...@cloudstack.apache.org>
Subject: Differences between 4.3 and 4.3-forward
Hey,
There is a sizable number of differences between the two branch. Maybe it's time to ditch 4.3-forward and recreate it based on current 4.3?
Cheers,
Hugo
Hugos-MacBook-Pro:cloudstack hugo (4.3-forward)$ git diff --stat 4.3-forward 4.3
api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java | 3 +-
api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java | 2 +-
awsapi/pom.xml | 2 +-
client/pom.xml | 20 ++-
client/tomcatconf/catalina.properties.in | 2 +-
debian/changelog | 7 +-
developer/pom.xml | 1 -
engine/components-api/src/com/cloud/template/TemplateManager.java | 9 +-
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 36 +----
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java | 10 +-
engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml | 2 +-
engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java | 2 -
engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java | 48 +-----
engine/storage/integration-test/pom.xml | 5 -
engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java | 8 +-
framework/db/pom.xml | 5 -
framework/db/src/com/cloud/utils/db/StaticStrategy.java | 130 ----------------
plugins/database/mysql-ha/pom.xml | 28 ++++
plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java | 133 ++++++++++++++++
plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs | 2 +-
plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config | 7 +-
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 6 +-
plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java | 6 +-
plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/driver/SimulatorImageStoreDriverImpl.java | 6 -
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 85 +++++-----
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 7 +-
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 70 +++++++--
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java | 5 +
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java | 452 ++++++++++++++++++++++++++++++++++++++++++++++++-----
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
plugins/pom.xml | 11 ++
pom.xml | 2 +-
scripts/vm/network/security_group.py | 2 +-
server/src/com/cloud/api/doc/Argument.java | 14 +-
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 4 +-
server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java | 14 +-
server/src/com/cloud/network/ExternalIpAddressAllocator.java | 9 +-
server/src/com/cloud/network/NetworkServiceImpl.java | 20 ++-
server/src/com/cloud/network/guru/GuestNetworkGuru.java | 4 +-
server/src/com/cloud/projects/ProjectManagerImpl.java | 46 +++---
server/src/com/cloud/template/TemplateManagerImpl.java | 35 -----
server/src/com/cloud/vm/UserVmManagerImpl.java | 35 ++++-
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 1 +
server/test/resources/createNetworkOffering.xml | 2 -
setup/db/hypervisor_capabilities.simulator.sql | 19 ---
systemvm/patches/debian/config/etc/init.d/cloud-early-config | 10 --
test/integration/component/test_multiple_ips_per_nic.py | 452 -----------------------------------------------------
test/integration/component/test_persistent_networks.py | 2045 ++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
test/integration/component/test_portable_ip.py | 132 +++++-----------
test/integration/smoke/test_vm_life_cycle.py | 84 ++++------
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud/pom.xml | 2 +-
tools/marvin/marvin/codes.py | 4 -
tools/marvin/marvin/config/config.cfg | 233 ----------------------------
tools/marvin/marvin/integration/lib/base.py | 36 -----
tools/marvin/marvin/integration/lib/common.py | 107 ++-----------
usage/pom.xml | 5 -
utils/pom.xml | 5 -
58 files changed, 1098 insertions(+), 3338 deletions(-)
Need Enterprise Grade Support for Apache CloudStack?
Our CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/> offers the best 24/7 SLA for CloudStack Environments.
Apache CloudStack Bootcamp training courses
**NEW!** CloudStack 4.2.1 training<http://shapeblue.com/cloudstack-training/>
18th-19th February 2014, Brazil. Classroom<http://shapeblue.com/cloudstack-training/>
17th-23rd March 2014, Region A. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
24th-28th March 2014, Region B. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
16th-20th June 2014, Region A. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
23rd-27th June 2014, Region B. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue is a registered trademark.
RE: Differences between 4.3 and 4.3-forward
Posted by Paul Angus <pa...@shapeblue.com>.
Will these automatically go into 4.3.1, do we know if they've gone into master as well?
Otherwise does this mean we have a load of bug fixes which we're not putting into 4.3.0 which could potentially become orphaned in the 4.3-forward branch? (this query may be just my ignorance regarding ACS branching)
Regards,
Paul Angus
Cloud Architect
S: +44 20 3603 0540 | M: +447711418784 | T: @CloudyAngus
paul.angus@shapeblue.com
-----Original Message-----
From: Trippie [mailto:trippie@gmail.com] On Behalf Of Hugo Trippaers
Sent: 12 March 2014 08:29
To: <de...@cloudstack.apache.org>
Subject: Differences between 4.3 and 4.3-forward
Hey,
There is a sizable number of differences between the two branch. Maybe it's time to ditch 4.3-forward and recreate it based on current 4.3?
Cheers,
Hugo
Hugos-MacBook-Pro:cloudstack hugo (4.3-forward)$ git diff --stat 4.3-forward 4.3
api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java | 3 +-
api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java | 2 +-
awsapi/pom.xml | 2 +-
client/pom.xml | 20 ++-
client/tomcatconf/catalina.properties.in | 2 +-
debian/changelog | 7 +-
developer/pom.xml | 1 -
engine/components-api/src/com/cloud/template/TemplateManager.java | 9 +-
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 36 +----
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java | 10 +-
engine/schema/resources/META-INF/cloudstack/core/spring-engine-schema-core-daos-context.xml | 2 +-
engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java | 2 -
engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java | 48 +-----
engine/storage/integration-test/pom.xml | 5 -
engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java | 8 +-
framework/db/pom.xml | 5 -
framework/db/src/com/cloud/utils/db/StaticStrategy.java | 130 ----------------
plugins/database/mysql-ha/pom.xml | 28 ++++
plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java | 133 ++++++++++++++++
plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/AgentService.Designer.cs | 2 +-
plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config | 7 +-
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 6 +-
plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManagerImpl.java | 6 +-
plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/driver/SimulatorImageStoreDriverImpl.java | 6 -
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java | 85 +++++-----
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java | 7 +-
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 70 +++++++--
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResource.java | 5 +
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java | 452 ++++++++++++++++++++++++++++++++++++++++++++++++-----
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
plugins/pom.xml | 11 ++
pom.xml | 2 +-
scripts/vm/network/security_group.py | 2 +-
server/src/com/cloud/api/doc/Argument.java | 14 +-
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 4 +-
server/src/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java | 14 +-
server/src/com/cloud/network/ExternalIpAddressAllocator.java | 9 +-
server/src/com/cloud/network/NetworkServiceImpl.java | 20 ++-
server/src/com/cloud/network/guru/GuestNetworkGuru.java | 4 +-
server/src/com/cloud/projects/ProjectManagerImpl.java | 46 +++---
server/src/com/cloud/template/TemplateManagerImpl.java | 35 -----
server/src/com/cloud/vm/UserVmManagerImpl.java | 35 ++++-
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java | 1 +
server/test/resources/createNetworkOffering.xml | 2 -
setup/db/hypervisor_capabilities.simulator.sql | 19 ---
systemvm/patches/debian/config/etc/init.d/cloud-early-config | 10 --
test/integration/component/test_multiple_ips_per_nic.py | 452 -----------------------------------------------------
test/integration/component/test_persistent_networks.py | 2045 ++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
test/integration/component/test_portable_ip.py | 132 +++++-----------
test/integration/smoke/test_vm_life_cycle.py | 84 ++++------
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud/pom.xml | 2 +-
tools/marvin/marvin/codes.py | 4 -
tools/marvin/marvin/config/config.cfg | 233 ----------------------------
tools/marvin/marvin/integration/lib/base.py | 36 -----
tools/marvin/marvin/integration/lib/common.py | 107 ++-----------
usage/pom.xml | 5 -
utils/pom.xml | 5 -
58 files changed, 1098 insertions(+), 3338 deletions(-)
Need Enterprise Grade Support for Apache CloudStack?
Our CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastructure-support/> offers the best 24/7 SLA for CloudStack Environments.
Apache CloudStack Bootcamp training courses
**NEW!** CloudStack 4.2.1 training<http://shapeblue.com/cloudstack-training/>
18th-19th February 2014, Brazil. Classroom<http://shapeblue.com/cloudstack-training/>
17th-23rd March 2014, Region A. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
24th-28th March 2014, Region B. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
16th-20th June 2014, Region A. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
23rd-27th June 2014, Region B. Instructor led, On-line<http://shapeblue.com/cloudstack-training/>
This email and any attachments to it may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of Shape Blue Ltd or related companies. If you are not the intended recipient of this email, you must neither take any action based upon its contents, nor copy or show it to anyone. Please contact the sender if you believe you have received this email in error. Shape Blue Ltd is a company incorporated in England & Wales. ShapeBlue Services India LLP is a company incorporated in India and is operated under license from Shape Blue Ltd. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and is operated under license from Shape Blue Ltd. ShapeBlue is a registered trademark.