Merge branch 'feature/minvrversion' of https://github.com/DaanHoogland/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a2ddabde Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a2ddabde Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a2ddabde Branch: refs/heads/master Commit: a2ddabde06587252c63d45529b0375e8d8197d62 Parents: 6cd2b53 b586439 Author: Daan Hoogland <[email protected]> Authored: Wed Feb 4 21:51:15 2015 +0100 Committer: Daan Hoogland <[email protected]> Committed: Wed Feb 4 21:51:15 2015 +0100 ---------------------------------------------------------------------- .../com/cloud/network/VirtualNetworkApplianceService.java | 2 -- .../orchestration/service/NetworkOrchestrationService.java | 7 ++++++- .../engine/orchestration/NetworkOrchestrator.java | 9 ++++++--- .../src/com/cloud/agent/manager/MockVmManagerImpl.java | 5 ++--- .../com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java | 9 ++++----- server/src/com/cloud/network/router/NetworkHelperImpl.java | 6 +++--- 6 files changed, 21 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
