You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/04/24 02:27:13 UTC
[cloudstack] branch master updated (38f1050 -> f0dd599)
This is an automated email from the ASF dual-hosted git repository.
rajani pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 38f1050 Merge release branch 4.9 to master
adds f07d729 CLOUDSTACK-9408 for the move away from download.cloud.com - commented some occurences of cloud.com as being harmless * examples * identifiers (internal) - changed the URL for vhd-util download - changed comments from 'cloud.com' to 'Apache CloudStack'
adds 6c200b3 CLOUDSTACK-9408 remove antiquated devcloud project
adds 70ef078 CLOUDSTACK-9408: Fix download urls in sql and scripts
new f0dd599 Merge pull request #1582 from DaanHoogland/CLOUDSTACK-9408
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
INSTALL.md | 2 +-
api/src/com/cloud/offering/ServiceOffering.java | 1 +
api/src/com/cloud/resource/ResourceService.java | 2 +-
.../api/response/AutoScaleVmProfileResponse.java | 1 +
.../integration-test/test/resources/s3_testng.xml | 2 +-
packaging/centos63/cloud.spec | 2 +-
packaging/centos7/cloud.spec | 2 +-
packaging/fedora20/cloud.spec | 2 +-
packaging/fedora21/cloud.spec | 2 +-
scripts/storage/qcow2/importmpl.sh | 4 +-
scripts/vm/hypervisor/kvm/setup_agent.sh | 4 +-
.../com/cloud/server/ConfigurationServerImpl.java | 6 +-
setup/db/db/schema-21to22.sql | 8 +-
setup/db/db/schema-2214to30.sql | 2 +-
setup/db/db/schema-410to420.sql | 2 +-
setup/db/db/schema-421to430.sql | 6 +-
setup/db/db/schema-442to450.sql | 2 +-
setup/db/db/schema-452to460.sql | 2 +-
setup/db/templates.sql | 31 +--
systemvm/scripts/run.sh | 2 +-
systemvm/scripts/ssvm-check.sh | 6 +-
.../component/maint/test_high_availability.py | 2 +-
.../component/test_base_image_updation.py | 6 +-
.../integration/component/test_browse_templates.py | 2 +-
test/integration/component/test_browse_volumes.py | 2 +-
test/integration/component/test_project_configs.py | 2 +-
test/integration/component/test_project_usage.py | 2 +-
...st_template_from_snapshot_with_template_details | 2 +-
test/integration/component/test_templates.py | 2 +-
test/integration/component/test_usage.py | 2 +-
test/integration/smoke/test_ssvm.py | 2 +-
.../systemvmtemplate/install_systemvm_packages.sh | 2 +-
tools/devcloud/README.md | 102 ---------
tools/devcloud/devcloud-advanced.cfg | 131 -----------
tools/devcloud/devcloud-advanced_internal-mgt.cfg | 141 ------------
.../devcloud-advanced_juniper-contrail.cfg | 123 ----------
tools/devcloud/devcloud-advancedsg.cfg | 121 ----------
tools/devcloud/devcloud.cfg | 112 ---------
tools/devcloud/devcloud.sql | 55 -----
tools/devcloud/devcloud_internal-mgt.cfg | 121 ----------
tools/devcloud/devcloud_s3.cfg | 141 ------------
tools/devcloud/pom.xml | 178 --------------
tools/devcloud/quickcloud.cfg | 115 ----------
tools/devcloud/src/.rvmrc | 24 --
tools/devcloud/src/Gemfile | 19 --
tools/devcloud/src/Vagrantfile | 57 -----
tools/devcloud/src/boxit.sh | 21 --
tools/devcloud/src/deps/boxer.sh | 184 ---------------
tools/devcloud/src/deps/boxes/basebox-build/.rvmrc | 24 --
.../devcloud/src/deps/boxes/basebox-build/Gemfile | 20 --
.../src/deps/boxes/basebox-build/Vagrantfile | 17 --
.../src/deps/boxes/basebox-build/definition.rb | 42 ----
.../src/deps/boxes/basebox-build/postinstall.sh | 42 ----
.../src/deps/boxes/basebox-build/preseed.cfg | 105 ---------
tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc | 24 --
tools/devcloud/src/deps/boxes/xenbox-build/Gemfile | 19 --
.../src/deps/boxes/xenbox-build/Vagrantfile | 52 -----
.../boxes/xenbox-build/puppet/manifests/site.pp | 16 --
.../puppet/manifests/vagrant-devcloudinitial.pp | 18 --
.../puppet/modules/devcloudinitial/Modulefile | 8 -
.../puppet/modules/devcloudinitial/files/grub | 52 -----
.../modules/devcloudinitial/files/interfaces | 45 ----
.../modules/devcloudinitial/files/iptables.save | 30 ---
.../modules/devcloudinitial/files/xen-defaults | 18 --
.../puppet/modules/devcloudinitial/files/xend | 188 ---------------
.../modules/devcloudinitial/manifests/init.pp | 119 ----------
.../src/puppet/manifests/vagrant-devcloud.pp | 18 --
.../src/puppet/modules/devcloud/Modulefile | 8 -
.../src/puppet/modules/devcloud/files/compare.sh | 22 --
.../modules/devcloud/files/configebtables.sh | 21 --
.../modules/devcloud/files/configlocalstorage.sh | 25 --
.../src/puppet/modules/devcloud/files/configvnc.sh | 25 --
.../src/puppet/modules/devcloud/files/exports | 19 --
.../puppet/modules/devcloud/files/installmaven.sh | 22 --
.../puppet/modules/devcloud/files/startdevcloud.sh | 23 --
.../puppet/modules/devcloud/files/updatecode.sh | 27 ---
.../puppet/modules/devcloud/lib/facter/xeninfo.rb | 22 --
.../devcloud/manifests/functions/httpdownload.pp | 37 ---
.../src/puppet/modules/devcloud/manifests/init.pp | 255 ---------------------
.../puppet/modules/devcloud/manifests/params.pp | 78 -------
.../devcloud/templates/buildcloudstack.sh.erb | 28 ---
.../devcloud/templates/startcloudstack.sh.erb | 26 ---
tools/devcloud/src/waitforxe.sh | 39 ----
tools/devcloud4/advanced/README.md | 2 +-
tools/devcloud4/basic/README.md | 2 +-
tools/docker/Dockerfile.centos6 | 2 +-
tools/marvin/marvin/config/test_data.py | 2 +-
tools/marvin/marvin/misc/build/redeploy.sh | 2 +-
tools/pom.xml | 1 -
ui/scripts/cloud.core.callbacks.js | 2 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 2 +-
.../vmware/mo/HostDatastoreSystemMO.java | 2 +-
92 files changed, 70 insertions(+), 3243 deletions(-)
delete mode 100644 tools/devcloud/README.md
delete mode 100644 tools/devcloud/devcloud-advanced.cfg
delete mode 100644 tools/devcloud/devcloud-advanced_internal-mgt.cfg
delete mode 100644 tools/devcloud/devcloud-advanced_juniper-contrail.cfg
delete mode 100644 tools/devcloud/devcloud-advancedsg.cfg
delete mode 100644 tools/devcloud/devcloud.cfg
delete mode 100644 tools/devcloud/devcloud.sql
delete mode 100644 tools/devcloud/devcloud_internal-mgt.cfg
delete mode 100644 tools/devcloud/devcloud_s3.cfg
delete mode 100644 tools/devcloud/pom.xml
delete mode 100644 tools/devcloud/quickcloud.cfg
delete mode 100644 tools/devcloud/src/.rvmrc
delete mode 100644 tools/devcloud/src/Gemfile
delete mode 100644 tools/devcloud/src/Vagrantfile
delete mode 100755 tools/devcloud/src/boxit.sh
delete mode 100755 tools/devcloud/src/deps/boxer.sh
delete mode 100644 tools/devcloud/src/deps/boxes/basebox-build/.rvmrc
delete mode 100644 tools/devcloud/src/deps/boxes/basebox-build/Gemfile
delete mode 100644 tools/devcloud/src/deps/boxes/basebox-build/Vagrantfile
delete mode 100644 tools/devcloud/src/deps/boxes/basebox-build/definition.rb
delete mode 100644 tools/devcloud/src/deps/boxes/basebox-build/postinstall.sh
delete mode 100644 tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/Gemfile
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/Vagrantfile
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/site.pp
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/puppet/manifests/vagrant-devcloudinitial.pp
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/Modulefile
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/grub
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/interfaces
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/iptables.save
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xen-defaults
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/files/xend
delete mode 100644 tools/devcloud/src/deps/boxes/xenbox-build/puppet/modules/devcloudinitial/manifests/init.pp
delete mode 100644 tools/devcloud/src/puppet/manifests/vagrant-devcloud.pp
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/Modulefile
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/files/compare.sh
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/files/configebtables.sh
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/files/configlocalstorage.sh
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/files/configvnc.sh
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/files/exports
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/files/installmaven.sh
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/files/startdevcloud.sh
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/files/updatecode.sh
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/lib/facter/xeninfo.rb
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/manifests/functions/httpdownload.pp
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/manifests/init.pp
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/manifests/params.pp
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/templates/buildcloudstack.sh.erb
delete mode 100644 tools/devcloud/src/puppet/modules/devcloud/templates/startcloudstack.sh.erb
delete mode 100755 tools/devcloud/src/waitforxe.sh
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].
[cloudstack] 01/01: Merge pull request #1582 from
DaanHoogland/CLOUDSTACK-9408
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rajani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit f0dd5994b447a6097c52f405c7c7c54c76da9c16
Merge: 38f1050 70ef078
Author: Rajani Karuturi <ka...@users.noreply.github.com>
AuthorDate: Mon Apr 24 07:57:07 2017 +0530
Merge pull request #1582 from DaanHoogland/CLOUDSTACK-9408
CLOUDSTACK-9408 for the move away from download.cloud.com
INSTALL.md | 2 +-
api/src/com/cloud/offering/ServiceOffering.java | 1 +
api/src/com/cloud/resource/ResourceService.java | 2 +-
.../api/response/AutoScaleVmProfileResponse.java | 1 +
.../integration-test/test/resources/s3_testng.xml | 2 +-
packaging/centos63/cloud.spec | 2 +-
packaging/centos7/cloud.spec | 2 +-
packaging/fedora20/cloud.spec | 2 +-
packaging/fedora21/cloud.spec | 2 +-
scripts/storage/qcow2/importmpl.sh | 4 +-
scripts/vm/hypervisor/kvm/setup_agent.sh | 4 +-
.../com/cloud/server/ConfigurationServerImpl.java | 6 +-
setup/db/db/schema-21to22.sql | 8 +-
setup/db/db/schema-2214to30.sql | 2 +-
setup/db/db/schema-410to420.sql | 2 +-
setup/db/db/schema-421to430.sql | 6 +-
setup/db/db/schema-442to450.sql | 2 +-
setup/db/db/schema-452to460.sql | 2 +-
setup/db/templates.sql | 31 +--
systemvm/scripts/run.sh | 2 +-
systemvm/scripts/ssvm-check.sh | 6 +-
.../component/maint/test_high_availability.py | 2 +-
.../component/test_base_image_updation.py | 6 +-
.../integration/component/test_browse_templates.py | 2 +-
test/integration/component/test_browse_volumes.py | 2 +-
test/integration/component/test_project_configs.py | 2 +-
test/integration/component/test_project_usage.py | 2 +-
...st_template_from_snapshot_with_template_details | 2 +-
test/integration/component/test_templates.py | 2 +-
test/integration/component/test_usage.py | 2 +-
test/integration/smoke/test_ssvm.py | 2 +-
.../systemvmtemplate/install_systemvm_packages.sh | 2 +-
tools/devcloud/README.md | 102 ---------
tools/devcloud/devcloud-advanced.cfg | 131 -----------
tools/devcloud/devcloud-advanced_internal-mgt.cfg | 141 ------------
.../devcloud-advanced_juniper-contrail.cfg | 123 ----------
tools/devcloud/devcloud-advancedsg.cfg | 121 ----------
tools/devcloud/devcloud.cfg | 112 ---------
tools/devcloud/devcloud.sql | 55 -----
tools/devcloud/devcloud_internal-mgt.cfg | 121 ----------
tools/devcloud/devcloud_s3.cfg | 141 ------------
tools/devcloud/pom.xml | 178 --------------
tools/devcloud/quickcloud.cfg | 115 ----------
tools/devcloud/src/.rvmrc | 24 --
tools/devcloud/src/Gemfile | 19 --
tools/devcloud/src/Vagrantfile | 57 -----
tools/devcloud/src/boxit.sh | 21 --
tools/devcloud/src/deps/boxer.sh | 184 ---------------
tools/devcloud/src/deps/boxes/basebox-build/.rvmrc | 24 --
.../devcloud/src/deps/boxes/basebox-build/Gemfile | 20 --
.../src/deps/boxes/basebox-build/Vagrantfile | 17 --
.../src/deps/boxes/basebox-build/definition.rb | 42 ----
.../src/deps/boxes/basebox-build/postinstall.sh | 42 ----
.../src/deps/boxes/basebox-build/preseed.cfg | 105 ---------
tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc | 24 --
tools/devcloud/src/deps/boxes/xenbox-build/Gemfile | 19 --
.../src/deps/boxes/xenbox-build/Vagrantfile | 52 -----
.../boxes/xenbox-build/puppet/manifests/site.pp | 16 --
.../puppet/manifests/vagrant-devcloudinitial.pp | 18 --
.../puppet/modules/devcloudinitial/Modulefile | 8 -
.../puppet/modules/devcloudinitial/files/grub | 52 -----
.../modules/devcloudinitial/files/interfaces | 45 ----
.../modules/devcloudinitial/files/iptables.save | 30 ---
.../modules/devcloudinitial/files/xen-defaults | 18 --
.../puppet/modules/devcloudinitial/files/xend | 188 ---------------
.../modules/devcloudinitial/manifests/init.pp | 119 ----------
.../src/puppet/manifests/vagrant-devcloud.pp | 18 --
.../src/puppet/modules/devcloud/Modulefile | 8 -
.../src/puppet/modules/devcloud/files/compare.sh | 22 --
.../modules/devcloud/files/configebtables.sh | 21 --
.../modules/devcloud/files/configlocalstorage.sh | 25 --
.../src/puppet/modules/devcloud/files/configvnc.sh | 25 --
.../src/puppet/modules/devcloud/files/exports | 19 --
.../puppet/modules/devcloud/files/installmaven.sh | 22 --
.../puppet/modules/devcloud/files/startdevcloud.sh | 23 --
.../puppet/modules/devcloud/files/updatecode.sh | 27 ---
.../puppet/modules/devcloud/lib/facter/xeninfo.rb | 22 --
.../devcloud/manifests/functions/httpdownload.pp | 37 ---
.../src/puppet/modules/devcloud/manifests/init.pp | 255 ---------------------
.../puppet/modules/devcloud/manifests/params.pp | 78 -------
.../devcloud/templates/buildcloudstack.sh.erb | 28 ---
.../devcloud/templates/startcloudstack.sh.erb | 26 ---
tools/devcloud/src/waitforxe.sh | 39 ----
tools/devcloud4/advanced/README.md | 2 +-
tools/devcloud4/basic/README.md | 2 +-
tools/docker/Dockerfile.centos6 | 2 +-
tools/marvin/marvin/config/test_data.py | 2 +-
tools/marvin/marvin/misc/build/redeploy.sh | 2 +-
tools/pom.xml | 1 -
ui/scripts/cloud.core.callbacks.js | 2 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 2 +-
.../vmware/mo/HostDatastoreSystemMO.java | 2 +-
92 files changed, 70 insertions(+), 3243 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.