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/3c433ded Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3c433ded Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3c433ded Branch: refs/heads/cs2163 Commit: 3c433deda76a16f1067cde743670572a0dc7f960 Parents: edd2fbb c704c90 Author: Pranav Saxena <[email protected]> Authored: Fri May 10 16:47:57 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Fri May 10 16:47:57 2013 +0530 ---------------------------------------------------------------------- .../network/cisco/CiscoVnmcConnectionImpl.java | 35 +++++++++----- .../cloud/network/element/CiscoVnmcElement.java | 33 ++++++++++++-- 2 files changed, 50 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
