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/34a3fd6d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34a3fd6d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34a3fd6d Branch: refs/heads/portablepublicip Commit: 34a3fd6d0207b5583ddba3e2ea19e9a5589e7a7d Parents: 0ed0e9a 80720dc Author: Pranav Saxena <[email protected]> Authored: Mon May 13 00:00:29 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Mon May 13 00:00:29 2013 +0530 ---------------------------------------------------------------------- .../cloud/network/resource/CiscoVnmcResource.java | 8 ++++---- .../network/resource/CiscoVnmcResourceTest.java | 13 +++---------- .../definitions/systemvmtemplate/postinstall.sh | 8 ++++++-- .../definitions/systemvmtemplate64/postinstall.sh | 8 ++++++-- 4 files changed, 19 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
