Merge branch 'master' into api_refactoring
Getting ready for merge request for master, sync changes
Conflicts:
client/tomcatconf/commands.properties.in
Signed-off-by: Rohit Yadav <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b720675b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b720675b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b720675b
Branch: refs/heads/master
Commit: b720675bfea602a9db0ba169b5ec43f2df3a6bb7
Parents: 21d6cd3 7235ba3
Author: Rohit Yadav <[email protected]>
Authored: Sun Jan 6 01:11:16 2013 -0800
Committer: Rohit Yadav <[email protected]>
Committed: Sun Jan 6 01:11:16 2013 -0800
----------------------------------------------------------------------
server/src/com/cloud/configuration/Config.java | 1 +
server/src/com/cloud/network/dao/NetworkDao.java | 1 +
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 9 ++
.../router/VirtualNetworkApplianceManagerImpl.java | 94 ++++++++++++---
.../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 6 +
setup/db/db/schema-40to410.sql | 2 +
tools/cli/cloudmonkey/cloudmonkey.py | 41 +------
7 files changed, 103 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b720675b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b720675b/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
