Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack into disk_io_throttling
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/635974e1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/635974e1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/635974e1 Branch: refs/heads/disk_io_throttling Commit: 635974e1f9b65e71d6a6fe2a5ad4332c93dffb79 Parents: c555310 0587d3a Author: Wei Zhou <w.z...@leaseweb.com> Authored: Mon Jun 17 09:52:24 2013 +0200 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Mon Jun 17 09:52:24 2013 +0200 ---------------------------------------------------------------------- .../api/command/admin/host/ListHostsCmd.java | 7 - .../api/command/admin/ldap/LDAPConfigCmd.java | 20 +- .../admin/storage/ListStoragePoolsCmd.java | 7 - .../api/command/user/vm/ListVMsCmd.java | 7 - .../api/command/user/volume/ListVolumesCmd.java | 5 - client/tomcatconf/nonossComponentContext.xml.in | 1 + docs/en-US/CloudStack_GSoC_Guide.xml | 1 + docs/en-US/add-loadbalancer-rule-vpc.xml | 8 +- docs/en-US/create-vpn-connection-vpc.xml | 31 +- docs/en-US/create-vpn-gateway-for-vpc.xml | 30 +- docs/en-US/delete-reset-vpn.xml | 28 +- docs/en-US/gsoc-shiva.xml | 70 ++ docs/en-US/pvlan.xml | 125 +- .../kvm/resource/LibvirtComputingResource.java | 4 +- .../hypervisor/kvm/resource/LibvirtVMDef.java | 2 +- .../resource/LibvirtComputingResourceTest.java | 4 +- .../com/cloud/api/query/QueryManagerImpl.java | 48 +- .../configuration/ConfigurationManagerImpl.java | 5 +- .../com/cloud/network/NetworkServiceImpl.java | 6 +- .../VirtualNetworkApplianceManagerImpl.java | 26 +- .../network/vpc/NetworkACLServiceImpl.java | 4 + services/console-proxy/server/js/ajaxkeys.js | 42 +- .../console-proxy/server/scripts/ssvm-check.sh | 136 --- .../server/systemvm-descriptor.xml | 9 + setup/db/db/schema-2214to30.sql | 1 + test/integration/component/maint/__init__.py | 21 + .../component/maint/test_high_availability.py | 1079 ++++++++++++++++++ .../maint/test_host_high_availability.py | 810 +++++++++++++ .../maint/test_vpc_host_maintenance.py | 561 +++++++++ .../maint/test_vpc_on_host_maintenance.py | 323 ++++++ test/integration/component/test_accounts.py | 1 + .../component/test_custom_hostname.py | 2 +- .../component/test_high_availability.py | 1079 ------------------ .../component/test_host_high_availability.py | 811 ------------- test/integration/component/test_vpc.py | 252 +--- .../component/test_vpc_host_maintenance.py | 889 --------------- test/integration/smoke/test_network.py | 373 +++--- tools/apidoc/generateadmincommands.xsl | 6 +- tools/apidoc/generatecommand.xsl | 4 +- tools/apidoc/generatedomainadmincommands.xsl | 4 +- tools/apidoc/generatetoc_footer.xsl | 4 +- tools/apidoc/generateusercommands.xsl | 4 +- tools/apidoc/images/cloudstack.png | Bin 3893 -> 8575 bytes tools/apidoc/images/ins_buttonshadow.gif | Bin 1683 -> 0 bytes tools/apidoc/images/insdownload_button.gif | Bin 2531 -> 0 bytes .../apidoc/images/insdownload_button_hover.gif | Bin 2569 -> 0 bytes tools/apidoc/images/insjoincomm_button.gif | Bin 2627 -> 0 bytes .../apidoc/images/insjoincomm_button_hover.gif | Bin 2620 -> 0 bytes tools/apidoc/includes/main.css | 2 +- tools/cli/cloudmonkey/config.py | 2 +- tools/cli/cloudmonkey/requester.py | 47 +- ui/index.jsp | 1 - ui/scripts/configuration.js | 7 +- ui/scripts/system.js | 10 +- ui/scripts/ui/widgets/listView.js | 26 +- ui/scripts/vpc.js | 17 +- utils/src/com/cloud/utils/net/NetUtils.java | 9 + .../test/com/cloud/utils/net/NetUtilsTest.java | 13 + 58 files changed, 3352 insertions(+), 3632 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/635974e1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/635974e1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/635974e1/server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/635974e1/ui/scripts/configuration.js ----------------------------------------------------------------------
