Merge branch 'feature/systemvm-persistent-config-4' of github.com:schubergphilis/cloudstack into feature/systemvm-persistent-config-4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/68ed379f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/68ed379f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/68ed379f Branch: refs/heads/feature/systemvm-persistent-config Commit: 68ed379f4a97e2697a3a7510ddba8337de89de38 Parents: 8ac18a7 454f3e4 Author: Ian Southam <[email protected]> Authored: Fri Feb 6 13:54:28 2015 +0100 Committer: Ian Southam <[email protected]> Committed: Fri Feb 6 13:54:28 2015 +0100 ---------------------------------------------------------------------- .../classes/resources/messages.properties | 2 +- .../src/com/cloud/network/dao/NetworkDao.java | 2 + .../com/cloud/network/dao/NetworkDaoImpl.java | 234 ++++++++++--------- .../com/cloud/vm/dao/DomainRouterDaoImpl.java | 162 ++++++------- .../VirtualNetworkApplianceManagerImpl.java | 36 ++- .../com/cloud/vpc/dao/MockNetworkDaoImpl.java | 78 ++++--- .../opt/cloud/templates/checkrouter.sh.templ | 8 +- 7 files changed, 280 insertions(+), 242 deletions(-) ----------------------------------------------------------------------
