Merge branch 'master' into ui-vpc-redesign
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f52a833f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f52a833f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f52a833f Branch: refs/heads/master Commit: f52a833f4e6178be7393ccb6217eb286461ff187 Parents: a292bfb e8fbee0 Author: Brian Federle <bfede...@gmail.com> Authored: Thu May 23 14:27:33 2013 -0700 Committer: Brian Federle <bfede...@gmail.com> Committed: Thu May 23 14:27:33 2013 -0700 ---------------------------------------------------------------------- .../cloud/network/vpn/RemoteAccessVpnService.java | 2 +- .../user/address/DisassociateIPAddrCmd.java | 4 +- .../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 2 +- client/tomcatconf/nonossComponentContext.xml.in | 2 +- debian/rules | 2 +- docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 1 + docs/en-US/images/nvp-add-controller.png | Bin 0 -> 35928 bytes docs/en-US/images/nvp-enable-provider.png | Bin 0 -> 32158 bytes docs/en-US/images/nvp-network-offering.png | Bin 0 -> 104060 bytes docs/en-US/images/nvp-physical-network-stt.png | Bin 0 -> 27317 bytes docs/en-US/images/nvp-vpc-offering-edit.png | Bin 0 -> 29279 bytes docs/en-US/plugin-niciranvp-about.xml | 2 +- docs/en-US/plugin-niciranvp-devicemanagement.xml | 32 +--- docs/en-US/plugin-niciranvp-features.xml | 67 +++++++- docs/en-US/plugin-niciranvp-guide.xml | 31 ---- docs/en-US/plugin-niciranvp-introduction.xml | 5 +- docs/en-US/plugin-niciranvp-networkofferings.xml | 131 +++++++++++++++ docs/en-US/plugin-niciranvp-physicalnet.xml | 37 ++++ docs/en-US/plugin-niciranvp-preparations.xml | 11 +- docs/en-US/plugin-niciranvp-provider.xml | 28 ++-- docs/en-US/plugin-niciranvp-revisions.xml | 14 ++ docs/en-US/plugin-niciranvp-tables.xml | 105 +++++++++--- docs/en-US/plugin-niciranvp-usage.xml | 11 +- docs/en-US/plugin-niciranvp-vpc.xml | 30 ++++ docs/en-US/plugin-niciranvp-vpcfeatures.xml | 28 +++ docs/en-US/plugin-niciranvp-vpcnetworkoffering.xml | 81 +++++++++ docs/en-US/plugin-niciranvp-vpcoffering.xml | 38 ++++ .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 32 ++++ .../kvm/resource/LibvirtComputingResource.java | 48 ++---- .../kvm/resource/LibvirtComputingResourceTest.java | 4 +- .../src/com/cloud/api/query/QueryManagerImpl.java | 2 +- .../deploy/DeploymentPlanningManagerImpl.java | 24 +-- .../src/com/cloud/network/NetworkManagerImpl.java | 2 +- .../network/vpn/RemoteAccessVpnManagerImpl.java | 4 +- server/src/com/cloud/user/AccountManagerImpl.java | 2 +- setup/db/db/schema-302to40.sql | 12 +- setup/db/db/schema-40to410.sql | 12 ++ setup/db/db/schema-410to420.sql | 8 +- test/integration/smoke/test_nic.py | 51 +++++- ui/scripts/network.js | 2 +- 40 files changed, 679 insertions(+), 188 deletions(-) ----------------------------------------------------------------------
