[cloudstack] 01/01: Merge branch '4.10' into 4.11
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 314caffcd795b20534cff5204df55b68fccf240f Merge: 4645512 b923c22 Author: Rohit Yadav AuthorDate: Wed May 2 13:17:18 2018 +0530 Merge branch '4.10' into 4.11 Signed-off-by: Rohit Yadav -- To stop receiving notification emails like this one, please contact ro...@apache.org.
[cloudstack] 01/01: Merge branch '4.10' into 4.11
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 43f2a28d653914b8297708643704608f2ae61e18 Merge: e68f5ce 5dcc3c2 Author: Rohit Yadav AuthorDate: Fri Mar 30 16:17:37 2018 +0530 Merge branch '4.10' into 4.11 -- To stop receiving notification emails like this one, please contact ro...@apache.org.
[cloudstack] 01/01: Merge branch '4.10'
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit a2b8fb5f6db5c2042f1f64489a371902cb9240c4 Merge: d30b75c 922bf02 Author: Rohit Yadav AuthorDate: Tue Jan 9 16:23:43 2018 +0530 Merge branch '4.10' -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit a7b233c5dca0ada85f4c2c2f94f000c6bc45ff54 Merge: 8e6d8a1 bb7d206 Author: Rohit Yadav AuthorDate: Sat Dec 23 09:20:24 2017 +0530 Merge branch '4.10' .../kvm/resource/LibvirtComputingResource.java | 15 +- .../LibvirtNetworkElementCommandWrapperTest.java | 280 + 2 files changed, 284 insertions(+), 11 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 475aa03bb858d2cf1b6c0d7aaaf35fbb1fb43d1d Merge: 4fda0c0 330f241 Author: Rohit Yadav AuthorDate: Thu Nov 16 11:16:15 2017 +0530 Merge branch '4.10' Forwards merge 4.9->4.10->master. -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 a6b41c10c60f255f715de527b4a60be34f685f75 Merge: f2cb218 a90b600 Author: Rohit Yadav AuthorDate: Mon Sep 11 12:41:43 2017 +0530 Merge branch '4.10' tools/build/build_asf.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 f2cb218d8f59039145dbaf3248765dc0b78c45d5 Merge: 6f157cc 854d9e0 Author: Rohit Yadav AuthorDate: Thu Sep 7 20:28:32 2017 +0530 Merge branch '4.10' -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 cc749cca3e63af268c379bdaee80bbd973254f7b Merge: f62a8d7 0f27bc9 Author: Rohit Yadav AuthorDate: Tue Aug 22 10:23:29 2017 +0200 Merge branch '4.10' .../src/com/cloud/upgrade/dao/Upgrade481to490.java | 45 ++ .../org/apache/cloudstack/acl/RoleManagerImpl.java | 43 ++--- .../main/java/com/cloud/utils/PropertiesUtil.java | 4 -- 3 files changed, 41 insertions(+), 51 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 f84728d374355590af7954be3b874fedc8ff080e Merge: 92b07d4 d9b7b8c Author: Rohit Yadav AuthorDate: Thu Aug 10 01:59:34 2017 +0200 Merge branch '4.10' .../cloud/configuration/ConfigurationManager.java | 14 +++ engine/schema/src/com/cloud/domain/DomainVO.java | 8 ++ .../configuration/ConfigurationManagerImpl.java| 40 ++-- server/src/com/cloud/user/DomainManagerImpl.java | 16 ++- .../test/com/cloud/user/DomainManagerImplTest.java | 107 + .../cloud/vpc/MockConfigurationManagerImpl.java| 11 ++- 6 files changed, 166 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 d17728dd7e1948a3479d6191fac0ded88499482c Merge: 18ffd7b cf6c949 Author: Rohit Yadav AuthorDate: Thu Aug 10 01:04:54 2017 +0200 Merge branch '4.10' ui/scripts/network.js | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --cc ui/scripts/network.js index 7f27373,72aa3ad..8370106 mode 100644,100755..100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 ccf2f520415504e1dc18d423f9fc9c62684b05d7 Merge: b204e4a ddd8462 Author: Rohit Yadav AuthorDate: Fri Aug 4 20:46:05 2017 +0200 Merge branch '4.10' systemvm/patches/debian/config/opt/cloud/bin/configure.py | 6 ++ 1 file changed, 6 insertions(+) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 b204e4a5b9a9d2586abbad0a950cc95806e4c5b8 Merge: 1414d20 84ad4c7 Author: Rohit Yadav AuthorDate: Fri Aug 4 10:58:59 2017 +0200 Merge branch '4.10' .../schema/src/com/cloud/vm/dao/UserVmDaoImpl.java | 28 -- 1 file changed, 15 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 1d95cbbfed4107b8e3be74a066442531e183be2f Merge: 7fea069 b60e173 Author: Rohit Yadav AuthorDate: Thu Aug 3 00:31:12 2017 +0200 Merge branch '4.10' agent/conf/cloudstack-agent.logrotate | 4 ++-- debian/rules | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 5ccbe04c0ab9b0b4d73db6076e0749af5dbdacab Merge: 8c9da9d d53f500 Author: Rohit Yadav AuthorDate: Tue Aug 1 20:45:25 2017 +0200 Merge branch '4.10' This uses `ours` fwd-merging strategy. Signed-off-by: Rohit Yadav -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 8c9da9dc756b843f91c4e6492de71f7697401d4f Merge: 08a6c24 98a9856 Author: Rohit Yadav AuthorDate: Tue Aug 1 20:39:47 2017 +0200 Merge branch '4.10' tools/appliance/Gemfile | 1 + 1 file changed, 1 insertion(+) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 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" .
[cloudstack] 01/01: Merge branch '4.10'
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 be8ae9822dcbf55132412191950cd95e07a8eb8d Merge: dbf11d5 c1f30d9 Author: Rohit Yadav AuthorDate: Wed Jul 26 15:19:13 2017 +0200 Merge branch '4.10' engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java | 2 +- framework/db/pom.xml | 2 +- framework/db/src/com/cloud/utils/db/GenericDaoBase.java| 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .
[cloudstack] 01/01: Merge branch '4.10'
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 771576f117f4aad21b0abf5f5232b3a60b20e44b Merge: 4bc7c27 3589846 Author: Rohit Yadav AuthorDate: Wed Jul 12 13:11:14 2017 +0530 Merge branch '4.10' .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .