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/cbbba286 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cbbba286 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cbbba286 Branch: refs/heads/ui-mixed-zone-management Commit: cbbba28657e4ce54d212a512bfd38f2891a0e35c Parents: a194720 9213fa6 Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Wed Apr 10 14:00:43 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Wed Apr 10 14:00:43 2013 +0530 ---------------------------------------------------------------------- .../api/commands/CreatePrivateNetworkCmd.java | 197 --------------- .../cloud/api/commands/DestroyConsoleProxyCmd.java | 85 ------- tools/appliance/build.sh | 5 +- 3 files changed, 4 insertions(+), 283 deletions(-) ----------------------------------------------------------------------
