[cloudstack] 01/01: Merge branch '4.11': Fixes #2631 VMware dvs portgroup autogrowth (#2634)

[ro...@apache.org]

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 7ce2c2eaf0cf0c6097a64ba80336b138200be085
Merge: 65511c4 1b3046e
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri May 11 22:21:31 2018 +0530

    Merge branch '4.11': Fixes #2631 VMware dvs portgroup autogrowth (#2634)
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

 .../META-INF/db/schema-41100to41110-cleanup.sql          |  2 ++
 .../hypervisor/vmware/manager/VmwareManagerImpl.java     | 16 ++++++++++++----
 server/src/main/java/com/cloud/configuration/Config.java |  8 --------
 .../cloud/hypervisor/vmware/mo/HypervisorHostHelper.java |  9 ++++-----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --cc engine/schema/src/main/resources/META-INF/db/schema-41100to41110-cleanup.sql
index afe5c20,0000000..e6a5b3d
mode 100644,000000..100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41100to41110-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41100to41110-cleanup.sql
@@@ -1,20 -1,0 +1,22 @@@
 +-- Licensed to the Apache Software Foundation (ASF) under one
 +-- or more contributor license agreements.  See the NOTICE file
 +-- distributed with this work for additional information
 +-- regarding copyright ownership.  The ASF licenses this file
 +-- to you under the Apache License, Version 2.0 (the
 +-- "License"); you may not use this file except in compliance
 +-- with the License.  You may obtain a copy of the License at
 +--
 +--   http://www.apache.org/licenses/LICENSE-2.0
 +--
 +-- Unless required by applicable law or agreed to in writing,
 +-- software distributed under the License is distributed on an
 +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 +-- KIND, either express or implied.  See the License for the
 +-- specific language governing permissions and limitations
 +-- under the License.
 +
 +--;
 +-- Schema cleanup after 4.11.0.0 to 4.11.1.0 upgrade
 +--;
++
++DELETE FROM `cloud`.`configuration` WHERE `name`='vmware.ports.per.dvportgroup';

-- 
To stop receiving notification emails like this one, please contact
rohit@apache.org.