cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [1/36] git commit: Merge branch 'master' into vpc
Date Fri, 10 Aug 2012 17:50:03 GMT
Updated Branches:
  refs/heads/vpc 83361776f -> ccac50594


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/ccac5059
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ccac5059
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ccac5059

Branch: refs/heads/vpc
Commit: ccac50594431c6b9bc141c83657f1990e6935e2a
Parents: 5c349dd a6f59e3
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri Aug 10 10:47:49 2012 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Fri Aug 10 10:47:49 2012 -0700

----------------------------------------------------------------------
 LICENSE_BIN                                        |   47 +
 NOTICE                                             |    8 +-
 NOTICE_BIN                                         |   17 +-
 awsapi/.classpath                                  |   18 +
 build/package.xml                                  |    1 +
 cloud-cli/cloudapis/cloud.py                       |   56 +-
 docs/README.txt                                    |  120 +
 docs/configs/Author_Group/Apache/Author_Group.xml  |   35 -
 .../configs/Book_Info/Main_Book_Info/Book_Info.xml |   27 -
 docs/configs/Legal_Notice/Legal_Notice.xml         |   35 -
 docs/configs/main/README.txt                       |    5 -
 docs/en-US/Book_Info.xml                           |    8 +-
 docs/en-US/Common_Content/Legal_Notice.xml         |   18 +-
 docs/en-US/about-clusters.xml                      |   39 +
 docs/en-US/about-hosts.xml                         |   45 +
 docs/en-US/about-primary-storage.xml               |   35 +
 docs/en-US/about-secondary-storage.xml             |   35 +
 docs/en-US/about-zones.xml                         |   23 +-
 docs/en-US/changing-vm-name-os-group.xml           |    2 +-
 docs/en-US/cloud-infrastructure-concepts.xml       |    7 +-
 docs/en-US/cloud-infrastructure-overview.xml       |    2 +-
 docs/en-US/cloud_infrastructure_overview.xml       |   38 -
 docs/en-US/cloudstack.xml                          |    2 -
 docs/en-US/contacting-support.xml                  |   22 -
 docs/en-US/deployment_architecture_overview.xml    |   47 -
 docs/en-US/developer-guide.xml                     |    1 -
 docs/en-US/guest-traffic.xml                       |    2 +-
 docs/en-US/images/add-gateway.png                  |  Bin 0 -> 16360 bytes
 docs/en-US/images/change-admin-password.png        |  Bin 0 -> 141860 bytes
 docs/en-US/images/cluster-overview.png             |  Bin 0 -> 6973 bytes
 docs/en-US/images/console-icon.png                 |  Bin 0 -> 953 bytes
 docs/en-US/images/delete-button.png                |  Bin 0 -> 735 bytes
 docs/en-US/images/enable-disable.png               |  Bin 0 -> 982 bytes
 docs/en-US/images/iso-icon.png                     |  Bin 0 -> 991 bytes
 docs/en-US/images/networking-in-a-pod.png          |  Bin 0 -> 16365 bytes
 docs/en-US/images/networking-in-a-zone.png         |  Bin 0 -> 88746 bytes
 docs/en-US/images/pod-overview.png                 |  Bin 0 -> 6036 bytes
 docs/en-US/images/search-button.png                |  Bin 0 -> 1012 bytes
 docs/en-US/images/software-license.png             |  Bin 0 -> 124257 bytes
 docs/en-US/images/suspend-icon.png                 |  Bin 0 -> 982 bytes
 docs/en-US/images/sysmanager.png                   |  Bin 0 -> 114821 bytes
 docs/en-US/images/vpc-setting.png                  |  Bin 0 -> 5636 bytes
 docs/en-US/images/vpn-icon.png                     |  Bin 0 -> 1012 bytes
 docs/en-US/images/zone-overview.png                |  Bin 0 -> 11852 bytes
 docs/en-US/minimum-system-requirements.xml         |   48 +-
 .../en-US/network-offering-usage-record-format.xml |   27 +-
 docs/en-US/network-offerings.xml                   |   21 +-
 docs/en-US/network-service-providers.xml           |   22 +-
 docs/en-US/network-usage-record-format.xml         |   27 +-
 docs/en-US/networking-in-a-pod.xml                 |   28 +-
 docs/en-US/networking-in-a-zone.xml                |   28 +-
 docs/en-US/networking-overview.xml                 |   24 +-
 docs/en-US/networking_overview.xml                 |   28 +-
 docs/en-US/nfs-shares-on-management-server.xml     |   32 +-
 docs/en-US/nfs-shares-on-separate-server.xml       |   26 +-
 docs/en-US/vm-lifecycle.xml                        |    4 +-
 docs/images/AddHostVMware.png                      |  Bin 11345 -> 0 bytes
 docs/images/AddNetworkDialog.png                   |  Bin 13085 -> 0 bytes
 docs/images/AddTemplate.png                        |  Bin 16767 -> 0 bytes
 docs/images/AttachVolume.png                       |  Bin 23511 -> 0 bytes
 docs/images/AttachVolumeButton.png                 |  Bin 1141 -> 0 bytes
 docs/images/ChangePassword.png                     |  Bin 780 -> 0 bytes
 docs/images/CreateTemplate.png                     |  Bin 8325 -> 0 bytes
 docs/images/DeleteButton.png                       |  Bin 935 -> 0 bytes
 docs/images/DetachVolume.png                       |  Bin 20249 -> 0 bytes
 docs/images/EditButton.png                         |  Bin 1012 -> 0 bytes
 docs/images/EnableStaticNAT.png                    |  Bin 1019 -> 0 bytes
 docs/images/MigrateVM.png                          |  Bin 75071 -> 0 bytes
 docs/images/MigrateVM_2.png                        |  Bin 6183 -> 0 bytes
 docs/images/VMConsoleButton.png                    |  Bin 816 -> 0 bytes
 docs/images/logo_cloud.jpg                         |  Bin 70880 -> 0 bytes
 docs/publican-all.cfg                              |   30 +
 docs/publican-devguide.cfg                         |   29 +
 docs/publican-install.cfg                          |   29 +
 docs/publican-installation.cfg                     |   29 +
 docs/publican-release-notes-4_0.cfg                |   27 +
 docs/publican-trial-install.cfg                    |   29 +
 docs/publican.cfg                                  |   10 -
 .../manager/allocator/impl/FirstFitAllocator.java  |   15 +-
 server/src/com/cloud/capacity/CapacityManager.java |    7 +
 .../com/cloud/capacity/CapacityManagerImpl.java    |   19 +
 server/src/com/cloud/deploy/FirstFitPlanner.java   |    2 +
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   16 +-
 .../security/SecurityGroupManagerImpl2Test.java    |   21 +-
 .../com/cloud/projects/MockProjectManagerImpl.java |  231 ++
 .../test/com/cloud/user/MockDomainManagerImpl.java |  141 ++
 setup/.classpath                                   |   18 +
 test/src/com/cloud/sample/Base64.java              | 1755 ---------------
 .../src/com/cloud/sample/UserCloudAPIExecutor.java |    3 +-
 tools/marvin/marvin/configGenerator.py             |  288 +++-
 tools/marvin/marvin/deployDataCenter.py            |  186 +-
 .../marvin/marvin/sandbox/advanced/advanced_env.py |   10 +
 tools/marvin/marvin/sandbox/basic/basic_env.py     |   11 +
 .../marvin/sandbox/demo/simulator/simulator.cfg    |   63 +-
 .../sandbox/demo/simulator/simulator_setup.py      |   18 +-
 .../demo/simulator/simulatordemo.properties        |   19 +-
 ui/scripts/system.js                               |    1 +
 utils/.classpath                                   |   18 +
 98 files changed, 1792 insertions(+), 2243 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ccac5059/ui/scripts/system.js
----------------------------------------------------------------------


Mime
View raw message