cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From karuturi <...@git.apache.org>
Subject [GitHub] cloudstack pull request: Merge 4.5 to master
Date Wed, 05 Nov 2014 07:02:44 GMT
GitHub user karuturi opened a pull request:

    https://github.com/apache/cloudstack/pull/36

    Merge 4.5 to master

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/karuturi/cloudstack merge-4.5-to-master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/cloudstack/pull/36.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 #36
    
----
commit d081efc647737d4fee106eda31767a061f885f69
Author: Alex Brett <alex.brett@citrix.com>
Date:   2014-10-15T17:50:57Z

    CLOUDSTACK-7727 Skip various BVT tests on LXC
    
    A number of BVT tests are not valid for LXC (e.g. migrating a VM), so this patch
    ensures they skip if LXC is in use.
    
    Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

commit e225065ec2510a93a1f3f694050645687b2969d0
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-16T19:06:59Z

    CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by zone/pod/cluster
view > listView > detailView > add View All link (i.e. "View all Virtual Routers").

commit c49a09fad0ad830a3ce56511da5cd568d56c594c
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-15T23:12:52Z

    CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by account view
> listView > detailView > add View All link (i.e. "View all Virtual Routers").

commit f8cbd6ad46f5e75de3354ffe4dc646b819aa40a1
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-16T00:00:11Z

    CLOUDSTACK-7736: UI - listView widget - select view dropdown on top of listView - prefilter()
- include original args.context when passing it to prefilter().

commit 5e165d499e5e81f6941e74a60b628a544523780a
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-16T00:02:21Z

    CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by XXXXXXX view
> listView > detailView > add View All link > not show "group by XXXXXXX" in select
view dropdown.

commit be60e46e1efad93cb3c26bcf9ec9ee501239ffdf
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-16T19:01:20Z

    CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by XXXXXXX view
> listView > detailView > add View All link > show read-only text "group by zone/pod/cluster/account"
in select view area.

commit c9dcae548056aa477e4156a1ec2efc9a83813aed
Author: Edison Su <sudison@gmail.com>
Date:   2014-10-16T19:51:11Z

    fix kvm issue, for windows sever 2008, it will crash without hyperv enlightment featre
enabled

commit 13decd4c85e540337fdf1e46eb367f78d691b4ab
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-16T21:47:24Z

    CLOUDSTACK-7744: UI > Instances > detailView > Change Service Offering > show
generic notification.

commit f3e91bf26acaeb1202e1fa84b70ad24db3a0eace
Author: Edison Su <sudison@gmail.com>
Date:   2014-10-16T23:59:09Z

    There are few cases that mgt server won't reponse agent's pingcommand timely, or in KVM's
case, libvirt won't repsonse in few mintues, which will cause agent reconnect to mgt server,
then all the on going tasks on host will fail

commit dbf12d58e713ee5d3a120999cebf5a87d728b209
Author: Min Chen <min.chen@citrix.com>
Date:   2014-10-17T01:15:50Z

    CLOUDSTACK-7749: AsyncJob GC thread cannot purge queue items that have been blocking for
too long if exception is thrown in expunging some unfinished or completed old jobs, this will
make some future jobs stuck.

commit e796d418b4ff7d3644bcc962b796d929b3d7baf7
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-17T21:46:23Z

    CLOUDSTACK-5576: UI > IP Address > EnableVPN, DisableVPN: change label.

commit 287ff83552081cd91c68af6214016ca4cc4cc040
Author: Nitin Mehta <nitin.mehta@citrix.com>
Date:   2014-10-20T23:49:48Z

    CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot
with its corresponding volume removed. Fix it by searching for volumes including removed.

commit 6d22ff1d946b2368527203ee7c07ae180147a17c
Author: Edison Su <sudison@gmail.com>
Date:   2014-10-21T17:16:59Z

    Revert "fix kvm issue, for windows sever 2008, it will crash without hyperv enlightment
featre enabled"
    
    This reverts commit c9dcae548056aa477e4156a1ec2efc9a83813aed.

commit 8b834171b65ee7de9b8c4d5f22ee71592fee867e
Author: Edison Su <sudison@gmail.com>
Date:   2014-10-21T17:17:11Z

    Revert "There are few cases that mgt server won't reponse agent's pingcommand timely,
