You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2013/10/03 08:06:48 UTC
[50/50] git commit: updated refs/heads/4.2 to 86c9363
Merging 4.2-forward into 4.2
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86c93637
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86c93637
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86c93637
Branch: refs/heads/4.2
Commit: 86c93637f59dd9ec0fbe666e44cb541e3a52b488
Parents: 78517ee 4533d2d
Author: animesh <an...@apache.org>
Authored: Wed Oct 2 23:05:34 2013 -0700
Committer: animesh <an...@apache.org>
Committed: Wed Oct 2 23:05:34 2013 -0700
----------------------------------------------------------------------
agent/bindir/cloudstack-agent-upgrade.in | 13 +
.../consoleproxy/ConsoleProxyResource.java | 25 +-
api/src/com/cloud/event/EventTypes.java | 1 +
.../api/command/user/vm/DeployVMCmd.java | 3 +
client/tomcatconf/commands.properties.in | 3 +-
debian/cloudstack-agent.install | 1 +
debian/cloudstack-agent.postinst | 10 +-
debian/cloudstack-usage.postinst | 12 +-
debian/rules | 5 +-
docs/en-US/accessing-system-vms.xml | 66 +
docs/en-US/images/change-affinity-button.png | Bin 0 -> 7300 bytes
docs/en-US/images/dedicate-resource-button.png | Bin 0 -> 7144 bytes
docs/en-US/images/edit-traffic-type.png | Bin 0 -> 93662 bytes
docs/en-US/images/plugin1.jpg | Bin 0 -> 32999 bytes
docs/en-US/images/plugin2.jpg | Bin 0 -> 35149 bytes
docs/en-US/images/plugin3.jpg | Bin 0 -> 41983 bytes
docs/en-US/images/plugin4.jpg | Bin 0 -> 32125 bytes
docs/en-US/images/plugin_intro.jpg | Bin 0 -> 22247 bytes
docs/en-US/images/traffic-type.png | Bin 0 -> 19159 bytes
docs/en-US/images/view-systemvm-details.png | Bin 0 -> 25483 bytes
docs/en-US/images/workloads.png | Bin 0 -> 69265 bytes
docs/en-US/third-party-ui-plugin.xml | 364 +++++
docs/qig/publican.cfg | 22 +
.../cloudstack/storage/command/CopyCommand.java | 4 +
.../storage/datastore/db/StoragePoolVO.java | 3 +-
.../cloud/storage/dao/VMTemplateDaoImpl.java | 14 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 162 +-
.../motion/AncientDataMotionStrategy.java | 7 +
.../storage/motion/DataMotionServiceImpl.java | 3 +
.../snapshot/XenserverSnapshotStrategy.java | 21 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 6 +-
.../storage/volume/VolumeServiceImpl.java | 38 +-
packaging/centos63/cloud.spec | 7 +
packaging/debian/init/cloud-agent | 2 +-
patches/systemvm/debian/config/etc/init.d/cloud | 26 +-
.../debian/config/etc/init.d/cloud-early-config | 2 +-
.../redundant_router/check_heartbeat.sh.templ | 2 +-
.../kvm/resource/BridgeVifDriver.java | 13 +-
.../kvm/resource/LibvirtComputingResource.java | 16 +-
.../kvm/storage/KVMStoragePoolManager.java | 14 +-
.../kvm/storage/KVMStorageProcessor.java | 26 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 27 +-
.../hypervisor/kvm/storage/StorageAdaptor.java | 4 +-
.../apache/cloudstack/utils/qemu/QemuImg.java | 11 +-
.../cloudstack/utils/qemu/QemuImgTest.java | 20 +-
plugins/hypervisors/ucs/pom.xml | 5 +
.../src/com/cloud/ucs/manager/UcsCommands.java | 31 +-
.../com/cloud/ucs/manager/UcsHttpClient.java | 7 +-
.../src/com/cloud/ucs/manager/UcsManager.java | 2 +
.../com/cloud/ucs/manager/UcsManagerImpl.java | 52 +-
.../src/com/cloud/ucs/structure/UcsProfile.java | 0
.../api/DisassociateUcsProfileCmd.java | 61 +
.../com/cloud/hypervisor/guru/VMwareGuru.java | 1 +
.../vmware/manager/VmwareManager.java | 1 +
.../vmware/manager/VmwareManagerImpl.java | 53 +-
.../manager/VmwareStorageManagerImpl.java | 34 +-
.../vmware/resource/VmwareContextFactory.java | 15 +-
.../vmware/resource/VmwareResource.java | 156 +-
.../VmwareSecondaryStorageContextFactory.java | 10 +
.../VmwareSecondaryStorageResourceHandler.java | 1 +
.../resource/VmwareStorageProcessor.java | 28 +-
.../VmwareStorageSubsystemCommandHandler.java | 10 +-
.../vmware/VmwareDatacenterApiUnitTest.java | 6 +
.../xen/resource/CitrixResourceBase.java | 117 +-
.../xen/resource/XenServer56FP1Resource.java | 1 +
.../xen/resource/XenServer56Resource.java | 44 -
.../xen/resource/XenServer610Resource.java | 30 +-
python/lib/cloudutils/serviceConfig.py | 3 +-
scripts/vm/hypervisor/xenserver/vmops | 12 +-
scripts/vm/network/security_group.py | 19 +-
.../cloud/agent/manager/AgentManagerImpl.java | 5 +-
.../com/cloud/api/query/QueryManagerImpl.java | 13 +-
.../cloud/api/query/dao/UserVmJoinDaoImpl.java | 25 +-
server/src/com/cloud/configuration/Config.java | 1 +
.../configuration/ConfigurationManagerImpl.java | 2 +-
.../deploy/DeploymentPlanningManagerImpl.java | 24 +-
.../com/cloud/network/NetworkManagerImpl.java | 15 +-
.../network/firewall/FirewallManagerImpl.java | 14 +-
.../VirtualNetworkApplianceManagerImpl.java | 7 +-
.../com/cloud/resource/ResourceManagerImpl.java | 20 +-
.../com/cloud/storage/VolumeManagerImpl.java | 110 +-
.../secondary/SecondaryStorageManagerImpl.java | 2 +-
.../com/cloud/template/TemplateManagerImpl.java | 10 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 6 +-
server/test/com/cloud/vm/UserVmManagerTest.java | 6 +-
.../resource/NfsSecondaryStorageResource.java | 32 +-
.../component/cpu_limits/__init__.py | 16 +
.../component/cpu_limits/test_cpu_limits.py | 553 ++++---
.../component/cpu_limits/test_domain_limits.py | 557 ++++---
.../component/cpu_limits/test_maximum_limits.py | 240 ++-
.../component/cpu_limits/test_project_limits.py | 166 +-
.../maint/test_egress_rules_host_maintenance.py | 290 ++++
.../maint/test_host_high_availability.py | 4 +-
.../component/maint/test_multiple_ip_ranges.py | 337 ++++
.../memory_limits/test_domain_limits.py | 288 ++--
.../memory_limits/test_maximum_limits.py | 205 ++-
.../memory_limits/test_memory_limits.py | 528 +++---
.../memory_limits/test_project_limits.py | 141 +-
.../component/test_affinity_groups.py | 2 +-
.../component/test_egress_fw_rules.py | 38 +-
test/integration/component/test_egress_rules.py | 12 +-
.../component/test_ip_reservation.py | 316 ++++
.../component/test_multiple_ip_ranges.py | 75 +-
.../component/test_netscaler_configs.py | 47 +-
test/integration/component/test_netscaler_lb.py | 20 +-
.../component/test_netscaler_lb_algo.py | 18 +-
.../component/test_netscaler_lb_sticky.py | 2 +-
.../component/test_netscaler_nw_off.py | 704 +++++++-
.../component/test_network_offering.py | 628 --------
test/integration/component/test_portable_ip.py | 1309 +++++++++++++++
.../component/test_redundant_router_cleanups.py | 2 +-
.../component/test_reset_ssh_keypair.py | 1517 ++++++++++++++++++
.../component/test_shared_networks.py | 3 +-
test/integration/component/test_stopped_vm.py | 148 ++
test/integration/component/test_templates.py | 76 +-
.../component/test_vpc_network_lbrules.py | 30 +
test/integration/smoke/test_network.py | 12 +-
.../smoke/test_reset_vm_on_reboot.py | 219 +++
test/integration/smoke/test_ssvm.py | 63 +-
tools/devcloud/devcloud-advanced.cfg | 4 +-
tools/devcloud/devcloud-advancedsg.cfg | 4 +-
tools/marvin/marvin/deployDataCenter.py | 1 -
tools/marvin/marvin/integration/lib/base.py | 45 +-
tools/marvin/marvin/integration/lib/common.py | 140 +-
tools/marvin/marvin/integration/lib/utils.py | 19 +-
.../demo/simulator/testcase/libs/base.py | 8 +-
ui/css/cloudstack3.css | 9 +-
ui/index.jsp | 61 +-
ui/scripts/instances.js | 64 +-
ui/scripts/network.js | 89 +-
ui/scripts/sharedFunctions.js | 733 ++++++++-
ui/scripts/system.js | 147 +-
ui/scripts/templates.js | 9 +-
ui/scripts/ui-custom/zoneWizard.js | 131 +-
ui/scripts/ui/widgets/detailView.js | 8 +-
ui/scripts/ui/widgets/listView.js | 2 +-
ui/scripts/ui/widgets/notifications.js | 2 +-
ui/scripts/zoneWizard.js | 230 +--
.../vmware/mo/CustomFieldConstants.java | 2 +
.../hypervisor/vmware/mo/DatacenterMO.java | 8 +-
.../vmware/mo/HypervisorHostHelper.java | 20 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 32 +-
.../hypervisor/vmware/util/VmwareClient.java | 51 +-
.../hypervisor/vmware/util/VmwareContext.java | 4 +
.../hypervisor/vmware/util/VmwareHelper.java | 44 +-
145 files changed, 9440 insertions(+), 2937 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86c93637/debian/rules
----------------------------------------------------------------------
diff --cc debian/rules
index e88b226,7cbb9ed..e4c51fb
--- a/debian/rules
+++ b/debian/rules
@@@ -143,9 -145,10 +145,10 @@@ install
mkdir $(DESTDIR)/var/log/$(PACKAGE)/usage
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage/plugins
- install -D usage/target/cloud-usage-$(VERSION)-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
+ install -D usage/target/cloud-usage-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
install -D usage/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/
- cp usage/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/
+ cp usage/target/transformed/db.properties $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/
+ cp usage/target/transformed/log4j-cloud_usage.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/log4j-cloud.xml
install -D packaging/debian/init/cloud-usage $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
# cloudstack-awsapi
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86c93637/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86c93637/plugins/hypervisors/ucs/pom.xml
----------------------------------------------------------------------