[cloudstack] 01/01: Merge release branch 4.11 to master

[dahn]

This is an automated email from the ASF dual-hosted git repository.

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

commit 698747683e01fc8a3978e4ad1e8d869bf5753c2b
Merge: 34ada07 9b772db
Author: Daan Hoogland 
AuthorDate: Mon Aug 20 08:18:45 2018 +

Merge release branch 4.11 to master

* 4.11:
  populate project select when clicked on to display latest project options 
(#2810)

 ui/scripts/ui-custom/projectSelect.js | 55 ---
 1 file changed, 32 insertions(+), 23 deletions(-)

[cloudstack] 01/01: Merge release branch 4.11 to master

[mtutkowski]

This is an automated email from the ASF dual-hosted git repository.

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

commit 46c56eaaf9834680054c2f10d79012476c59a30e
Merge: 96d80b1 e4ec123
Author: Mike Tutkowski 
AuthorDate: Sun Aug 12 00:03:37 2018 -0600

Merge release branch 4.11 to master

* 4.11:
  Changed the implementation of isVolumeOnManagedStorage(VolumeInfo) to 
check if the data store in question is for primary storage (and added a unit 
test from Daan Hoogland)
  vmware: reboot VR after mac updates (#2794)

 .../motion/StorageSystemDataMotionStrategy.java| 12 +++-
 .../StorageSystemDataMotionStrategyTest.java   | 84 ++
 .../consoleproxy/ConsoleProxyManagerImpl.java  |  4 +-
 systemvm/debian/opt/cloud/bin/setup/router.sh  |  4 ++
 ui/scripts/instances.js|  3 +
 ui/scripts/system.js   | 13 +++-
 6 files changed, 114 insertions(+), 6 deletions(-)

diff --cc 
engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
index 8efaebe,000..1957f82
mode 100644,00..100644
--- 
a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
+++ 
b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
@@@ -1,2290 -1,0 +1,2296 @@@
 +/*
 + * 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.
 + */
 +package org.apache.cloudstack.storage.motion;
 +
 +import com.cloud.agent.AgentManager;
 +import com.cloud.agent.api.Answer;
 +import com.cloud.agent.api.storage.CopyVolumeAnswer;
 +import com.cloud.agent.api.storage.CopyVolumeCommand;
 +import com.cloud.agent.api.MigrateAnswer;
 +import com.cloud.agent.api.MigrateCommand;
 +import com.cloud.agent.api.ModifyTargetsAnswer;
 +import com.cloud.agent.api.ModifyTargetsCommand;
 +import com.cloud.agent.api.PrepareForMigrationCommand;
 +import com.cloud.agent.api.storage.MigrateVolumeAnswer;
 +import com.cloud.agent.api.storage.MigrateVolumeCommand;
 +import com.cloud.agent.api.to.DataStoreTO;
 +import com.cloud.agent.api.to.DataTO;
 +import com.cloud.agent.api.to.DiskTO;
 +import com.cloud.agent.api.to.NfsTO;
 +import com.cloud.agent.api.to.VirtualMachineTO;
 +import com.cloud.configuration.Config;
 +import com.cloud.dc.dao.ClusterDao;
 +import com.cloud.exception.AgentUnavailableException;
 +import com.cloud.exception.OperationTimedoutException;
 +import com.cloud.host.Host;
 +import com.cloud.host.HostVO;
 +import com.cloud.host.dao.HostDao;
 +import com.cloud.host.dao.HostDetailsDao;
 +import com.cloud.hypervisor.Hypervisor.HypervisorType;
 +import com.cloud.resource.ResourceState;
 +import com.cloud.storage.DataStoreRole;
 +import com.cloud.storage.DiskOfferingVO;
 +import com.cloud.storage.Snapshot;
 +import com.cloud.storage.SnapshotVO;
 +import com.cloud.storage.Storage.ImageFormat;
 +import com.cloud.storage.StorageManager;
 +import com.cloud.storage.VMTemplateVO;
 +import com.cloud.storage.VolumeDetailVO;
 +import com.cloud.storage.Volume;
 +import com.cloud.storage.VolumeVO;
 +import com.cloud.storage.dao.DiskOfferingDao;
 +import com.cloud.storage.dao.GuestOSCategoryDao;
 +import com.cloud.storage.dao.GuestOSDao;
 +import com.cloud.storage.dao.SnapshotDao;
 +import com.cloud.storage.dao.SnapshotDetailsDao;
 +import com.cloud.storage.dao.SnapshotDetailsVO;
 +import com.cloud.storage.dao.VMTemplateDao;
 +import com.cloud.storage.dao.VolumeDao;
 +import com.cloud.storage.dao.VolumeDetailsDao;
 +import com.cloud.utils.NumbersUtil;
 +import com.cloud.utils.db.GlobalLock;
 +import com.cloud.utils.exception.CloudRuntimeException;
 +import com.cloud.vm.VirtualMachine;
 +import com.cloud.vm.VirtualMachineManager;
 +import com.cloud.vm.VMInstanceVO;
 +import com.cloud.vm.dao.VMInstanceDao;
 +
 +import com.google.common.base.Preconditions;
 +
 +import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
 +import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
 +import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
 

[cloudstack] 01/01: Merge release branch 4.11 to master

[dahn]

This is an automated email from the ASF dual-hosted git repository.

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

commit c3ff356c15820ff9a6c5fd105e748d02b28b69fd
Merge: 1ccb32f 781d6bc
Author: Daan Hoogland 
AuthorDate: Fri Jul 20 11:31:53 2018 +

Merge release branch 4.11 to master

* 4.11:
  register template kvm context ui fix (#2757)
  check volumes for state when retrieving pool for configDrive creation 
(#2709)

 .../network/element/ConfigDriveNetworkElement.java | 79 ++
 ui/scripts/templates.js|  2 +-
 2 files changed, 67 insertions(+), 14 deletions(-)

[cloudstack] 01/01: Merge release branch 4.11 to master

[dahn]

This is an automated email from the ASF dual-hosted git repository.

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

commit 3ff122d824cd18ee1c88510073c647645bb081d5
Merge: 1d132d0 4afdee9
Author: Daan Hoogland 
AuthorDate: Tue Jun 12 07:41:09 2018 +

Merge release branch 4.11 to master

* 4.11:
  comment on unencryption
  ui: fix create VPC dialog box failure when zone is SG enabled (#2704)
  CLOUDSTACK-10381: Fix password reset / reset ssh key with ConfigDrive
  isisnot=
  extra message
  debug message
  imports
  update without decrypt doesn't work
  set unsensitive attributes as not 'Secure'
  remove old config artifacts from update path

 .../com/cloud/upgrade/dao/Upgrade41100to41110.java | 80 --
 .../com/cloud/upgrade/dao/Upgrade421to430.java | 74 
 .../apache/cloudstack/ldap/LdapConfiguration.java  |  6 +-
 .../network/element/ConfigDriveNetworkElement.java | 33 -
 ui/scripts/network.js  | 11 +--
 5 files changed, 116 insertions(+), 88 deletions(-)


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

[cloudstack] 01/01: Merge release branch 4.11 to master

[dahn]

This is an automated email from the ASF dual-hosted git repository.

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

commit c43c69af438518ef0b620b3a39f5ab9a65b2e304
Merge: 685cc72 156dbf4
Author: Daan Hoogland 
AuthorDate: Mon Apr 16 13:54:20 2018 +0200

Merge release branch 4.11 to master

* 4.11:
  agent: Add logging to libvirt qemu hook (#2554)

 agent/bindir/libvirtqemuhook.in | 37 -
 1 file changed, 28 insertions(+), 9 deletions(-)

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

[cloudstack] 01/01: Merge release branch 4.11 to master

[dahn]

This is an automated email from the ASF dual-hosted git repository.

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

commit 9124f974474e2be6333e8a87b2d6e057fc9baf9e
Merge: 5dca01c cff4032
Author: Daan Hoogland 
AuthorDate: Tue Apr 3 08:18:37 2018 +0200

Merge release branch 4.11 to master

* 4.11:
  CLOUDSTACK-10287 package require open jdk 1.8 (#2519)
  make Broadcast- and IsolationURI visible to admin (#2520)

 packaging/centos7/cloud.spec |  6 +++---
 ui/scripts/instances.js  | 17 -
 2 files changed, 19 insertions(+), 4 deletions(-)


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

[cloudstack] 01/01: Merge release branch 4.11 to master

[dahn]

This is an automated email from the ASF dual-hosted git repository.

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

commit cdddecb41ef74ae8f3b2a67c03b7c7be20f2bb2d
Merge: 026eab0 5c2b8f8
Author: Daan Hoogland 
AuthorDate: Tue Feb 27 12:42:41 2018 +0100

Merge release branch 4.11 to master

* 4.11:
  CLOUDSTACK-10306: Upgrade to VMware 6.5 vim jar dependency (#2467)
  CLOUDSTACK-10298: fix for recreation of an earlier deleted Nuage managed 
network (#2460)

 deps/install-non-oss.sh|   3 +
 plugins/network-elements/nuage-vsp/pom.xml |   2 +-
 .../network/guru/NuageVspGuestNetworkGuru.java |   7 +-
 pom.xml|   2 +-
 test/integration/plugins/nuagevsp/nuageTestCase.py |   3 +
 .../nuagevsp/test_nuage_vsp_mngd_subnets.py| 672 +++--
 tools/marvin/marvin/lib/base.py|   5 +-
 7 files changed, 518 insertions(+), 176 deletions(-)


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