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.an...@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.an...@shapeblue.com -----Original Message----- From: Trippie [mailto:trip...@gmail.com] On Behalf Of Hugo Trippaers Sent: 12 March 2014 08:29 To: <dev@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.
