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/adeddc2c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/adeddc2c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/adeddc2c Branch: refs/heads/master Commit: adeddc2c676c946b1385860d5ebf1728b30617ab Parents: b5cfe74 8b2aae0 Author: Geoff Higginbottom <geoff.higginbt...@shapeblue.com> Authored: Mon Jun 24 22:37:29 2013 +0000 Committer: Geoff Higginbottom <geoff.higginbt...@shapeblue.com> Committed: Mon Jun 24 22:37:29 2013 +0000 ---------------------------------------------------------------------- .../user/address/AssociateIPAddrCmd.java | 47 +++++++++++++++++--- 1 file changed, 40 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
