Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06c8e5bf Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06c8e5bf Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06c8e5bf Branch: refs/heads/master Commit: 06c8e5bfd85c2d0ca3d08b9caeb44fe9cef6fc3d Parents: 9c5da1c c56a75d Author: Likitha Shetty <likitha.she...@citrix.com> Authored: Fri Jul 5 16:28:24 2013 +0530 Committer: Likitha Shetty <likitha.she...@citrix.com> Committed: Fri Jul 5 16:28:24 2013 +0530 ---------------------------------------------------------------------- .../admin/storage/CreateCacheStoreCmd.java | 26 +- docs/en-US/CloudStack_GSoC_Guide.xml | 7 +- docs/en-US/add-loadbalancer-rule-vpc.xml | 317 +++++--- docs/en-US/add-vm-tier-sharednw.xml | 62 ++ docs/en-US/add-vpc.xml | 7 +- docs/en-US/configure-vpc.xml | 1 + docs/en-US/creating-vms.xml | 97 ++- docs/en-US/gsoc-dharmesh.xml | 4 +- docs/en-US/gsoc-imduffy15.xml | 4 +- docs/en-US/gsoc-meng.xml | 4 +- docs/en-US/gsoc-midsummer-dharmesh.xml | 28 + docs/en-US/gsoc-midsummer-ian.xml | 28 + docs/en-US/gsoc-midsummer-meng.xml | 28 + docs/en-US/gsoc-midsummer-nguyen.xml | 28 + docs/en-US/gsoc-midsummer-shiva.xml | 28 + docs/en-US/gsoc-midsummer.xml | 35 + docs/en-US/gsoc-proposals.xml | 35 + docs/en-US/gsoc-shiva.xml | 4 +- docs/en-US/gsoc-tuna.xml | 4 +- docs/en-US/images/add-vpc.png | Bin 16597 -> 20392 bytes docs/en-US/images/addvm-tier-sharednw.png | Bin 0 -> 111465 bytes .../image/datastore/ImageStoreHelper.java | 2 +- .../systemvm/debian/config/root/edithosts.sh | 2 +- .../xen/resource/CitrixResourceBase.java | 3 +- .../com/cloud/capacity/CapacityManagerImpl.java | 4 +- .../com/cloud/network/NetworkManagerImpl.java | 2 +- .../src/com/cloud/network/NetworkModelImpl.java | 1 + .../com/cloud/network/NetworkServiceImpl.java | 7 +- .../lb/LoadBalancingRulesManagerImpl.java | 42 +- .../com/cloud/resource/ResourceManagerImpl.java | 2 +- test/integration/smoke/test_loadbalance.py | 598 ++++++++++++++ test/integration/smoke/test_network.py | 645 ---------------- test/integration/smoke/test_routers.py | 1 + test/integration/smoke/test_scale_vm.py | 215 +++--- .../integration/smoke/test_service_offerings.py | 10 +- tools/marvin/marvin/integration/lib/utils.py | 83 +- ui/scripts/lbStickyPolicy.js | 63 +- ui/scripts/system.js | 774 +++++++++---------- 38 files changed, 1799 insertions(+), 1402 deletions(-) ----------------------------------------------------------------------
