Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/390022c4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/390022c4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/390022c4 Branch: refs/heads/vmsync Commit: 390022c4eaa1d7c6de9e89006f56defc0eb0ebd2 Parents: 3c88dd4 7c46cc9 Author: Sateesh Chodapuneedi <[email protected]> Authored: Mon Jun 24 11:07:25 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Mon Jun 24 11:07:25 2013 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
