This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a change to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
omit cd71039 speed up debian pkg building
omit f9eca19 fix rpm build, fix duplicate file listings
omit ae8f00e pkg size improvements and fixes
omit f93c77d fix rpm pkging
omit f362f7a remove frivolous jars
omit 1679660 cat-x mysql {^-^}
omit 9f2c29d reduce shaded jar size
omit 2c4938d more build fixes
omit a8ebf8d build fixes
omit 5291c51 upgrade dependency versions, migrate to spring5
omit 55bf188 WIP: pgkging
omit 2369b74 CLOUDSTACK-10012: Introduce Embedded Jetty with shaded jar
add 6bb0ca2 This feature separates the snapshot creation on primary and
its backing up on secondary. As part of this, a new parameter, which is
optional, is added to CreateSnapshotCmd, which seperates the creation and
backup.
add 4c89b5b Merge branch 'pr-2081'
add 285fd77 CLOUDSTACK-9957 test fix (#2297)
add bd953d8 CLOUDSTACK-10107: For VMware VMs add devices without unit
number (#2288)
add b6dc40f CLOUDSTACK-10103: Cloudian Connector for CloudStack (#2284)
add 382d458 CLOUDSTACK-10113 password resets only one at the time
add 4f6b91d Merge release branch 4.9 to 4.10
add 4d19373 Merge release branch 4.10 to master
add 41fdb88 CLOUDSTACK-10047: DVSwitch fixes and improvements (#2293)
new 92297d7 CLOUDSTACK-10012: Introduce Embedded Jetty with shaded jar
new 6e80b91 WIP: pgkging
new d24b03b upgrade dependency versions, migrate to spring5
new 53b9158 build fixes
new e6398a8 more build fixes
new 92725bc reduce shaded jar size
new 7d7ab5b cat-x mysql {^-^}
new 1bbefe2 remove frivolous jars
new 1b346f0 fix rpm pkging
new a442ec8 pkg size improvements and fixes
new 61e8328 fix rpm build, fix duplicate file listings
new 5d74440 speed up debian pkg building
new 8a6fd77 wip server props file
new 49ba730 fix apidocs
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (cd71039)
\
N -- N -- N refs/heads/CLOUDSTACK-10012 (49ba730)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
api/src/com/cloud/agent/api/to/NicTO.java | 12 +
api/src/com/cloud/network/Networks.java | 4 +
api/src/com/cloud/offering/NetworkOffering.java | 2 +-
api/src/com/cloud/storage/Snapshot.java | 2 +
api/src/com/cloud/storage/VolumeApiService.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 2 +
.../command/admin/annotation/AddAnnotationCmd.java | 8 +-
.../admin/network/CreateNetworkCmdByAdmin.java | 10 +
.../admin/network/CreateNetworkOfferingCmd.java | 3 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 13 +-
api/test/com/cloud/network/NetworksTest.java | 19 +-
.../admin/annotation/AddAnnotationCmdTest.java | 40 ++
.../api/command/test/CreateSnapshotCmdTest.java | 4 +-
.../cs_vmp.py => client/conf/server.properties.in | 18 +-
client/pom.xml | 5 +
.../service/NetworkOrchestrationService.java | 15 +-
.../engine/subsystem/api/storage/SnapshotInfo.java | 4 +
.../subsystem/api/storage/SnapshotService.java | 6 +
.../subsystem/api/storage/SnapshotStrategy.java | 3 +
.../cloud/configuration/ConfigurationManager.java | 2 +-
.../src/com/cloud/vm/VmWorkTakeVolumeSnapshot.java | 8 +-
.../engine/orchestration/NetworkOrchestrator.java | 44 ++-
.../src/com/cloud/dc/dao/DataCenterVnetDao.java | 4 +-
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 45 ++-
.../src/com/cloud/network/dao/NetworkDao.java | 4 +-
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 54 +--
.../schema/src/com/cloud/storage/SnapshotVO.java | 5 +
.../storage/motion/AncientDataMotionStrategy.java | 6 +-
.../storage/snapshot/SnapshotBackupException.java | 29 ++
.../storage/snapshot/SnapshotObject.java | 16 +
.../storage/snapshot/SnapshotServiceImpl.java | 70 +++-
.../snapshot/SnapshotStateMachineManagerImpl.java | 1 +
.../snapshot/StorageSystemSnapshotStrategy.java | 32 +-
.../snapshot/XenserverSnapshotStrategy.java | 102 ++---
.../storage/snapshot/SnapshotEntityImpl.java | 6 +
.../apache/cloudstack/framework/jobs/AsyncJob.java | 2 +
.../framework/jobs/impl/AsyncJobManagerImpl.java | 22 ++
.../vmware/manager/VmwareManagerImpl.java | 4 +-
.../hypervisor/vmware/resource/VmwareResource.java | 32 +-
.../integrations/cloudian}/pom.xml | 48 +--
.../META-INF/cloudstack/cloudian/module.properties | 13 +-
.../cloudian/spring-cloudian-context.xml | 25 ++
.../cloudstack/cloudian/CloudianConnector.java | 82 ++++
.../cloudstack/cloudian/CloudianConnectorImpl.java | 345 +++++++++++++++++
.../cloudian/api/CloudianIsEnabledCmd.java | 65 ++++
.../cloudian/api/CloudianSsoLoginCmd.java | 70 ++++
.../cloudstack/cloudian/client/CloudianClient.java | 347 +++++++++++++++++
.../cloudstack/cloudian/client/CloudianGroup.java | 56 +++
.../cloudstack/cloudian/client/CloudianUser.java | 85 +++++
.../cloudstack/cloudian/client/CloudianUtils.java | 92 +++++
.../cloudian/response/CloudianEnabledResponse.java | 29 +-
.../response/CloudianSsoLoginResponse.java | 25 +-
.../cloudstack/cloudian/CloudianClientTest.java | 416 +++++++++++++++++++++
plugins/pom.xml | 1 +
pom.xml | 1 +
server/src/com/cloud/configuration/Config.java | 8 -
.../configuration/ConfigurationManagerImpl.java | 17 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 20 +-
.../com/cloud/network/IpAddressManagerImpl.java | 2 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 25 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
.../com/cloud/storage/CreateSnapshotPayload.java | 9 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 27 +-
.../cloud/storage/snapshot/SnapshotManager.java | 12 +-
.../storage/snapshot/SnapshotManagerImpl.java | 75 +++-
server/src/com/cloud/vm/UserVmManagerImpl.java | 55 ++-
.../cloud/network/CreatePrivateNetworkTest.java | 2 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 4 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 2 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 6 +-
.../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 9 +-
setup/db/db/schema-41000to41100-cleanup.sql | 1 +
.../patches/debian/config/opt/cloud/bin/cs_vmp.py | 12 +-
.../test_separate_backup_from_snapshot.py | 177 +++++++++
test/integration/smoke/test_host_annotations.py | 8 +-
test/integration/smoke/test_nic.py | 137 +++++++
tools/apidoc/gen_toc.py | 3 +-
tools/marvin/marvin/lib/base.py | 4 +-
ui/l10n/en.js | 4 +
ui/plugins/cloudian/cloudian.css | 18 +
ui/plugins/cloudian/cloudian.js | 66 ++++
ui/plugins/{plugins.js => cloudian/config.js} | 15 +-
ui/plugins/cloudian/icon.png | Bin 0 -> 1099 bytes
ui/plugins/plugins.js | 1 +
ui/scripts/configuration.js | 80 ++++
ui/scripts/storage.js | 7 +-
.../java/com/cloud/utils/SerialVersionUID.java | 1 +
utils/src/main/java/com/cloud/utils/UriUtils.java | 50 +++
.../test/java/com/cloud/utils/UriUtilsTest.java | 46 ++-
vmware-base/pom.xml | 5 +
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 283 +++++++++++---
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 17 +-
.../vmware/mo/HypervisorHostHelperTest.java | 139 ++++++-
93 files changed, 3287 insertions(+), 422 deletions(-)
create mode 100644
api/test/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmdTest.java
copy systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py =>
client/conf/server.properties.in (73%)
mode change 100755 => 100644
create mode 100644
engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotBackupException.java
copy {vmware-base => plugins/integrations/cloudian}/pom.xml (55%)
copy systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py =>
plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/module.properties
(81%)
mode change 100755 => 100644
create mode 100644
plugins/integrations/cloudian/resources/META-INF/cloudstack/cloudian/spring-cloudian-context.xml
create mode 100644
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnector.java
create mode 100644
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/CloudianConnectorImpl.java
create mode 100644
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianIsEnabledCmd.java
create mode 100644
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/api/CloudianSsoLoginCmd.java
create mode 100644
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianClient.java
create mode 100644
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianGroup.java
create mode 100644
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUser.java
create mode 100644
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/client/CloudianUtils.java
copy
engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java
=>
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianEnabledResponse.java
(53%)
copy
engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotStrategy.java
=>
plugins/integrations/cloudian/src/org/apache/cloudstack/cloudian/response/CloudianSsoLoginResponse.java
(60%)
create mode 100644
plugins/integrations/cloudian/test/org/apache/cloudstack/cloudian/CloudianClientTest.java
create mode 100644
test/integration/component/test_separate_backup_from_snapshot.py
create mode 100644 ui/plugins/cloudian/cloudian.css
create mode 100644 ui/plugins/cloudian/cloudian.js
copy ui/plugins/{plugins.js => cloudian/config.js} (75%)
create mode 100644 ui/plugins/cloudian/icon.png
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
