You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2012/12/06 09:09:07 UTC

[7/100] [abbrv] git commit: Merge branch 'master' into events-framework

Merge branch 'master' into events-framework


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/82f02bac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/82f02bac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/82f02bac

Branch: refs/heads/events-framework
Commit: 82f02bac34dbbd2f24b0b28f1e96c370364b6096
Parents: cbc9bce fe460fa
Author: Murali Reddy <mu...@citrix.com>
Authored: Thu Nov 15 15:46:16 2012 +0530
Committer: Murali Reddy <mu...@citrix.com>
Committed: Thu Nov 15 15:46:16 2012 +0530

----------------------------------------------------------------------
 .gitignore                                         |    3 +
 agent/pom.xml                                      |    5 -
 .../cloud/api/commands/CreateStoragePoolCmd.java   |    4 +-
 api/src/com/cloud/api/commands/ListZonesByCmd.java |    1 -
 .../api/commands/UploadCustomCertificateCmd.java   |   12 +-
 awsapi/pom.xml                                     |   54 +-
 .../WEB-INF/classes/resources/messages.properties  |    5 +
 console-proxy/pom.xml                              |   16 +-
 debian/rules                                       |  106 +-
 deps/pom.xml                                       |  201 -
 docs/en-US/Installation_Guide.xml                  |    2 +
 docs/en-US/about-password-encryption.xml           |   65 +
 docs/en-US/additional-installation-options.xml     |   31 +
 docs/en-US/adv-zone-topology-req.xml               |   25 +
 docs/en-US/basic-adv-networking.xml                |  113 +
 docs/en-US/cisco3750-hardware.xml                  |   52 +
 docs/en-US/cisco3750-layer2.xml                    |   45 +
 docs/en-US/cloudstack.xml                          |    1 +
 docs/en-US/database-replication.xml                |  136 +
 docs/en-US/dell62xx-hardware.xml                   |   53 +
 docs/en-US/dell62xx-layer2.xml                     |   49 +
 docs/en-US/external-fw-topology-req.xml            |   25 +
 docs/en-US/external-guest-firewall-integration.xml |  201 +
 docs/en-US/external-guest-lb-integration.xml       |  109 +
 docs/en-US/generic-firewall-provisions.xml         |   37 +
 .../en-US/guest-nw-usage-with-traffic-sentinel.xml |   73 +
 docs/en-US/hardware-config-eg.xml                  |   29 +
 docs/en-US/hardware-firewall.xml                   |   29 +
 docs/en-US/images/parallel-mode.png                |  Bin 0 -> 11520 bytes
 docs/en-US/install-usage-server.xml                |   61 +
 docs/en-US/kvm-topology-req.xml                    |   24 +
 docs/en-US/layer2-switch.xml                       |   41 +
 .../management-server-install-db-external.xml      |  181 +-
 docs/en-US/management-server-install-db-local.xml  |  144 +-
 docs/en-US/management-server-install-flow.xml      |    1 +
 docs/en-US/management-server-lb.xml                |   61 +
 docs/en-US/network-setup.xml                       |   35 +
 docs/en-US/prepare-system-vm-template.xml          |   15 +-
 docs/en-US/runtime-internal-comm-req.xml           |   39 +
 docs/en-US/security-req.xml                        |   24 +
 docs/en-US/set-zone-vlan-run-vm-max.xml            |   65 +
 docs/en-US/ssl.xml                                 |   29 +
 docs/en-US/storage-nw-topology-req.xml             |   28 +
 docs/en-US/topology-req.xml                        |   31 +
 docs/en-US/vlan-allocation-eg.xml                  |   71 +
 docs/en-US/vmware-topology-req.xml                 |   38 +
 docs/en-US/xenserver-topology-req.xml              |   24 +
 ...udStack-4.0.0-incubating-Admin_Guide-en-US.epub |  Bin 0 -> 2794819 bytes
 .../Admin_Guide/Common_Content/css/common.css      | 1528 +++++
 .../Admin_Guide/Common_Content/css/default.css     |    3 +
 .../Admin_Guide/Common_Content/css/lang.css        |    2 +
 .../Admin_Guide/Common_Content/css/overrides.css   |   57 +
 .../Admin_Guide/Common_Content/css/print.css       |   16 +
 .../Admin_Guide/Common_Content/images/1.png        |  Bin 0 -> 721 bytes
 .../Admin_Guide/Common_Content/images/1.svg        |   27 +
 .../Admin_Guide/Common_Content/images/10.png       |  Bin 0 -> 1020 bytes
 .../Admin_Guide/Common_Content/images/10.svg       |   31 +
 .../Admin_Guide/Common_Content/images/11.png       |  Bin 0 -> 815 bytes
 .../Admin_Guide/Common_Content/images/11.svg       |   31 +
 .../Admin_Guide/Common_Content/images/12.png       |  Bin 0 -> 1018 bytes
 .../Admin_Guide/Common_Content/images/12.svg       |   31 +
 .../Admin_Guide/Common_Content/images/13.png       |  Bin 0 -> 1061 bytes
 .../Admin_Guide/Common_Content/images/13.svg       |   31 +
 .../Admin_Guide/Common_Content/images/14.png       |  Bin 0 -> 926 bytes
 .../Admin_Guide/Common_Content/images/14.svg       |   31 +
 .../Admin_Guide/Common_Content/images/15.png       |  Bin 0 -> 1003 bytes
 .../Admin_Guide/Common_Content/images/15.svg       |   31 +
 .../Admin_Guide/Common_Content/images/16.png       |  Bin 0 -> 1062 bytes
 .../Admin_Guide/Common_Content/images/16.svg       |   31 +
 .../Admin_Guide/Common_Content/images/17.png       |  Bin 0 -> 903 bytes
 .../Admin_Guide/Common_Content/images/17.svg       |   31 +
 .../Admin_Guide/Common_Content/images/18.png       |  Bin 0 -> 1095 bytes
 .../Admin_Guide/Common_Content/images/18.svg       |   31 +
 .../Admin_Guide/Common_Content/images/19.png       |  Bin 0 -> 1064 bytes
 .../Admin_Guide/Common_Content/images/19.svg       |   31 +
 .../Admin_Guide/Common_Content/images/2.png        |  Bin 0 -> 911 bytes
 .../Admin_Guide/Common_Content/images/2.svg        |   27 +
 .../Admin_Guide/Common_Content/images/20.png       |  Bin 0 -> 1171 bytes
 .../Admin_Guide/Common_Content/images/20.svg       |   31 +
 .../Admin_Guide/Common_Content/images/21.png       |  Bin 0 -> 999 bytes
 .../Admin_Guide/Common_Content/images/21.svg       |   31 +
 .../Admin_Guide/Common_Content/images/22.png       |  Bin 0 -> 1142 bytes
 .../Admin_Guide/Common_Content/images/22.svg       |   31 +
 .../Admin_Guide/Common_Content/images/23.png       |  Bin 0 -> 1212 bytes
 .../Admin_Guide/Common_Content/images/23.svg       |   31 +
 .../Admin_Guide/Common_Content/images/24.png       |  Bin 0 -> 1083 bytes
 .../Admin_Guide/Common_Content/images/24.svg       |   31 +
 .../Admin_Guide/Common_Content/images/25.png       |  Bin 0 -> 1182 bytes
 .../Admin_Guide/Common_Content/images/25.svg       |   31 +
 .../Admin_Guide/Common_Content/images/26.png       |  Bin 0 -> 1215 bytes
 .../Admin_Guide/Common_Content/images/26.svg       |   31 +
 .../Admin_Guide/Common_Content/images/27.png       |  Bin 0 -> 1086 bytes
 .../Admin_Guide/Common_Content/images/27.svg       |   31 +
 .../Admin_Guide/Common_Content/images/28.png       |  Bin 0 -> 1251 bytes
 .../Admin_Guide/Common_Content/images/28.svg       |   31 +
 .../Admin_Guide/Common_Content/images/29.png       |  Bin 0 -> 1212 bytes
 .../Admin_Guide/Common_Content/images/29.svg       |   31 +
 .../Admin_Guide/Common_Content/images/3.png        |  Bin 0 -> 968 bytes
 .../Admin_Guide/Common_Content/images/3.svg        |   27 +
 .../Admin_Guide/Common_Content/images/30.png       |  Bin 0 -> 1267 bytes
 .../Admin_Guide/Common_Content/images/30.svg       |   31 +
 .../Admin_Guide/Common_Content/images/31.png       |  Bin 0 -> 1083 bytes
 .../Admin_Guide/Common_Content/images/31.svg       |   31 +
 .../Admin_Guide/Common_Content/images/32.png       |  Bin 0 -> 1244 bytes
 .../Admin_Guide/Common_Content/images/32.svg       |   31 +
 .../Admin_Guide/Common_Content/images/33.png       |  Bin 0 -> 1279 bytes
 .../Admin_Guide/Common_Content/images/33.svg       |   31 +
 .../Admin_Guide/Common_Content/images/34.png       |  Bin 0 -> 1178 bytes
 .../Admin_Guide/Common_Content/images/34.svg       |   31 +
 .../Admin_Guide/Common_Content/images/35.png       |  Bin 0 -> 1235 bytes
 .../Admin_Guide/Common_Content/images/35.svg       |   31 +
 .../Admin_Guide/Common_Content/images/36.png       |  Bin 0 -> 1286 bytes
 .../Admin_Guide/Common_Content/images/36.svg       |   31 +
 .../Admin_Guide/Common_Content/images/37.png       |  Bin 0 -> 1155 bytes
 .../Admin_Guide/Common_Content/images/37.svg       |   31 +
 .../Admin_Guide/Common_Content/images/38.png       |  Bin 0 -> 1325 bytes
 .../Admin_Guide/Common_Content/images/38.svg       |   31 +
 .../Admin_Guide/Common_Content/images/39.png       |  Bin 0 -> 1300 bytes
 .../Admin_Guide/Common_Content/images/39.svg       |   31 +
 .../Admin_Guide/Common_Content/images/4.png        |  Bin 0 -> 838 bytes
 .../Admin_Guide/Common_Content/images/4.svg        |   27 +
 .../Admin_Guide/Common_Content/images/40.png       |  Bin 0 -> 1145 bytes
 .../Admin_Guide/Common_Content/images/40.svg       |   31 +
 .../Admin_Guide/Common_Content/images/5.png        |  Bin 0 -> 916 bytes
 .../Admin_Guide/Common_Content/images/5.svg        |   27 +
 .../Admin_Guide/Common_Content/images/6.png        |  Bin 0 -> 939 bytes
 .../Admin_Guide/Common_Content/images/6.svg        |   27 +
 .../Admin_Guide/Common_Content/images/7.png        |  Bin 0 -> 819 bytes
 .../Admin_Guide/Common_Content/images/7.svg        |   27 +
 .../Admin_Guide/Common_Content/images/8.png        |  Bin 0 -> 993 bytes
 .../Admin_Guide/Common_Content/images/8.svg        |   27 +
 .../Admin_Guide/Common_Content/images/9.png        |  Bin 0 -> 941 bytes
 .../Admin_Guide/Common_Content/images/9.svg        |   27 +
 .../Admin_Guide/Common_Content/images/dot.png      |  Bin 0 -> 173 bytes
 .../Admin_Guide/Common_Content/images/dot2.png     |  Bin 0 -> 128 bytes
 .../Admin_Guide/Common_Content/images/green.png    |  Bin 0 -> 176 bytes
 .../Admin_Guide/Common_Content/images/h1-bg.png    |  Bin 0 -> 565 bytes
 .../Common_Content/images/image_left.png           |  Bin 0 -> 4284 bytes
 .../Common_Content/images/image_right.png          |  Bin 0 -> 2489 bytes
 .../Common_Content/images/important.png            |  Bin 0 -> 2318 bytes
 .../Common_Content/images/important.svg            |   30 +
 .../Admin_Guide/Common_Content/images/note.png     |  Bin 0 -> 2086 bytes
 .../Admin_Guide/Common_Content/images/note.svg     |   28 +
 .../Admin_Guide/Common_Content/images/red.png      |  Bin 0 -> 163 bytes
 .../Admin_Guide/Common_Content/images/shine.png    |  Bin 0 -> 146 bytes
 .../Common_Content/images/stock-go-back.png        |  Bin 0 -> 790 bytes
 .../Common_Content/images/stock-go-forward.png     |  Bin 0 -> 860 bytes
 .../Common_Content/images/stock-go-up.png          |  Bin 0 -> 753 bytes
 .../Common_Content/images/stock-home.png           |  Bin 0 -> 819 bytes
 .../Common_Content/images/title_logo.png           |  Bin 0 -> 7876 bytes
 .../Common_Content/images/title_logo.svg           |  335 +
 .../Admin_Guide/Common_Content/images/warning.png  |  Bin 0 -> 1941 bytes
 .../Admin_Guide/Common_Content/images/warning.svg  |  130 +
 .../Common_Content/images/watermark-draft.png      |  Bin 0 -> 25365 bytes
 .../Admin_Guide/Common_Content/images/yellow.png   |  Bin 0 -> 175 bytes
 .../Admin_Guide/images/1000-foot-view.png          |  Bin 0 -> 222230 bytes
 .../html-single/Admin_Guide/images/add-cluster.png |  Bin 0 -> 46302 bytes
 .../html-single/Admin_Guide/images/add-gateway.png |  Bin 0 -> 16360 bytes
 .../Admin_Guide/images/add-guest-network.png       |  Bin 0 -> 20547 bytes
 .../Admin_Guide/images/add-new-gateway-vpc.png     |  Bin 0 -> 23184 bytes
 .../html-single/Admin_Guide/images/add-tier.png    |  Bin 0 -> 14891 bytes
 .../html-single/Admin_Guide/images/add-vpc.png     |  Bin 0 -> 16597 bytes
 .../images/add-vpn-customer-gateway.png            |  Bin 0 -> 29851 bytes
 .../Admin_Guide/images/attach-disk-icon.png        |  Bin 0 -> 1092 bytes
 .../Admin_Guide/images/autoscale-config.png        |  Bin 0 -> 39379 bytes
 .../Admin_Guide/images/basic-deployment.png        |  Bin 0 -> 5892 bytes
 .../Admin_Guide/images/change-admin-password.png   |  Bin 0 -> 141860 bytes
 .../Admin_Guide/images/change-password.png         |  Bin 0 -> 891 bytes
 .../Admin_Guide/images/change-service-icon.png     |  Bin 0 -> 769 bytes
 .../Admin_Guide/images/cluster-overview.png        |  Bin 0 -> 6973 bytes
 .../Admin_Guide/images/console-icon.png            |  Bin 0 -> 953 bytes
 .../Admin_Guide/images/create-vpn-connection.png   |  Bin 0 -> 13613 bytes
 .../Admin_Guide/images/delete-button.png           |  Bin 0 -> 735 bytes
 .../Admin_Guide/images/destroy-instance.png        |  Bin 0 -> 815 bytes
 .../Admin_Guide/images/detach-disk-icon.png        |  Bin 0 -> 953 bytes
 .../html-single/Admin_Guide/images/edit-icon.png   |  Bin 0 -> 940 bytes
 .../images/enable-disable-autoscale.png            |  Bin 0 -> 913 bytes
 .../Admin_Guide/images/enable-disable.png          |  Bin 0 -> 982 bytes
 .../Admin_Guide/images/guest-traffic-setup.png     |  Bin 0 -> 34022 bytes
 .../html-single/Admin_Guide/images/http-access.png |  Bin 0 -> 10214 bytes
 .../html-single/Admin_Guide/images/icon.svg        |   37 +
 .../Admin_Guide/images/infrastructure-overview.png |  Bin 0 -> 11852 bytes
 .../Admin_Guide/images/installation-complete.png   |  Bin 0 -> 20814 bytes
 .../html-single/Admin_Guide/images/iso-icon.png    |  Bin 0 -> 991 bytes
 .../images/large-scale-redundant-setup.png         |  Bin 0 -> 109117 bytes
 .../Admin_Guide/images/migrate-instance.png        |  Bin 0 -> 837 bytes
 .../images/multi-node-management-server.png        |  Bin 0 -> 26912 bytes
 .../Admin_Guide/images/multi-site-deployment.png   |  Bin 0 -> 68190 bytes
 .../Admin_Guide/images/multi-tier-app.png          |  Bin 0 -> 200956 bytes
 .../html-single/Admin_Guide/images/network-acl.png |  Bin 0 -> 23333 bytes
 .../Admin_Guide/images/network-setup-zone.png      |  Bin 0 -> 67410 bytes
 .../Admin_Guide/images/network-singlepod.png       |  Bin 0 -> 18381 bytes
 .../Admin_Guide/images/networking-in-a-pod.png     |  Bin 0 -> 16365 bytes
 .../Admin_Guide/images/networking-in-a-zone.png    |  Bin 0 -> 88746 bytes
 .../images/nic-bonding-and-multipath-io.png        |  Bin 0 -> 42030 bytes
 .../Admin_Guide/images/pod-overview.png            |  Bin 0 -> 6036 bytes
 .../Admin_Guide/images/provisioning-overview.png   |  Bin 0 -> 23622 bytes
 .../Admin_Guide/images/release-ip-icon.png         |  Bin 0 -> 815 bytes
 .../html-single/Admin_Guide/images/remove-tier.png |  Bin 0 -> 7457 bytes
 .../html-single/Admin_Guide/images/remove-vpc.png  |  Bin 0 -> 815 bytes
 .../html-single/Admin_Guide/images/remove-vpn.png  |  Bin 0 -> 735 bytes
 .../html-single/Admin_Guide/images/reset-vpn.png   |  Bin 0 -> 860 bytes
 .../html-single/Admin_Guide/images/restart-vpc.png |  Bin 0 -> 860 bytes
 .../Admin_Guide/images/search-button.png           |  Bin 0 -> 1012 bytes
 .../Admin_Guide/images/select-vm-staticnat-vpc.png |  Bin 0 -> 17472 bytes
 .../images/separate-storage-network.png            |  Bin 0 -> 44556 bytes
 .../Admin_Guide/images/small-scale-deployment.png  |  Bin 0 -> 50772 bytes
 .../Admin_Guide/images/software-license.png        |  Bin 0 -> 124257 bytes
 .../Admin_Guide/images/stop-instance-icon.png      |  Bin 0 -> 955 bytes
 .../Admin_Guide/images/suspend-icon.png            |  Bin 0 -> 982 bytes
 .../html-single/Admin_Guide/images/sysmanager.png  |  Bin 0 -> 114821 bytes
 .../Admin_Guide/images/vm-lifecycle.png            |  Bin 0 -> 20783 bytes
 .../Admin_Guide/images/vmware-increase-ports.png   |  Bin 0 -> 66143 bytes
 .../Admin_Guide/images/vmware-iscsi-datastore.png  |  Bin 0 -> 54352 bytes
 .../Admin_Guide/images/vmware-iscsi-general.png    |  Bin 0 -> 15723 bytes
 .../images/vmware-iscsi-initiator-properties.png   |  Bin 0 -> 45592 bytes
 .../Admin_Guide/images/vmware-iscsi-initiator.png  |  Bin 0 -> 105201 bytes
 .../Admin_Guide/images/vmware-iscsi-target-add.png |  Bin 0 -> 18509 bytes
 .../images/vmware-mgt-network-properties.png       |  Bin 0 -> 42767 bytes
 .../images/vmware-nexus-add-cluster.png            |  Bin 0 -> 37083 bytes
 .../images/vmware-nexus-port-profile.png           |  Bin 0 -> 118083 bytes
 .../Admin_Guide/images/vmware-physical-network.png |  Bin 0 -> 136848 bytes
 .../images/vmware-vswitch-properties.png           |  Bin 0 -> 32376 bytes
 .../html-single/Admin_Guide/images/vpc-setting.png |  Bin 0 -> 5636 bytes
 .../html-single/Admin_Guide/images/vpn-icon.png    |  Bin 0 -> 1012 bytes
 .../Admin_Guide/images/vsphere-client.png          |  Bin 0 -> 81246 bytes
 .../Admin_Guide/images/zone-overview.png           |  Bin 0 -> 11852 bytes
 .../html-single/Admin_Guide/index.html             | 4987 +++++++++++++++
 .../html/Admin_Guide/Common_Content/css/common.css | 1528 +++++
 .../Admin_Guide/Common_Content/css/default.css     |    3 +
 .../html/Admin_Guide/Common_Content/css/lang.css   |    2 +
 .../Admin_Guide/Common_Content/css/overrides.css   |   57 +
 .../html/Admin_Guide/Common_Content/css/print.css  |   16 +
 .../html/Admin_Guide/Common_Content/images/1.png   |  Bin 0 -> 721 bytes
 .../html/Admin_Guide/Common_Content/images/1.svg   |   27 +
 .../html/Admin_Guide/Common_Content/images/10.png  |  Bin 0 -> 1020 bytes
 .../html/Admin_Guide/Common_Content/images/10.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/11.png  |  Bin 0 -> 815 bytes
 .../html/Admin_Guide/Common_Content/images/11.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/12.png  |  Bin 0 -> 1018 bytes
 .../html/Admin_Guide/Common_Content/images/12.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/13.png  |  Bin 0 -> 1061 bytes
 .../html/Admin_Guide/Common_Content/images/13.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/14.png  |  Bin 0 -> 926 bytes
 .../html/Admin_Guide/Common_Content/images/14.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/15.png  |  Bin 0 -> 1003 bytes
 .../html/Admin_Guide/Common_Content/images/15.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/16.png  |  Bin 0 -> 1062 bytes
 .../html/Admin_Guide/Common_Content/images/16.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/17.png  |  Bin 0 -> 903 bytes
 .../html/Admin_Guide/Common_Content/images/17.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/18.png  |  Bin 0 -> 1095 bytes
 .../html/Admin_Guide/Common_Content/images/18.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/19.png  |  Bin 0 -> 1064 bytes
 .../html/Admin_Guide/Common_Content/images/19.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/2.png   |  Bin 0 -> 911 bytes
 .../html/Admin_Guide/Common_Content/images/2.svg   |   27 +
 .../html/Admin_Guide/Common_Content/images/20.png  |  Bin 0 -> 1171 bytes
 .../html/Admin_Guide/Common_Content/images/20.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/21.png  |  Bin 0 -> 999 bytes
 .../html/Admin_Guide/Common_Content/images/21.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/22.png  |  Bin 0 -> 1142 bytes
 .../html/Admin_Guide/Common_Content/images/22.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/23.png  |  Bin 0 -> 1212 bytes
 .../html/Admin_Guide/Common_Content/images/23.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/24.png  |  Bin 0 -> 1083 bytes
 .../html/Admin_Guide/Common_Content/images/24.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/25.png  |  Bin 0 -> 1182 bytes
 .../html/Admin_Guide/Common_Content/images/25.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/26.png  |  Bin 0 -> 1215 bytes
 .../html/Admin_Guide/Common_Content/images/26.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/27.png  |  Bin 0 -> 1086 bytes
 .../html/Admin_Guide/Common_Content/images/27.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/28.png  |  Bin 0 -> 1251 bytes
 .../html/Admin_Guide/Common_Content/images/28.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/29.png  |  Bin 0 -> 1212 bytes
 .../html/Admin_Guide/Common_Content/images/29.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/3.png   |  Bin 0 -> 968 bytes
 .../html/Admin_Guide/Common_Content/images/3.svg   |   27 +
 .../html/Admin_Guide/Common_Content/images/30.png  |  Bin 0 -> 1267 bytes
 .../html/Admin_Guide/Common_Content/images/30.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/31.png  |  Bin 0 -> 1083 bytes
 .../html/Admin_Guide/Common_Content/images/31.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/32.png  |  Bin 0 -> 1244 bytes
 .../html/Admin_Guide/Common_Content/images/32.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/33.png  |  Bin 0 -> 1279 bytes
 .../html/Admin_Guide/Common_Content/images/33.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/34.png  |  Bin 0 -> 1178 bytes
 .../html/Admin_Guide/Common_Content/images/34.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/35.png  |  Bin 0 -> 1235 bytes
 .../html/Admin_Guide/Common_Content/images/35.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/36.png  |  Bin 0 -> 1286 bytes
 .../html/Admin_Guide/Common_Content/images/36.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/37.png  |  Bin 0 -> 1155 bytes
 .../html/Admin_Guide/Common_Content/images/37.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/38.png  |  Bin 0 -> 1325 bytes
 .../html/Admin_Guide/Common_Content/images/38.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/39.png  |  Bin 0 -> 1300 bytes
 .../html/Admin_Guide/Common_Content/images/39.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/4.png   |  Bin 0 -> 838 bytes
 .../html/Admin_Guide/Common_Content/images/4.svg   |   27 +
 .../html/Admin_Guide/Common_Content/images/40.png  |  Bin 0 -> 1145 bytes
 .../html/Admin_Guide/Common_Content/images/40.svg  |   31 +
 .../html/Admin_Guide/Common_Content/images/5.png   |  Bin 0 -> 916 bytes
 .../html/Admin_Guide/Common_Content/images/5.svg   |   27 +
 .../html/Admin_Guide/Common_Content/images/6.png   |  Bin 0 -> 939 bytes
 .../html/Admin_Guide/Common_Content/images/6.svg   |   27 +
 .../html/Admin_Guide/Common_Content/images/7.png   |  Bin 0 -> 819 bytes
 .../html/Admin_Guide/Common_Content/images/7.svg   |   27 +
 .../html/Admin_Guide/Common_Content/images/8.png   |  Bin 0 -> 993 bytes
 .../html/Admin_Guide/Common_Content/images/8.svg   |   27 +
 .../html/Admin_Guide/Common_Content/images/9.png   |  Bin 0 -> 941 bytes
 .../html/Admin_Guide/Common_Content/images/9.svg   |   27 +
 .../html/Admin_Guide/Common_Content/images/dot.png |  Bin 0 -> 173 bytes
 .../Admin_Guide/Common_Content/images/dot2.png     |  Bin 0 -> 128 bytes
 .../Admin_Guide/Common_Content/images/green.png    |  Bin 0 -> 176 bytes
 .../Admin_Guide/Common_Content/images/h1-bg.png    |  Bin 0 -> 565 bytes
 .../Common_Content/images/image_left.png           |  Bin 0 -> 4284 bytes
 .../Common_Content/images/image_right.png          |  Bin 0 -> 2489 bytes
 .../Common_Content/images/important.png            |  Bin 0 -> 2318 bytes
 .../Common_Content/images/important.svg            |   30 +
 .../Admin_Guide/Common_Content/images/note.png     |  Bin 0 -> 2086 bytes
 .../Admin_Guide/Common_Content/images/note.svg     |   28 +
 .../html/Admin_Guide/Common_Content/images/red.png |  Bin 0 -> 163 bytes
 .../Admin_Guide/Common_Content/images/shine.png    |  Bin 0 -> 146 bytes
 .../Common_Content/images/stock-go-back.png        |  Bin 0 -> 790 bytes
 .../Common_Content/images/stock-go-forward.png     |  Bin 0 -> 860 bytes
 .../Common_Content/images/stock-go-up.png          |  Bin 0 -> 753 bytes
 .../Common_Content/images/stock-home.png           |  Bin 0 -> 819 bytes
 .../Common_Content/images/title_logo.png           |  Bin 0 -> 7876 bytes
 .../Common_Content/images/title_logo.svg           |  335 +
 .../Admin_Guide/Common_Content/images/warning.png  |  Bin 0 -> 1941 bytes
 .../Admin_Guide/Common_Content/images/warning.svg  |  130 +
 .../Common_Content/images/watermark-draft.png      |  Bin 0 -> 25365 bytes
 .../Admin_Guide/Common_Content/images/yellow.png   |  Bin 0 -> 175 bytes
 .../LDAPserver-for-user-authentication.html        |  142 +
 .../html/Admin_Guide/about-clusters.html           |   22 +
 .../html/Admin_Guide/about-hosts.html              |   38 +
 .../html/Admin_Guide/about-physical-networks.html  |  100 +
 .../html/Admin_Guide/about-pods.html               |   18 +
 .../html/Admin_Guide/about-primary-storage.html    |   22 +
 .../html/Admin_Guide/about-secondary-storage.html  |   22 +
 .../html/Admin_Guide/about-virtual-networks.html   |   34 +
 .../html/Admin_Guide/about-working-with-vms.html   |   28 +
 .../html/Admin_Guide/about-zones.html              |   38 +
 .../html/Admin_Guide/accept-membership-invite.html |   24 +
 .../html/Admin_Guide/accessing-vms.html            |   28 +
 .../html/Admin_Guide/accounts-users-domains.html   |   28 +
 .../html/Admin_Guide/accounts.html                 |   10 +
 .../html/Admin_Guide/acquire-new-ip-address.html   |   22 +
 .../html/Admin_Guide/add-members-to-projects.html  |   52 +
 .../add-password-management-to-templates.html      |   38 +
 .../html/Admin_Guide/adding-hosts.html             |   12 +
 .../html/Admin_Guide/admin-alerts.html             |   22 +
 ...vanced-zone-physical-network-configuration.html |   40 +
 .../4.0.0-incubating/html/Admin_Guide/alerts.html  |   12 +
 .../html/Admin_Guide/allocators.html               |   12 +
 .../html/Admin_Guide/api-calls.html                |    3 +
 .../html/Admin_Guide/api-changes-4.0.html          |  732 +++
 .../html/Admin_Guide/api-overview.html             |   18 +
 .../html/Admin_Guide/api-reference.html            |   11 +
 .../appe-cloudstack-Revision_History.html          |   16 +
 .../html/Admin_Guide/asynchronous-commands.html    |  106 +
 .../html/Admin_Guide/aws-ec2-configuration.html    |   25 +
 .../html/Admin_Guide/aws-ec2-introduction.html     |   15 +
 .../html/Admin_Guide/aws-ec2-requirements.html     |    7 +
 .../Admin_Guide/aws-ec2-supported-commands.html    |  299 +
 .../html/Admin_Guide/aws-ec2-timeouts.html         |   21 +
 .../html/Admin_Guide/aws-ec2-user-setup.html       |   45 +
 .../Admin_Guide/aws-interface-compatibility.html   |    3 +
 .../basic-zone-physical-network-configuration.html |   12 +
 .../html/Admin_Guide/best-practices-templates.html |   12 +
 .../html/Admin_Guide/best-practices-vm.html        |   12 +
 .../html/Admin_Guide/change-database-config.html   |   12 +
 .../html/Admin_Guide/change-host-password.html     |   24 +
 .../changing-service-offering-for-vm.html          |   30 +
 .../Admin_Guide/changing-vm-name-os-group.html     |   38 +
 .../choosing-a-deployment_architecture.html        |    5 +
 .../Admin_Guide/citrix-xenserver-installation.html |  414 ++
 .../Admin_Guide/cloud-infrastructure-concepts.html |   10 +
 .../html/Admin_Guide/cluster-add.html              |   68 +
 .../compute-disk-service-offerings.html            |  104 +
 .../html/Admin_Guide/concepts.html                 |   10 +
 .../Admin_Guide/configure-package-repository.html  |   36 +
 .../html/Admin_Guide/configure-usage-server.html   |  130 +
 .../html/Admin_Guide/configure-vpc.html            |  526 ++
 .../configure-xenserver-dom0-memory.html           |   12 +
 .../html/Admin_Guide/configuring-projects.html     |  191 +
 .../html/Admin_Guide/console-proxy.html            |   26 +
 .../Admin_Guide/convert-hyperv-vm-to-template.html |   68 +
 .../html/Admin_Guide/create-new-projects.html      |   26 +
 .../create-template-from-existing-vm.html          |   40 +
 .../Admin_Guide/create-template-from-snapshot.html |   12 +
 .../Admin_Guide/create-templates-overview.html     |   22 +
 .../html/Admin_Guide/create-windows-template.html  |  124 +
 .../html/Admin_Guide/creating-vms.html             |   44 +
 .../html/Admin_Guide/customizing-dns.html          |   32 +
 .../html/Admin_Guide/dates-in-usage-record.html    |   11 +
 .../default-account-resource-limit.html            |   23 +
 .../html/Admin_Guide/default-template.html         |   42 +
 .../html/Admin_Guide/delete-templates.html         |   14 +
 .../html/Admin_Guide/deleting-vms.html             |   24 +
 .../deployment-architecture-overview.html          |   64 +
 .../html/Admin_Guide/developer-introduction.html   |    3 +
 .../disable-enable-zones-pods-clusters.html        |   35 +
 .../html/Admin_Guide/dns-dhcp.html                 |   12 +
 .../Admin_Guide/enabling-api-call-expiration.html  |   15 +
 .../html/Admin_Guide/event-types.html              |  453 ++
 .../4.0.0-incubating/html/Admin_Guide/events.html  |   54 +
 .../example-response-from-listUsageRecords.html    |   29 +
 .../html/Admin_Guide/export-template.html          |   12 +
 .../external-firewalls-and-load-balancers.html     |   12 +
 .../html/Admin_Guide/feature-overview.html         |   38 +
 .../html/Admin_Guide/getting-started.html          |   15 +
 .../html/Admin_Guide/global-config.html            |   26 +
 .../Admin_Guide/globally-configured-limit.html     |  120 +
 .../html/Admin_Guide/guest-ip-ranges.html          |   12 +
 .../html/Admin_Guide/guest-traffic.html            |   20 +
 .../html/Admin_Guide/ha-enabled-vm.html            |   14 +
 .../html/Admin_Guide/ha-for-hosts.html             |   14 +
 .../html/Admin_Guide/ha-management-server.html     |   16 +
 .../html/Admin_Guide/host-add.html                 |   82 +
 .../html/Admin_Guide/host-allocation.html          |   18 +
 .../html/Admin_Guide/hypervisor-installation.html  |    3 +
 .../Admin_Guide/hypervisor-kvm-install-flow.html   |  273 +
 .../html/Admin_Guide/images/1000-foot-view.png     |  Bin 0 -> 222230 bytes
 .../html/Admin_Guide/images/add-cluster.png        |  Bin 0 -> 46302 bytes
 .../html/Admin_Guide/images/add-gateway.png        |  Bin 0 -> 16360 bytes
 .../html/Admin_Guide/images/add-guest-network.png  |  Bin 0 -> 20547 bytes
 .../Admin_Guide/images/add-new-gateway-vpc.png     |  Bin 0 -> 23184 bytes
 .../html/Admin_Guide/images/add-tier.png           |  Bin 0 -> 14891 bytes
 .../html/Admin_Guide/images/add-vpc.png            |  Bin 0 -> 16597 bytes
 .../images/add-vpn-customer-gateway.png            |  Bin 0 -> 29851 bytes
 .../html/Admin_Guide/images/attach-disk-icon.png   |  Bin 0 -> 1092 bytes
 .../html/Admin_Guide/images/autoscale-config.png   |  Bin 0 -> 39379 bytes
 .../html/Admin_Guide/images/basic-deployment.png   |  Bin 0 -> 5892 bytes
 .../Admin_Guide/images/change-admin-password.png   |  Bin 0 -> 141860 bytes
 .../html/Admin_Guide/images/change-password.png    |  Bin 0 -> 891 bytes
 .../Admin_Guide/images/change-service-icon.png     |  Bin 0 -> 769 bytes
 .../html/Admin_Guide/images/cluster-overview.png   |  Bin 0 -> 6973 bytes
 .../html/Admin_Guide/images/console-icon.png       |  Bin 0 -> 953 bytes
 .../Admin_Guide/images/create-vpn-connection.png   |  Bin 0 -> 13613 bytes
 .../html/Admin_Guide/images/delete-button.png      |  Bin 0 -> 735 bytes
 .../html/Admin_Guide/images/destroy-instance.png   |  Bin 0 -> 815 bytes
 .../html/Admin_Guide/images/detach-disk-icon.png   |  Bin 0 -> 953 bytes
 .../html/Admin_Guide/images/edit-icon.png          |  Bin 0 -> 940 bytes
 .../images/enable-disable-autoscale.png            |  Bin 0 -> 913 bytes
 .../html/Admin_Guide/images/enable-disable.png     |  Bin 0 -> 982 bytes
 .../Admin_Guide/images/guest-traffic-setup.png     |  Bin 0 -> 34022 bytes
 .../html/Admin_Guide/images/http-access.png        |  Bin 0 -> 10214 bytes
 .../html/Admin_Guide/images/icon.svg               |   37 +
 .../Admin_Guide/images/infrastructure-overview.png |  Bin 0 -> 11852 bytes
 .../Admin_Guide/images/installation-complete.png   |  Bin 0 -> 20814 bytes
 .../html/Admin_Guide/images/iso-icon.png           |  Bin 0 -> 991 bytes
 .../images/large-scale-redundant-setup.png         |  Bin 0 -> 109117 bytes
 .../html/Admin_Guide/images/migrate-instance.png   |  Bin 0 -> 837 bytes
 .../images/multi-node-management-server.png        |  Bin 0 -> 26912 bytes
 .../Admin_Guide/images/multi-site-deployment.png   |  Bin 0 -> 68190 bytes
 .../html/Admin_Guide/images/multi-tier-app.png     |  Bin 0 -> 200956 bytes
 .../html/Admin_Guide/images/network-acl.png        |  Bin 0 -> 23333 bytes
 .../html/Admin_Guide/images/network-setup-zone.png |  Bin 0 -> 67410 bytes
 .../html/Admin_Guide/images/network-singlepod.png  |  Bin 0 -> 18381 bytes
 .../Admin_Guide/images/networking-in-a-pod.png     |  Bin 0 -> 16365 bytes
 .../Admin_Guide/images/networking-in-a-zone.png    |  Bin 0 -> 88746 bytes
 .../images/nic-bonding-and-multipath-io.png        |  Bin 0 -> 42030 bytes
 .../html/Admin_Guide/images/pod-overview.png       |  Bin 0 -> 6036 bytes
 .../Admin_Guide/images/provisioning-overview.png   |  Bin 0 -> 23622 bytes
 .../html/Admin_Guide/images/release-ip-icon.png    |  Bin 0 -> 815 bytes
 .../html/Admin_Guide/images/remove-tier.png        |  Bin 0 -> 7457 bytes
 .../html/Admin_Guide/images/remove-vpc.png         |  Bin 0 -> 815 bytes
 .../html/Admin_Guide/images/remove-vpn.png         |  Bin 0 -> 735 bytes
 .../html/Admin_Guide/images/reset-vpn.png          |  Bin 0 -> 860 bytes
 .../html/Admin_Guide/images/restart-vpc.png        |  Bin 0 -> 860 bytes
 .../html/Admin_Guide/images/search-button.png      |  Bin 0 -> 1012 bytes
 .../Admin_Guide/images/select-vm-staticnat-vpc.png |  Bin 0 -> 17472 bytes
 .../images/separate-storage-network.png            |  Bin 0 -> 44556 bytes
 .../Admin_Guide/images/small-scale-deployment.png  |  Bin 0 -> 50772 bytes
 .../html/Admin_Guide/images/software-license.png   |  Bin 0 -> 124257 bytes
 .../html/Admin_Guide/images/stop-instance-icon.png |  Bin 0 -> 955 bytes
 .../html/Admin_Guide/images/suspend-icon.png       |  Bin 0 -> 982 bytes
 .../html/Admin_Guide/images/sysmanager.png         |  Bin 0 -> 114821 bytes
 .../html/Admin_Guide/images/vm-lifecycle.png       |  Bin 0 -> 20783 bytes
 .../Admin_Guide/images/vmware-increase-ports.png   |  Bin 0 -> 66143 bytes
 .../Admin_Guide/images/vmware-iscsi-datastore.png  |  Bin 0 -> 54352 bytes
 .../Admin_Guide/images/vmware-iscsi-general.png    |  Bin 0 -> 15723 bytes
 .../images/vmware-iscsi-initiator-properties.png   |  Bin 0 -> 45592 bytes
 .../Admin_Guide/images/vmware-iscsi-initiator.png  |  Bin 0 -> 105201 bytes
 .../Admin_Guide/images/vmware-iscsi-target-add.png |  Bin 0 -> 18509 bytes
 .../images/vmware-mgt-network-properties.png       |  Bin 0 -> 42767 bytes
 .../images/vmware-nexus-add-cluster.png            |  Bin 0 -> 37083 bytes
 .../images/vmware-nexus-port-profile.png           |  Bin 0 -> 118083 bytes
 .../Admin_Guide/images/vmware-physical-network.png |  Bin 0 -> 136848 bytes
 .../images/vmware-vswitch-properties.png           |  Bin 0 -> 32376 bytes
 .../html/Admin_Guide/images/vpc-setting.png        |  Bin 0 -> 5636 bytes
 .../html/Admin_Guide/images/vpn-icon.png           |  Bin 0 -> 1012 bytes
 .../html/Admin_Guide/images/vsphere-client.png     |  Bin 0 -> 81246 bytes
 .../html/Admin_Guide/images/zone-overview.png      |  Bin 0 -> 11852 bytes
 .../html/Admin_Guide/import-ami.html               |  104 +
 .../increase-management-server-max-memory.html     |   22 +
 .../4.0.0-incubating/html/Admin_Guide/index.html   |   25 +
 .../html/Admin_Guide/initialize-and-test.html      |   40 +
 .../Admin_Guide/installation-steps-overview.html   |   35 +
 .../html/Admin_Guide/installation.html             |    3 +
 .../html/Admin_Guide/inter-vlan-routing.html       |   46 +
 .../Admin_Guide/ip-forwarding-firewalling.html     |   16 +
 .../html/Admin_Guide/ip-load-balancing.html        |   20 +
 .../Admin_Guide/large_scale_redundant_setup.html   |   19 +
 .../html/Admin_Guide/load-balancer-rules.html      |   14 +
 .../4.0.0-incubating/html/Admin_Guide/log-in.html  |   69 +
 .../Admin_Guide/maintain-hypervisors-on-hosts.html |   16 +
 .../html/Admin_Guide/making-api-request.html       |   35 +
 .../html/Admin_Guide/manage-cloud.html             |   10 +
 .../management-server-install-flow.html            |  329 +
 .../html/Admin_Guide/manual-live-migration.html    |   38 +
 .../Admin_Guide/minimum-system-requirements.html   |   53 +
 .../Admin_Guide/multi_node_management_server.html  |   13 +
 .../html/Admin_Guide/multi_site_deployment.html    |   17 +
 .../Admin_Guide/multiple-system-vm-vmware.html     |   12 +
 .../html/Admin_Guide/network-offerings.html        |   44 +
 .../Admin_Guide/network-service-providers.html     |   20 +
 .../html/Admin_Guide/networking-in-a-pod.html      |   22 +
 .../html/Admin_Guide/networking-in-a-zone.html     |   16 +
 .../Admin_Guide/networks-for-users-overview.html   |   22 +
 .../html/Admin_Guide/networks.html                 |   12 +
 .../html/Admin_Guide/offerings-and-templates.html  |   22 +
 .../html/Admin_Guide/offerings.html                |   12 +
 .../html/Admin_Guide/ovm-install.html              |    7 +
 .../html/Admin_Guide/per-domain-limits.html        |   23 +
 .../html/Admin_Guide/performance-monitoring.html   |   12 +
 .../4.0.0-incubating/html/Admin_Guide/pod-add.html |   32 +
 .../html/Admin_Guide/primary-storage-add.html      |   70 +
 .../primary-storage-outage-and-data-loss.html      |   12 +
 .../html/Admin_Guide/primary-storage.html          |   12 +
 .../html/Admin_Guide/private-public-template.html  |   16 +
 .../html/Admin_Guide/projects-overview.html        |   18 +
 .../html/Admin_Guide/projects.html                 |   10 +
 .../html/Admin_Guide/provisioning-auth-api.html    |   14 +
 .../Admin_Guide/provisioning-steps-overview.html   |   32 +
 .../html/Admin_Guide/provisioning-steps.html       |   12 +
 .../html/Admin_Guide/re-install-hosts.html         |   12 +
 .../html/Admin_Guide/release-ip-address.html       |   24 +
 .../html/Admin_Guide/removing-hosts.html           |   26 +
 .../html/Admin_Guide/requirements-templates.html   |   14 +
 .../html/Admin_Guide/responses.html                |   49 +
 .../4.0.0-incubating/html/Admin_Guide/roles.html   |   11 +
 ...heduled-maintenance-maintenance-mode-hosts.html |   12 +
 .../html/Admin_Guide/secondary-storage-add.html    |   32 +
 .../secondary-storage-outage-and-data-loss.html    |   14 +
 .../html/Admin_Guide/secondary-storage-vm.html     |   18 +
 .../html/Admin_Guide/secondary-storage.html        |   12 +
 .../html/Admin_Guide/sect-source-builddebs.html    |   54 +
 .../html/Admin_Guide/sect-source-buildrpm.html     |   35 +
 .../html/Admin_Guide/sect-source-extract.html      |   11 +
 .../Admin_Guide/sect-source-gettingrelease.html    |   15 +
 .../html/Admin_Guide/sect-source-prereq.html       |   17 +
 .../html/Admin_Guide/sect-source-verify.html       |   29 +
 .../html/Admin_Guide/sect-source.html              |    9 +
 .../html/Admin_Guide/security-groups.html          |   81 +
 .../html/Admin_Guide/separate_storage_network.html |    5 +
 .../Admin_Guide/set-database-buffer-pool-size.html |   20 +
 .../set-monitor-total-vm-limits-per-host.html      |   12 +
 .../html/Admin_Guide/set-up-network-for-users.html |   10 +
 .../html/Admin_Guide/set-usage-limit.html          |   22 +
 .../html/Admin_Guide/signing-api-requests.html     |   35 +
 .../html/Admin_Guide/small_scale_deployment.html   |   13 +
 .../html/Admin_Guide/static-nat.html               |   12 +
 .../stop-restart-management-server.html            |   20 +
 .../Admin_Guide/stopping-and-starting-vms.html     |   12 +
 .../html/Admin_Guide/storage-overview.html         |   14 +
 .../4.0.0-incubating/html/Admin_Guide/storage.html |   10 +
 .../html/Admin_Guide/submitting-feedback.html      |   11 +
 .../html/Admin_Guide/suspend-project.html          |   32 +
 .../html/Admin_Guide/sys-reliability-and-ha.html   |   10 +
 .../html/Admin_Guide/system-service-offerings.html |   14 +
 .../html/Admin_Guide/system-vm-template.html       |   26 +
 .../html/Admin_Guide/tagging-resources.html        |   55 +
 .../html/Admin_Guide/time-zones.html               |  251 +
 ...oting-dataloss-on-exported-primary-storage.html |   20 +
 .../troubleshooting-lb-rules-fails.html            |   16 +
 ...ng-maintenance-mode-not-working-on-vCenter.html |   18 +
 ...roubleshooting-recover-lost-virtual-router.html |   26 +
 .../troubleshooting-unable-to-deploy-vms.html      |   16 +
 .../troubleshooting-unable-to-power-on-vm.html     |   24 +
 .../troubleshooting-working-with-server-logs.html  |   26 +
 .../html/Admin_Guide/troubleshooting.html          |   10 +
 .../4.0.0-incubating/html/Admin_Guide/tuning.html  |   12 +
 .../4.0.0-incubating/html/Admin_Guide/ui.html      |   10 +
 .../html/Admin_Guide/upgrade-instructions.html     |  697 ++
 .../html/Admin_Guide/upload-template.html          |   48 +
 .../html/Admin_Guide/usage-record-format.html      |  211 +
 .../html/Admin_Guide/usage-types.html              |  161 +
 .../html/Admin_Guide/use-project-view.html         |   22 +
 .../html/Admin_Guide/user-data-and-meta-data.html  |   34 +
 .../html/Admin_Guide/user-services-overview.html   |   12 +
 .../Admin_Guide/using-multiple-guest-networks.html |   58 +
 .../html/Admin_Guide/using-sshkeys.html            |   81 +
 .../html/Admin_Guide/version-4.0.html              | 1788 ++++++
 .../html/Admin_Guide/virtual-machines.html         |   10 +
 .../html/Admin_Guide/virtual-router.html           |   14 +
 .../html/Admin_Guide/vlan-provisioning.html        |   16 +
 .../html/Admin_Guide/vm-lifecycle.html             |   28 +
 .../html/Admin_Guide/vmware-install.html           |  370 ++
 .../4.0.0-incubating/html/Admin_Guide/vpn.html     |  302 +
 .../4.0.0-incubating/html/Admin_Guide/whatis.html  |   18 +
 .../html/Admin_Guide/whats-new-in-api-3.0.html     |  628 ++
 .../html/Admin_Guide/whats-new-in-api-4.0.html     |  538 ++
 .../html/Admin_Guide/whats-new.html                |    5 +
 .../Admin_Guide/who-should-read-installation.html  |    5 +
 .../html/Admin_Guide/work-with-usage.html          |   16 +
 .../html/Admin_Guide/working-with-hosts.html       |   10 +
 .../html/Admin_Guide/working-with-iso.html         |  132 +
 .../html/Admin_Guide/working-with-snapshots.html   |   20 +
 .../html/Admin_Guide/working-with-system-vm.html   |   12 +
 .../html/Admin_Guide/working-with-templates.html   |   16 +
 .../html/Admin_Guide/working-with-usage-data.html  |    9 +
 .../html/Admin_Guide/working-with-volumes.html     |   16 +
 .../html/Admin_Guide/zone-add.html                 |  386 ++
 ...4.0.0-incubating-API_Developers_Guide-en-US.pdf |  Bin 0 -> 463686 bytes
 ...oudStack-4.0.0-incubating-Admin_Guide-en-US.pdf |  Bin 0 -> 1902791 bytes
 ...k-4.0.0-incubating-Installation_Guide-en-US.pdf |  Bin 0 -> 2244746 bytes
 ...dStack-4.0.0-incubating-release-notes-en-US.pdf |  Bin 0 -> 274508 bytes
 .../pdf/Apache_CloudStack-3.0.2-Runbook-en-US.pdf  |  Bin 0 -> 205561 bytes
 docs/runbook/tmp/en-US/xml/Author_Group.xml        |   29 +
 docs/runbook/tmp/en-US/xml/Book_Info.xml           |   47 +
 docs/runbook/tmp/en-US/xml/Chapter.xml             |   55 +
 .../tmp/en-US/xml/Common_Content/Conventions.xml   |  178 +
 .../tmp/en-US/xml/Common_Content/Feedback.xml      |   22 +
 .../tmp/en-US/xml/Common_Content/Legal_Notice.xml  |   23 +
 .../tmp/en-US/xml/Common_Content/css/common.css    | 1528 +++++
 .../tmp/en-US/xml/Common_Content/css/default.css   |    3 +
 .../tmp/en-US/xml/Common_Content/css/lang.css      |    2 +
 .../tmp/en-US/xml/Common_Content/css/overrides.css |   57 +
 .../tmp/en-US/xml/Common_Content/css/print.css     |   16 +
 .../tmp/en-US/xml/Common_Content/images/1.png      |  Bin 0 -> 721 bytes
 .../tmp/en-US/xml/Common_Content/images/1.svg      |   27 +
 .../tmp/en-US/xml/Common_Content/images/10.png     |  Bin 0 -> 1020 bytes
 .../tmp/en-US/xml/Common_Content/images/10.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/11.png     |  Bin 0 -> 815 bytes
 .../tmp/en-US/xml/Common_Content/images/11.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/12.png     |  Bin 0 -> 1018 bytes
 .../tmp/en-US/xml/Common_Content/images/12.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/13.png     |  Bin 0 -> 1061 bytes
 .../tmp/en-US/xml/Common_Content/images/13.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/14.png     |  Bin 0 -> 926 bytes
 .../tmp/en-US/xml/Common_Content/images/14.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/15.png     |  Bin 0 -> 1003 bytes
 .../tmp/en-US/xml/Common_Content/images/15.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/16.png     |  Bin 0 -> 1062 bytes
 .../tmp/en-US/xml/Common_Content/images/16.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/17.png     |  Bin 0 -> 903 bytes
 .../tmp/en-US/xml/Common_Content/images/17.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/18.png     |  Bin 0 -> 1095 bytes
 .../tmp/en-US/xml/Common_Content/images/18.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/19.png     |  Bin 0 -> 1064 bytes
 .../tmp/en-US/xml/Common_Content/images/19.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/2.png      |  Bin 0 -> 911 bytes
 .../tmp/en-US/xml/Common_Content/images/2.svg      |   27 +
 .../tmp/en-US/xml/Common_Content/images/20.png     |  Bin 0 -> 1171 bytes
 .../tmp/en-US/xml/Common_Content/images/20.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/21.png     |  Bin 0 -> 999 bytes
 .../tmp/en-US/xml/Common_Content/images/21.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/22.png     |  Bin 0 -> 1142 bytes
 .../tmp/en-US/xml/Common_Content/images/22.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/23.png     |  Bin 0 -> 1212 bytes
 .../tmp/en-US/xml/Common_Content/images/23.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/24.png     |  Bin 0 -> 1083 bytes
 .../tmp/en-US/xml/Common_Content/images/24.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/25.png     |  Bin 0 -> 1182 bytes
 .../tmp/en-US/xml/Common_Content/images/25.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/26.png     |  Bin 0 -> 1215 bytes
 .../tmp/en-US/xml/Common_Content/images/26.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/27.png     |  Bin 0 -> 1086 bytes
 .../tmp/en-US/xml/Common_Content/images/27.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/28.png     |  Bin 0 -> 1251 bytes
 .../tmp/en-US/xml/Common_Content/images/28.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/29.png     |  Bin 0 -> 1212 bytes
 .../tmp/en-US/xml/Common_Content/images/29.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/3.png      |  Bin 0 -> 968 bytes
 .../tmp/en-US/xml/Common_Content/images/3.svg      |   27 +
 .../tmp/en-US/xml/Common_Content/images/30.png     |  Bin 0 -> 1267 bytes
 .../tmp/en-US/xml/Common_Content/images/30.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/31.png     |  Bin 0 -> 1083 bytes
 .../tmp/en-US/xml/Common_Content/images/31.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/32.png     |  Bin 0 -> 1244 bytes
 .../tmp/en-US/xml/Common_Content/images/32.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/33.png     |  Bin 0 -> 1279 bytes
 .../tmp/en-US/xml/Common_Content/images/33.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/34.png     |  Bin 0 -> 1178 bytes
 .../tmp/en-US/xml/Common_Content/images/34.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/35.png     |  Bin 0 -> 1235 bytes
 .../tmp/en-US/xml/Common_Content/images/35.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/36.png     |  Bin 0 -> 1286 bytes
 .../tmp/en-US/xml/Common_Content/images/36.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/37.png     |  Bin 0 -> 1155 bytes
 .../tmp/en-US/xml/Common_Content/images/37.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/38.png     |  Bin 0 -> 1325 bytes
 .../tmp/en-US/xml/Common_Content/images/38.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/39.png     |  Bin 0 -> 1300 bytes
 .../tmp/en-US/xml/Common_Content/images/39.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/4.png      |  Bin 0 -> 838 bytes
 .../tmp/en-US/xml/Common_Content/images/4.svg      |   27 +
 .../tmp/en-US/xml/Common_Content/images/40.png     |  Bin 0 -> 1145 bytes
 .../tmp/en-US/xml/Common_Content/images/40.svg     |   31 +
 .../tmp/en-US/xml/Common_Content/images/5.png      |  Bin 0 -> 916 bytes
 .../tmp/en-US/xml/Common_Content/images/5.svg      |   27 +
 .../tmp/en-US/xml/Common_Content/images/6.png      |  Bin 0 -> 939 bytes
 .../tmp/en-US/xml/Common_Content/images/6.svg      |   27 +
 .../tmp/en-US/xml/Common_Content/images/7.png      |  Bin 0 -> 819 bytes
 .../tmp/en-US/xml/Common_Content/images/7.svg      |   27 +
 .../tmp/en-US/xml/Common_Content/images/8.png      |  Bin 0 -> 993 bytes
 .../tmp/en-US/xml/Common_Content/images/8.svg      |   27 +
 .../tmp/en-US/xml/Common_Content/images/9.png      |  Bin 0 -> 941 bytes
 .../tmp/en-US/xml/Common_Content/images/9.svg      |   27 +
 .../tmp/en-US/xml/Common_Content/images/dot.png    |  Bin 0 -> 173 bytes
 .../tmp/en-US/xml/Common_Content/images/dot2.png   |  Bin 0 -> 128 bytes
 .../tmp/en-US/xml/Common_Content/images/green.png  |  Bin 0 -> 176 bytes
 .../tmp/en-US/xml/Common_Content/images/h1-bg.png  |  Bin 0 -> 565 bytes
 .../en-US/xml/Common_Content/images/image_left.png |  Bin 0 -> 4284 bytes
 .../xml/Common_Content/images/image_right.png      |  Bin 0 -> 2489 bytes
 .../en-US/xml/Common_Content/images/important.png  |  Bin 0 -> 2318 bytes
 .../en-US/xml/Common_Content/images/important.svg  |   30 +
 .../tmp/en-US/xml/Common_Content/images/note.png   |  Bin 0 -> 2086 bytes
 .../tmp/en-US/xml/Common_Content/images/note.svg   |   28 +
 .../tmp/en-US/xml/Common_Content/images/red.png    |  Bin 0 -> 163 bytes
 .../tmp/en-US/xml/Common_Content/images/shine.png  |  Bin 0 -> 146 bytes
 .../xml/Common_Content/images/stock-go-back.png    |  Bin 0 -> 790 bytes
 .../xml/Common_Content/images/stock-go-forward.png |  Bin 0 -> 860 bytes
 .../xml/Common_Content/images/stock-go-up.png      |  Bin 0 -> 753 bytes
 .../en-US/xml/Common_Content/images/stock-home.png |  Bin 0 -> 819 bytes
 .../en-US/xml/Common_Content/images/title_logo.png |  Bin 0 -> 7876 bytes
 .../en-US/xml/Common_Content/images/title_logo.svg |  335 +
 .../en-US/xml/Common_Content/images/warning.png    |  Bin 0 -> 1941 bytes
 .../en-US/xml/Common_Content/images/warning.svg    |  130 +
 .../xml/Common_Content/images/watermark-draft.png  |  Bin 0 -> 25365 bytes
 .../tmp/en-US/xml/Common_Content/images/yellow.png |  Bin 0 -> 175 bytes
 docs/runbook/tmp/en-US/xml/Environment.xml         |  248 +
 docs/runbook/tmp/en-US/xml/Management.xml          |  125 +
 docs/runbook/tmp/en-US/xml/Overview.xml            |   87 +
 docs/runbook/tmp/en-US/xml/Preface.xml             |   29 +
 docs/runbook/tmp/en-US/xml/Revision_History.xml    |   43 +
 docs/runbook/tmp/en-US/xml/Runbook.ent             |   22 +
 docs/runbook/tmp/en-US/xml/Runbook.fo              |  416 ++
 docs/runbook/tmp/en-US/xml/Runbook.xml             |   33 +
 docs/runbook/tmp/en-US/xml/config.xml              |  249 +
 docs/runbook/tmp/en-US/xml/kvm.xml                 |   97 +
 docs/runbook/tmp/en-US/xml_tmp/Author_Group.xml    |   32 +
 docs/runbook/tmp/en-US/xml_tmp/Book_Info.xml       |   52 +
 docs/runbook/tmp/en-US/xml_tmp/Chapter.xml         |   53 +
 docs/runbook/tmp/en-US/xml_tmp/Environment.xml     |  235 +
 docs/runbook/tmp/en-US/xml_tmp/Management.xml      |  127 +
 docs/runbook/tmp/en-US/xml_tmp/Overview.xml        |  100 +
 docs/runbook/tmp/en-US/xml_tmp/Preface.xml         |   33 +
 .../runbook/tmp/en-US/xml_tmp/Revision_History.xml |   42 +
 docs/runbook/tmp/en-US/xml_tmp/Runbook.ent         |   22 +
 docs/runbook/tmp/en-US/xml_tmp/Runbook.xml         |   37 +
 docs/runbook/tmp/en-US/xml_tmp/config.xml          |  177 +
 docs/runbook/tmp/en-US/xml_tmp/kvm.xml             |  103 +
 packaging/centos63/cloud.spec                      |    2 +-
 packaging/debian/replace.properties                |   62 +
 patches/pom.xml                                    |   63 +-
 .../debian/config/etc/init.d/cloud-early-config    |    4 +-
 .../hypervisor/kvm/resource/BridgeVifDriver.java   |    4 +-
 pom.xml                                            |    7 -
 .../cloud/api/response/ApiResponseSerializer.java  |   25 +-
 .../src/com/cloud/network/NetworkManagerImpl.java  |   11 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |    2 +-
 .../src/com/cloud/storage/dao/VolumeHostDao.java   |    1 -
 .../com/cloud/storage/dao/VolumeHostDaoImpl.java   |    2 -
 server/src/com/cloud/user/AccountManagerImpl.java  |    4 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |    9 +-
 test/integration/smoke/test_disk_offerings.py      |    2 +
 test/integration/smoke/test_hosts.py               |    2 +
 test/integration/smoke/test_iso.py                 |    1 +
 test/integration/smoke/test_network.py             |    1 +
 test/integration/smoke/test_primary_storage.py     |    1 +
 test/integration/smoke/test_routers.py             |    1 +
 test/integration/smoke/test_secondary_storage.py   |    1 +
 test/integration/smoke/test_service_offerings.py   |    1 +
 test/integration/smoke/test_ssvm.py                |    1 +
 test/integration/smoke/test_templates.py           |    1 +
 test/integration/smoke/test_vm_life_cycle.py       |    1 +
 test/integration/smoke/test_volumes.py             |    1 +
 tools/apidoc/pom.xml                               |    2 +-
 tools/cli/cloudmonkey/__init__.py                  |    7 +-
 tools/cli/cloudmonkey/cloudmonkey.py               |  167 +-
 tools/cli/cloudmonkey/version.py                   |   22 +
 tools/cli/pom.xml                                  |   18 +
 tools/cli/setup.py                                 |   15 +-
 tools/git/prepare-commit-msg                       |    4 +-
 tools/marvin/marvin/TestCaseExecuteEngine.py       |    2 +-
 tools/marvin/marvin/settings.py                    |   28 +
 tools/marvin/setup.py                              |    2 +-
 ui/css/cloudstack3.css                             |   88 +-
 ui/dictionary.jsp                                  |    1 +
 ui/index.jsp                                       |   36 +-
 ui/scripts/configuration.js                        |   63 +-
 ui/scripts/network.js                              |   10 +-
 ui/scripts/system.js                               |   31 +-
 ui/scripts/ui-custom/zoneWizard.js                 |   12 +
 ui/scripts/ui/dialog.js                            |    3 +-
 ui/scripts/ui/widgets/detailView.js                |    5 +-
 ui/scripts/ui/widgets/listView.js                  |   13 +-
 ui/scripts/ui/widgets/toolTip.js                   |    9 +-
 ui/scripts/vpc.js                                  |   15 +-
 ui/scripts/zoneWizard.js                           |   84 +-
 utils/src/com/cloud/utils/db/Transaction.java      |   28 +-
 806 files changed, 34109 insertions(+), 771 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/82f02bac/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/82f02bac/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/82f02bac/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/82f02bac/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------