Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 797D610E7B for ; Wed, 12 Mar 2014 08:45:14 +0000 (UTC) Received: (qmail 69288 invoked by uid 500); 12 Mar 2014 08:29:16 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 69194 invoked by uid 500); 12 Mar 2014 08:29:05 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 69167 invoked by uid 99); 12 Mar 2014 08:29:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2014 08:29:02 +0000 X-ASF-Spam-Status: No, hits=2.8 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS,URIBL_BLACK X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of trippie@gmail.com designates 209.85.215.173 as permitted sender) Received: from [209.85.215.173] (HELO mail-ea0-f173.google.com) (209.85.215.173) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2014 08:28:57 +0000 Received: by mail-ea0-f173.google.com with SMTP id r15so4812512ead.4 for ; Wed, 12 Mar 2014 01:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:content-type:content-transfer-encoding:subject :message-id:date:to:mime-version; bh=SiQcgPjAK6qB0aVIzxTbSHaI9bpdZzm482DdneVibzA=; b=Gfq15/2gFYWzurBCAhyS0yjQHjDYUon6WkoZniS8QIHGJj2j7ApJ2gZEP7EC9C/q9F Q8bj3gv7cBDADPH76nTwprw+xuocaHIekVfTnu4/PpR9vCEDYSeV00WHq+3Nxws2SIYl cmaKHFDSsD8blK0TLSLjxuQphivVIud4v2tSZvlrRsoSvBZKq61R+9kk3yzqk/Eo/Iah +jBfU/s2hqg8PqEBsdoCA9gkcvZQmGviwgzHqsQY678AjF85C7VhXBl0zBqzEuC83jsZ qTvl0jANLlxX6w67SFsTVvclc1njH4d+UY88MuZZBnLWh52DrvZnYM507q0Fl2DVqY87 Tjvw== X-Received: by 10.14.88.131 with SMTP id a3mr2415647eef.64.1394612915963; Wed, 12 Mar 2014 01:28:35 -0700 (PDT) Received: from [10.10.1.13] ([95.142.96.53]) by mx.google.com with ESMTPSA id x3sm67284814eep.17.2014.03.12.01.28.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 01:28:35 -0700 (PDT) Sender: Trippie From: Hugo Trippaers Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Differences between 4.3 and 4.3-forward Message-Id: <0B0ED8C5-C7D3-4661-8FF9-324B431F141E@GMAIL.com> Date: Wed, 12 Mar 2014 09:28:32 +0100 To: "" Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) X-Mailer: Apple Mail (2.1874) X-Virus-Checked: Checked by ClamAV on apache.org Hey, There is a sizable number of differences between the two branch. Maybe = it=92s 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/AssignCertToLo= adBalancerCmd.java | 3 +- = api/src/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFrom= LoadBalancerCmd.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/Volume= Orchestrator.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/PrimaryDataSt= oreDao.java | 2 - = engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataSt= oreDaoImpl.java | 48 +----- engine/storage/integration-test/pom.xml = | 5 - = engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoo= lAllocator.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.D= esigner.cs | 2 +- plugins/hypervisors/hyperv/DotNet/ServerResource/AgentShell/App.config = | 7 +- = plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtCompu= tingResource.java | 6 +- = plugins/hypervisors/simulator/src/com/cloud/agent/manager/SimulatorManager= Impl.java | 6 +- = plugins/hypervisors/simulator/src/org/apache/cloudstack/storage/datastore/= driver/SimulatorImageStoreDriverImpl.java | 6 - = plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareM= anagerImpl.java | 85 +++++----- = plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerD= iscoverer.java | 7 +- = plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResour= ceBase.java | 70 +++++++-- = plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XcpOssResour= ce.java | 5 + = plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerCon= nectionPool.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.jav= a | 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(-)