Merge branch 'master' into ui-cisco-asa1000v-support
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9a876ca9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9a876ca9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9a876ca9 Branch: refs/heads/ui-vpc-redesign Commit: 9a876ca9cebc6dfe1a7da17732ab739e8675e94c Parents: d7b715b fca7b3e Author: Brian Federle <brian.fede...@citrix.com> Authored: Thu Apr 18 10:50:07 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Thu Apr 18 10:50:07 2013 -0700 ---------------------------------------------------------------------- .../cloudstack/affinity/AffinityGroupResponse.java | 5 +- .../api/command/user/vm/DeployVMCmd.java | 5 +- docs/en-US/Release_Notes.xml | 301 ++++++++++++--- packaging/debian/replace.properties | 2 +- server/src/com/cloud/api/ApiResponseHelper.java | 9 +- .../api/query/dao/AffinityGroupJoinDaoImpl.java | 1 + .../cloud/api/query/vo/AffinityGroupJoinVO.java | 11 + .../src/com/cloud/network/NetworkServiceImpl.java | 6 +- .../network/element/VirtualRouterElement.java | 2 +- .../cloudstack/affinity/AffinityGroupVO.java | 2 +- setup/db/db/schema-410to420.sql | 1 + test/integration/smoke/test_public_ip_range.py | 2 +- tools/marvin/marvin/cloudstackConnection.py | 92 +++-- 13 files changed, 343 insertions(+), 96 deletions(-) ----------------------------------------------------------------------
