cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [cloudstack] 01/01: Merge branch '4.10'
Date Fri, 28 Jul 2017 09:28:48 GMT
This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 619da913860b01f461abe5c0c4e8ecd183d040fa
Merge: b83aa2a e9f526e
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
AuthorDate: Fri Jul 28 11:28:20 2017 +0200

    Merge branch '4.10'

 agent/conf/agent.properties                        |  4 ++
 .../affinitygroup/UpdateVMAffinityGroupCmd.java    | 12 +++--
 .../virtualnetwork/VirtualRoutingResource.java     |  9 ++--
 .../network/guru/NuageVspGuestNetworkGuru.java     | 36 +++++++-------
 .../src/com/cloud/util/NuageVspEntityBuilder.java  | 56 +++++++++++++++-------
 .../com/cloud/util/NuageVspEntityBuilderTest.java  | 33 ++++++-------
 server/src/com/cloud/server/StatsCollector.java    |  4 +-
 systemvm/patches/debian/config/etc/vpcdnsmasq.conf |  2 +-
 test/integration/component/test_affinity_groups.py | 27 ++++++++++-
 9 files changed, 121 insertions(+), 62 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>.

Mime
View raw message