Re: merging versus cherry-picking

Thu, 16 Oct 2014 03:35:52 -0700 

On Thu, Oct 16, 2014 at 11:34 AM, Daan Hoogland <daan.hoogl...@gmail.com>
wrote:
​...​


> I will do a test merge-back of 4.5 to master to see how big the damage is​.
>
​So I did locally and found:​

commit 148efbb73f0e084614eff62f48ea9fa964c64da8
Merge: 1f8cf0b 420d4e0
Author: Daan Hoogland <d...@onecht.net>
Date:   Thu Oct 16 12:29:37 2014 +0200

    Merge remote-tracking branch 'origin/4.5' into merge-master

    Conflicts:
        engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java

plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java

plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java

plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java

plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java

plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java

server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
        setup/db/db/schema-441to450.sql
        test/integration/component/test_deploy_vgpu_vm.py
        tools/marvin/marvin/config/test_data.py

​It seems we can still go ahead if I push this.​

-- 
Daan

Reply via email to