Merge branch 'master' into api_limit
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e83fe471 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e83fe471 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e83fe471 Branch: refs/heads/add_remove_nics Commit: e83fe471c7609cbc1c6de13713eed76901464411 Parents: 97cb169 a69e7f9 Author: Min Chen <min.c...@citrix.com> Authored: Wed Jan 16 10:49:25 2013 -0800 Committer: Min Chen <min.c...@citrix.com> Committed: Wed Jan 16 10:49:25 2013 -0800 ---------------------------------------------------------------------- api/src/com/cloud/network/Network.java | 1 - api/src/com/cloud/network/NetworkService.java | 2 +- api/src/com/cloud/offering/NetworkOffering.java | 2 - .../command/user/address/AssociateIPAddrCmd.java | 2 +- .../element/F5ExternalLoadBalancerElement.java | 2 +- .../element/JuniperSRXExternalFirewallElement.java | 3 +- .../cloud/network/element/NetscalerElement.java | 3 +- .../configuration/ConfigurationManagerImpl.java | 34 +-- .../src/com/cloud/network/NetworkManagerImpl.java | 296 +++------------ .../com/cloud/network/rules/RulesManagerImpl.java | 35 +-- .../src/com/cloud/offerings/NetworkOfferingVO.java | 28 +-- .../com/cloud/server/ConfigurationServerImpl.java | 3 +- .../src/com/cloud/upgrade/dao/Upgrade40to41.java | 40 +-- server/src/com/cloud/vm/UserVmManagerImpl.java | 68 +--- .../com/cloud/network/MockNetworkManagerImpl.java | 2 +- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 35 +-- setup/db/create-schema.sql | 1 - setup/db/db/schema-40to410.sql | 1 - test/integration/smoke/test_routers.py | 2 +- test/integration/smoke/test_service_offerings.py | 2 +- test/integration/smoke/test_templates.py | 2 +- test/integration/smoke/test_vm_life_cycle.py | 2 +- test/integration/smoke/test_volumes.py | 2 +- tools/devcloud-kvm/devcloud-kvm.sql | 5 +- ui/scripts/ui/widgets/listView.js | 4 +- 25 files changed, 111 insertions(+), 466 deletions(-) ----------------------------------------------------------------------
