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/f59ea149 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f59ea149 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f59ea149 Branch: refs/heads/internalLb Commit: f59ea14925fb05c69a4b906ec3ecc714fe77c5c1 Parents: 4d5f105 99ea401 Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Wed Mar 27 16:05:21 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Wed Mar 27 16:05:21 2013 +0530 ---------------------------------------------------------------------- client/pom.xml | 5 ----- .../dns-notifier/resources/components-example.xml | 8 ++++++++ .../src/com/cloud/network/NetworkServiceImpl.java | 15 ++++++++++++++- 3 files changed, 22 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