or in KVM's case, libvirt won't repsonse in few mintues, which will cause agent reconnect
to mgt server, then all the on going tasks on host will fail"
    
    This reverts commit f3e91bf26acaeb1202e1fa84b70ad24db3a0eace.

commit 0141b37784805b1a55bc450affa282897889e9b9
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   2014-10-22T00:11:44Z

    CLOUDSTACK-7761:
    
    Revert "when system VM ping times out, stop system VM"
    
    This reverts commit ee23be1942001ab732cfb3ad50fa24163cb88a48.

commit 2d7187e002e6b5b164c226fdde994a3a92cb9dda
Author: Mike Tutkowski <mike.tutkowski@solidfire.com>
Date:   2014-10-22T21:55:35Z

    Update to SolidFire driver regarding snapshots

commit c52e14730eca5c9c7deb586e18e997bd22d50a9d
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   2014-10-22T21:53:22Z

    when host is pingtimeout and CCP can not determine the host status, put the host to Alert
status , no VM HA.

commit 000f8b163920a77b97cd5099f09225c49660c8c8
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-23T19:09:43Z

    CLOUDSTACK-7777: UI > storage > volume > attach disk > virtual machine dropdown
> remove unnecessary module check.

commit 0d6f69b536dc04e154678e5198cfd9c71097656e
Author: Min Chen <min.chen@citrix.com>
Date:   2014-10-23T21:08:49Z

    CLOUDSTACK-7778: Start VM checkWorkItem loop should also check VM DB state before going
into idle waiting to exit faster.

commit 325dcd906f5c8d69a7853ca1f3e164641a07e9c0
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-23T22:06:00Z

    CLOUDSTACK-7779: UI > volume action filter, snapshot action filter > extend scope
from local to global.

commit 974adb39c5b7d2301f1b4996de405663ea62ae9e
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-23T22:34:01Z

    CLOUDSTACK-7779: UI > volume action filter, snapshot action filter > extend scope
from local to global..

commit 793a007e12bc8ff15fc051b3bf0fd83b6547f1fa
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-23T22:46:25Z

    CLOUDSTACK-7779: UI > affinity group action filter > extend scope from local to
global.

commit bb01cb8d3205fe139653e0981774b4bdea859b04
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-23T23:13:54Z

    CLOUDSTACK-7779: UI > system action filter > extend scope from local to global.

commit 94d00d6945de78f4f4d6f4e40038d128edbf87c5
Author: Jessica Wang <jessicawang@apache.org>
Date:   2014-10-23T23:58:42Z

    CLOUDSTACK-7780: UI > storage > volume > detail view > data provider >
remove unnecessary module check.

commit 88561e154f6d451d2437e7e6887417df6106c275
Author: Frank Zhang <frank.zhang@citrix.com>
Date:   2014-10-21T23:20:54Z

    fix expried certificate in unit test

commit c5fa7cc494930cd92a3da7872c1577410fb51103
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Date:   2014-10-27T08:22:28Z

    Correct the error message when tried created VM Snapshot with memory on a vGPU Instance.
    "VM snapshot with MEMORY is not supported for VGU enabled VMs."
    Change VGU to vGPU.

commit db6a0d65aabf49146b74a33ef70e455d8d823b4d
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Date:   2014-10-27T09:24:21Z

    No need to log discrepancy resource count message for Primary and secondary storage.

commit 1b0a0d68f18720ea95ba8e825cb36abe3785c0f8
Author: Frank Zhang <frank.zhang@citrix.com>
Date:   2014-10-27T22:13:45Z

    CLOUDSTACK-7795
    Fix multiple baremetal rct configuraitons
    
    Conflicts:
    	api/src/com/cloud/event/EventTypes.java
    	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
    	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java

commit dd7026b20e83ab55b4a25e90595b47f64456a389
Author: Sheng Yang <sheng.yang@citrix.com>
Date:   2014-10-27T23:46:01Z

    CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone
    
    In basic network, the correct network id associate with IP is source network id
    rather than network id.

commit 1b535e20e6ef0ff14e0bbaa6dc4813b93d6317e4
Author: Frank Zhang <frank.zhang@citrix.com>
Date:   2014-10-27T23:52:05Z

    fixing build because missig ListBaremetalRctCmd

----


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message