You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/03 02:46:52 UTC
[1/9] git commit: Merge branch 'master' into vpc
Updated Branches:
refs/heads/vpc 580261119 -> 5bcf73080
Merge branch 'master' into vpc
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5bcf7308
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5bcf7308
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5bcf7308
Branch: refs/heads/vpc
Commit: 5bcf73080af307313eed28108968846ae7bccfab
Parents: 5802611 49c3c8b
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jul 2 17:47:01 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Jul 2 17:47:01 2012 -0700
----------------------------------------------------------------------
client/tomcatconf/components.xml.in | 4 +-
docs/publican-cloudstack/LICENSE | 202 +++++
docs/publican-cloudstack/NOTICE | 5 +
docs/publican-cloudstack/README | 8 +
docs/publican-cloudstack/en-US/Feedback.xml | 27 +
docs/publican-cloudstack/en-US/Legal_Notice.xml | 39 +
docs/publican-cloudstack/en-US/css/overrides.css | 57 ++
docs/publican-cloudstack/en-US/images/.directory | 4 +
docs/publican-cloudstack/en-US/images/1.png | Bin 0 -> 1365 bytes
docs/publican-cloudstack/en-US/images/1.svg | 28 +
docs/publican-cloudstack/en-US/images/10.png | Bin 0 -> 1705 bytes
docs/publican-cloudstack/en-US/images/10.svg | 28 +
docs/publican-cloudstack/en-US/images/11.png | Bin 0 -> 1379 bytes
docs/publican-cloudstack/en-US/images/11.svg | 28 +
docs/publican-cloudstack/en-US/images/12.png | Bin 0 -> 1721 bytes
docs/publican-cloudstack/en-US/images/12.svg | 28 +
docs/publican-cloudstack/en-US/images/13.png | Bin 0 -> 1810 bytes
docs/publican-cloudstack/en-US/images/13.svg | 28 +
docs/publican-cloudstack/en-US/images/14.png | Bin 0 -> 1597 bytes
docs/publican-cloudstack/en-US/images/14.svg | 28 +
docs/publican-cloudstack/en-US/images/15.png | Bin 0 -> 1689 bytes
docs/publican-cloudstack/en-US/images/15.svg | 28 +
docs/publican-cloudstack/en-US/images/16.png | Bin 0 -> 1817 bytes
docs/publican-cloudstack/en-US/images/16.svg | 28 +
docs/publican-cloudstack/en-US/images/17.png | Bin 0 -> 1688 bytes
docs/publican-cloudstack/en-US/images/17.svg | 28 +
docs/publican-cloudstack/en-US/images/18.png | Bin 0 -> 1832 bytes
docs/publican-cloudstack/en-US/images/18.svg | 28 +
docs/publican-cloudstack/en-US/images/19.png | Bin 0 -> 1823 bytes
docs/publican-cloudstack/en-US/images/19.svg | 28 +
docs/publican-cloudstack/en-US/images/2.png | Bin 0 -> 1608 bytes
docs/publican-cloudstack/en-US/images/2.svg | 28 +
docs/publican-cloudstack/en-US/images/20.png | Bin 0 -> 1937 bytes
docs/publican-cloudstack/en-US/images/20.svg | 28 +
docs/publican-cloudstack/en-US/images/21.png | Bin 0 -> 1723 bytes
docs/publican-cloudstack/en-US/images/21.svg | 28 +
docs/publican-cloudstack/en-US/images/22.png | Bin 0 -> 1620 bytes
docs/publican-cloudstack/en-US/images/22.svg | 28 +
docs/publican-cloudstack/en-US/images/23.png | Bin 0 -> 2007 bytes
docs/publican-cloudstack/en-US/images/23.svg | 28 +
docs/publican-cloudstack/en-US/images/24.png | Bin 0 -> 1774 bytes
docs/publican-cloudstack/en-US/images/24.svg | 28 +
docs/publican-cloudstack/en-US/images/25.png | Bin 0 -> 1937 bytes
docs/publican-cloudstack/en-US/images/25.svg | 28 +
docs/publican-cloudstack/en-US/images/26.png | Bin 0 -> 1975 bytes
docs/publican-cloudstack/en-US/images/26.svg | 28 +
docs/publican-cloudstack/en-US/images/27.png | Bin 0 -> 1873 bytes
docs/publican-cloudstack/en-US/images/27.svg | 28 +
docs/publican-cloudstack/en-US/images/28.png | Bin 0 -> 2055 bytes
docs/publican-cloudstack/en-US/images/28.svg | 28 +
docs/publican-cloudstack/en-US/images/29.png | Bin 0 -> 2033 bytes
docs/publican-cloudstack/en-US/images/29.svg | 28 +
docs/publican-cloudstack/en-US/images/3.png | Bin 0 -> 1677 bytes
docs/publican-cloudstack/en-US/images/3.svg | 28 +
docs/publican-cloudstack/en-US/images/4.png | Bin 0 -> 1457 bytes
docs/publican-cloudstack/en-US/images/4.svg | 28 +
docs/publican-cloudstack/en-US/images/5.png | Bin 0 -> 1597 bytes
docs/publican-cloudstack/en-US/images/5.svg | 28 +
docs/publican-cloudstack/en-US/images/6.png | Bin 0 -> 1691 bytes
docs/publican-cloudstack/en-US/images/6.svg | 28 +
docs/publican-cloudstack/en-US/images/7.png | Bin 0 -> 1567 bytes
docs/publican-cloudstack/en-US/images/7.svg | 28 +
docs/publican-cloudstack/en-US/images/8.png | Bin 0 -> 1711 bytes
docs/publican-cloudstack/en-US/images/8.svg | 28 +
docs/publican-cloudstack/en-US/images/9.png | Bin 0 -> 1696 bytes
docs/publican-cloudstack/en-US/images/9.svg | 28 +
docs/publican-cloudstack/en-US/images/dot.png | Bin 0 -> 341 bytes
docs/publican-cloudstack/en-US/images/dot.svg | 21 +
docs/publican-cloudstack/en-US/images/dot2.png | Bin 0 -> 342 bytes
docs/publican-cloudstack/en-US/images/dot2.svg | 21 +
docs/publican-cloudstack/en-US/images/h1-bg.png | Bin 0 -> 565 bytes
docs/publican-cloudstack/en-US/images/h1-bg.svg | 21 +
.../en-US/images/image_left.png | Bin 0 -> 4044 bytes
.../en-US/images/image_left.svg | 331 +++++++
.../en-US/images/image_right.png | Bin 0 -> 2260 bytes
.../en-US/images/image_right.svg | 21 +
.../publican-cloudstack/en-US/images/important.png | Bin 0 -> 2318 bytes
.../publican-cloudstack/en-US/images/important.svg | 30 +
docs/publican-cloudstack/en-US/images/note.png | Bin 0 -> 2086 bytes
docs/publican-cloudstack/en-US/images/note.svg | 28 +
.../en-US/images/stock-go-back.png | Bin 0 -> 790 bytes
.../en-US/images/stock-go-back.svg | 21 +
.../en-US/images/stock-go-forward.png | Bin 0 -> 860 bytes
.../en-US/images/stock-go-forward.svg | 21 +
.../en-US/images/stock-go-up.png | Bin 0 -> 753 bytes
.../en-US/images/stock-go-up.svg | 21 +
.../en-US/images/stock-home.png | Bin 0 -> 819 bytes
.../en-US/images/stock-home.svg | 21 +
.../en-US/images/title_logo.png | Bin 0 -> 585 bytes
.../en-US/images/title_logo.svg | 335 +++++++
docs/publican-cloudstack/en-US/images/warning.png | Bin 0 -> 1941 bytes
docs/publican-cloudstack/en-US/images/warning.svg | 130 +++
.../en-US/images/watermark-draft.png | Bin 0 -> 25365 bytes
.../en-US/images/watermark-draft.svg | 21 +
docs/publican-cloudstack/publican-cloudstack.spec | 46 +
docs/runbook/en-US/Author_Group.xml | 12 +
docs/runbook/en-US/Book_Info.xml | 32 +
docs/runbook/en-US/Chapter.xml | 33 +
docs/runbook/en-US/Environment.xml | 224 +++++
docs/runbook/en-US/Management.xml | 107 +++
docs/runbook/en-US/Overview.xml | 67 ++
docs/runbook/en-US/Preface.xml | 13 +
docs/runbook/en-US/Revision_History.xml | 22 +
docs/runbook/en-US/Runbook.ent | 4 +
docs/runbook/en-US/Runbook.xml | 17 +
docs/runbook/en-US/config.xml | 159 ++++
docs/runbook/en-US/images/icon.svg | 19 +
docs/runbook/en-US/kvm.xml | 83 ++
ui/css/cloudstack3.css | 85 ++-
ui/images/sprites.png | Bin 178421 -> 178569 bytes
ui/scripts/ui-custom/vpc.js | 99 ++-
ui/scripts/vpc.js | 7 +-
.../cloud/hypervisor/vmware/mo/DatacenterMO.java | 474 +++++-----
.../src/com/cloud/hypervisor/vmware/mo/HostMO.java | 14 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 504 ++++++------
.../hypervisor/vmware/mo/SnapshotDescriptor.java | 136 ++--
.../hypervisor/vmware/mo/VirtualMachineMO.java | 684 +++++++-------
.../hypervisor/vmware/mo/VirtualSwitchType.java | 16 +-
.../hypervisor/vmware/util/VmwareContext.java | 508 ++++++------
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 242 +++---
120 files changed, 4509 insertions(+), 1299 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5bcf7308/client/tomcatconf/components.xml.in
----------------------------------------------------------------------