Merge branch 'master' into ui-list-view-multiple-actions
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/10c0ed51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/10c0ed51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/10c0ed51 Branch: refs/heads/ui-list-view-multiple-actions Commit: 10c0ed515755719b878e72a1e478a8f6f961bc96 Parents: 5a6c646 3375737 Author: Brian Federle <[email protected]> Authored: Tue Mar 5 15:33:25 2013 -0800 Committer: Brian Federle <[email protected]> Committed: Tue Mar 5 15:33:25 2013 -0800 ---------------------------------------------------------------------- docs/en-US/Developers_Guide.xml | 2 +- docs/en-US/cloudmonkey.xml | 224 +++++++++++++++ docs/en-US/devcloud-usage-mode.xml | 4 +- docs/en-US/tools.xml | 1 + .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 12 + .../debian/config/opt/cloud/bin/vpc_ipassoc.sh | 12 + .../src/com/cloud/api/query/QueryManagerImpl.java | 10 +- 7 files changed, 257 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
