Thanks for keeping at it Rajani, I gave up yesterday on merging the 4.4.2 to 4.5.0 upgrade code after it resulted in a merge mess. These changes are not in your pull request (yet?). Also I see travis failures mentioned. So I think we are not ready for this.
The upgrade code contained quite some doublures and my cleanup will result in merge conflicts. I am about to port my build_asf.sh adjustments to 4.5. On Tue, Nov 25, 2014 at 7:18 AM, karuturi <g...@git.apache.org> wrote: > GitHub user karuturi opened a pull request: > > https://github.com/apache/cloudstack/pull/45 > > Merge 4.5 to master > > > > You can merge this pull request into a Git repository by running: > > $ git pull https://github.com/karuturi/cloudstack merge45-to-master > > Alternatively you can review and apply these changes as the patch at: > > https://github.com/apache/cloudstack/pull/45.patch > > To close this pull request, make a commit to your master/trunk branch > with (at least) the following in the commit message: > > This closes #45 > > ---- > commit 2d3b3376e37faeec3ed62a58750819dc7630260c > Author: Sheng Yang <sheng.y...@citrix.com> > Date: 2014-11-14T19:43:03Z > > Revert "CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly > declaim ENCAPSULATION_MODE_UDP_TRANSPORT_RFC" > > This reverts commit e1c788ca3c69a8c8c2041c7b106f76fa49332888. > > It breaks Windows 7 client. > > commit 425a6b01d60b88016c23a1126960375b00d97069 > Author: Anthony Xu <anthony...@citrix.com> > Date: 2014-11-14T19:24:42Z > > CLOUDSTACK-7918: > guest os name changes from 'SUSE Linux Enterprise Server 12 > (experimental)' to 'SUSE Linux Enterprise Server 12 (64-bit)' in latest XS > 5.6 , > changed the guest OS mapping to fix it. > > commit 303fc90057db2707ae8f6b709fb5e3e86fc9db40 > Author: Milamber <milam...@apache.org> > Date: 2014-11-15T08:37:49Z > > Update L10N resource files on master branch (with 4.5 translation strings) > > commit 25e5d00f6016b31fc178da97c7125c2f37a8c40d > Author: Milamber <milam...@apache.org> > Date: 2014-11-15T08:38:34Z > > Add 4.5.x messages.properties to Transifex config tool > > commit 19781e094b987cf65d05d890cd3cd86fc22cb873 > Author: Chandan Purushothama <chandan.purushoth...@citrix.com> > Date: 2014-11-14T06:56:01Z > > CLOUDSTACK-7913 : Added reconnect functionality to Host class in base.py > > Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org> > > commit 5f99917991a59f8ecd6d8b0e17b497fe210e636e > Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> > Date: 2014-11-14T14:23:25Z > > CLOUDSTACK-7912: Remove hardcoded netscaler info and read it from config > file > > Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org> > > commit 635abaf2e9ca4f0399085f441ea6d5eeaab9f3ab > Author: Jessica Wang <jessicaw...@apache.org> > Date: 2014-11-17T21:05:08Z > > CLOUDSTACK-7927: UI > Infrastructure > Primary Storage > detailView > add > "View Volumes" link that will list all volumes under this primary storage > when being clicked. > > commit f43ffb9a0f71f380f896e1e5c581725e9c08faab > Author: Anshul Gangwar <anshul.gang...@citrix.com> > Date: 2014-10-09T05:07:21Z > > CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM > with VM snapshots which breaks VM snapshots. > Now they are informed that they cannot perform the operation. > To perform operation they have to remove VM snapshots of VM. > > commit c04cdae60bc9a10f584c2f0b591aa5a5d9c7e3e4 > Author: Anshul Gangwar <anshul.gang...@citrix.com> > Date: 2014-10-28T06:19:30Z > > CLOUDSTACK-7767: fixed events are not generated for snapshot creation > > commit ae199b6ce7634ef702243c20800937c8a3ab4b14 > Author: Anshul Gangwar <anshul.gang...@citrix.com> > Date: 2014-10-20T10:34:25Z > > CLOUDSTACK-7703, CLOUDSTACK-7752: Fixed deployment planner stuck in > infinite loop. > If we create VM with shared service offering and attach disk with local > disk offering, > and one of storage pool is full(cannot be allocated) and other is not > full then > we are not putting the cluster in avoid list which is causing this > infinite loop. > > Fixed by putting the cluster in avoid list even if one of the storage > pool is full(cannot be allocated) > > commit bcc20380680a84f7975f75aa8c6ebdaadb1f8540 > Author: Anshul Gangwar <anshul.gang...@citrix.com> > Date: 2014-09-24T07:20:16Z > > CLOUDSTACK-7620: Added SNMP MIB file for snmp-alerts plugin > > commit 44d12330b9d7494ad392e0549ffbdc7100130f86 > Author: Anshul Gangwar <anshul.gang...@citrix.com> > Date: 2014-10-21T09:27:16Z > > CLOUDSTACK-7758: Fixed although api calls are failing, event tab shows > them as successful > > This closes #29 > > commit 4721e66d0e2ed89836286f1654a30a3568b284b6 > Author: Anshul Gangwar <anshul.gang...@citrix.com> > Date: 2014-10-22T04:29:42Z > > CLOUDSTACK-7541: Added restriction to not allow custom disk offering with > disksize UI doesn't allow but with API we were able to create custom disk > offering with disk size which was causing this issue > This closes #28 > > commit 8307dd9105cdb70a0fe09c059bacfcec43a29024 > Author: Anshul Gangwar <anshul.gang...@citrix.com> > Date: 2014-11-17T09:57:22Z > > CLOUDSTACK-7930, CLOUDSTACK-7931: Do not allow to set invalid values for > global settings which are of type integer and float > > This closes #41 > > commit 4d583a4a71313d9f62438818c9d657a7c4a5d43d > Author: Anshul Gangwar <anshul.gang...@citrix.com> > Date: 2014-11-17T07:30:42Z > > CLOUDSTACK-7932: Fixed wrong semantics for isVmAlive() method in > HypervInvestigator > > Findbugs will report error on this as it is expecting true/false for > Boolean value. > But we have diffrent meaning for null so it is false positive case from > findbug > > This closes #39 > > commit 9c328cb9ddd6aa3d9d14ec5efb190ed2a46dc4df > Author: Anshul Gangwar <anshul.gang...@citrix.com> > Date: 2014-11-14T05:26:05Z > > CLOUDSTACK-7929: While creating network offering if one specifies > negative value for network rate then we will convert that value to 0 i.e. > unlimited > > This closes #40 > > commit ade2517a4783526f7ad9c22714beb2b71a3c2051 > Author: Jessica Wang <jessicaw...@apache.org> > Date: 2014-11-18T20:00:27Z > > CLOUDSTACK-7498: UI > ISO > Register ISO action > a javascript error > "osTypeObjs is not defined" comes and goes. > > commit a4ebc31d9c6ca6d0a4778602280e84394737e139 > Author: Jessica Wang <jessicaw...@apache.org> > Date: 2014-11-18T21:50:13Z > > CLOUDSTACK-6624: UI > create network offering > cloudStack does NOT > support specifyIpRanges for isolated network - fix a bug that wrongly sends > "specifyIpRanges=true" to createNetworkOffering API. > > commit 7f548940450887e691b3c10b5487a49f0d75b63c > Author: Prachi Damle <prachi.da...@citrix.com> > Date: 2014-11-18T04:27:01Z > > CLOUDSTACK-7559 After migrating root volume to other cluster wide > storage, start VM is not running the VM with root disk from new storage. > > Changes: > - During VM start, do not use the last host Id, if the host's cluster > does not match the cluster provided in the deployment plan. > > commit 968ca060eea66ba7fe1853c6685069fe8b63b8f2 > Author: Prachi Damle <prachi.da...@citrix.com> > Date: 2014-11-18T04:27:41Z > > CLOUDSTACK-5853 cannot deploy vm with differing service storage tag and > data disk storage tag > > Changes: > - Reverting Marcus's fix since this issue has already fixed by > https://issues.apache.org/jira/browse/CLOUDSTACK-5426 > > commit fee6664612b977ffcce2130eb8a36cf1cf109926 > Author: Jessica Wang <jessicaw...@apache.org> > Date: 2014-11-19T20:00:09Z > > CLOUDSTACK-7943: UI > dialog widget > checkbox field > isChecked property > > if isChecked property is a funciton, pass "args" along when calling > isChecked() function. > > commit 2c9310e62210e98ec5584041681a484c2320ef59 > Author: Jessica Wang <jessicaw...@apache.org> > Date: 2014-11-19T20:01:43Z > > CLOUDSTACK-7943: UI > storage > volume > create template action > add > "XenServer Tools Version 6.1+" checkbox. Default it as its VM's "XenServer > Tools Version 6.1+" property. > > commit 50b262e02a898a1aafc592d9f72cd8a3b6b272ff > Author: Sheng Yang <sheng.y...@citrix.com> > Date: 2014-11-19T22:25:57Z > > CLOUDSTACK-7944: Ensure ipv6 is enabled in sysctl.conf > > The booting sequence result in change of IPv6 related sysctl options was > overrided by sysctl.conf which is loaded later. > > So this patch would patch sysctl.conf in VR as well, ensure IPv6 would be > enabled during booting period otherwise the network setup may not work, > result > in IPv6 VM deployment failure. > > commit 6dc77127938c39c330f71cdc22b057ba64804aa7 > Author: Jessica Wang <jessicaw...@apache.org> > Date: 2014-11-19T23:11:01Z > > CLOUDSTACK-7613: UI > Infrastructure > CPU Sockets > add a new row for > "XenServer 6.5.0". > > commit 2667855ccb932f9a03ddf6639f6411c73fea1b2c > Author: Edison Su <sudi...@gmail.com> > Date: 2014-11-19T22:31:51Z > > CLOUDSTACK-5446: > delete all the leftover snapshots on primary storage in case of snapshot > errors, after a new backup snapshot is finished > > commit 5018db8b62dbb9ddb6612914d828baf2f98c43bb > Author: Edison Su <sudi...@gmail.com> > Date: 2014-11-17T22:35:48Z > > CLOUDSTACK-7945: > set removed field in snapshots table in case of snaphsot failure. > > Reviewed-by: Frank > > commit d856a2acad99875bff0ea7902c84a3dbf913d506 > Author: Edison Su <sudi...@gmail.com> > Date: 2014-11-12T00:02:20Z > > CLOUDSTACK-7946: > remove leftover state in volume and snapshot table in case of mgt server > shutdown during storage operation. > Reviewed-by: Min > > commit 15c0efb77432351bfaaa76e41c4b1c847f60a2ca > Author: Edison Su <sudi...@gmail.com> > Date: 2014-11-12T00:25:24Z > > CLOUDSTACK-7946: > fix compile > > commit bd799653293f9dc257ab68a3b04f6ea769e08e36 > Author: Edison Su <sudi...@gmail.com> > Date: 2014-11-12T20:07:49Z > > CLOUDSTACK-7947: > double check if parent snapshot is removed or not, when creating new > snapshot > > Reviewed-by: Min > > commit ab19edf09d4f87f2807c52ba279aeb013f2545f9 > Author: Anthony Xu <anthony...@citrix.com> > Date: 2014-11-20T00:27:51Z > > CLOUDSTACK-7742: > root cause: > when vmsync reports system VM is down, CCP doesn't release the VM > resource before starting it. > fix: > make sure cleanup is called for a VM when it is reported as Stopped > > ---- > > > --- > If your project is set up for it, you can reply to this email and have your > reply appear on GitHub as well. If your project does not have this feature > enabled and wishes so, or if the feature is enabled but not working, please > contact infrastructure at infrastruct...@apache.org or file a JIRA ticket > with INFRA. > --- -- Daan
