incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [1/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Date Sat, 20 Oct 2012 22:26:58 GMT
Updated Branches:
  refs/heads/master 8c4e483f7 -> 7bbdad129


Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack


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

Branch: refs/heads/master
Commit: 7bbdad1299abe5b4e62469c69f93bc7e488d84e9
Parents: ee3d045 8c4e483
Author: David Nalley <david@gnsa.us>
Authored: Sat Oct 20 18:25:58 2012 -0400
Committer: David Nalley <david@gnsa.us>
Committed: Sat Oct 20 18:25:58 2012 -0400

----------------------------------------------------------------------
 docs/en-US/Book_Info.xml                           |    2 +-
 docs/en-US/Book_Info_Release_Notes_4.0.xml         |    4 +-
 docs/en-US/CloudStack_Nicira_NVP_Guide.xml         |    2 +-
 docs/en-US/about-clusters.xml                      |    2 +-
 docs/en-US/add-more-clusters.xml                   |    2 +-
 docs/en-US/added-API-commands-4.0.xml              |    4 +-
 docs/en-US/advanced-zone-configuration.xml         |    4 +-
 docs/en-US/attaching-volume.xml                    |    3 +-
 docs/en-US/basic-zone-configuration.xml            |    2 +-
 docs/en-US/build-deb.xml                           |   91 ++++++++++++---
 docs/en-US/castor-with-cs.xml                      |    2 +-
 docs/en-US/changed-apicommands-4.0.xml             |    2 +-
 docs/en-US/cloudstack.xml                          |    4 +-
 docs/en-US/cluster-add.xml                         |    2 +-
 docs/en-US/configure-package-repository.xml        |    5 +-
 docs/en-US/create-template-from-snapshot.xml       |    2 +-
 docs/en-US/create-vpn-customer-gateway.xml         |    2 +-
 docs/en-US/creating-vms.xml                        |    2 +-
 docs/en-US/detach-move-volumes.xml                 |    2 +-
 docs/en-US/feature-overview.xml                    |    5 +-
 docs/en-US/getting-release.xml                     |    2 +-
 docs/en-US/host-add-xenserver-kvm-ovm.xml          |   20 ++--
 docs/en-US/host-add.xml                            |    2 +-
 docs/en-US/hypervisor-installation.xml             |    4 +-
 .../hypervisor-support-for-primarystorage.xml      |   11 +--
 docs/en-US/manual-live-migration.xml               |    2 +-
 docs/en-US/minimum-system-requirements.xml         |    2 +-
 docs/en-US/ovm-requirements.xml                    |    2 +-
 docs/en-US/plugin-niciranvp-features.xml           |    8 +-
 docs/en-US/plugin-niciranvp-revisions.xml          |    2 +-
 docs/en-US/release-notes.xml                       |   11 ++-
 docs/en-US/runtime-behavior-of-primary-storage.xml |    2 +-
 docs/en-US/system-reserved-ip-addresses.xml        |    9 +-
 docs/en-US/upload-existing-volume-to-vm.xml        |    4 +-
 docs/en-US/upload-template.xml                     |    4 +-
 docs/en-US/whats-new.xml                           |    2 +-
 docs/en-US/working-with-snapshots.xml              |    4 +-
 docs/en-US/working-with-volumes.xml                |    2 +-
 tools/git/prepare-commit-msg                       |   17 +++
 tools/marvin/marvin/dbConnection.py                |   63 ++++-------
 tools/marvin/setup.py                              |    4 +-
 ui/scripts/configuration.js                        |   12 ++
 42 files changed, 205 insertions(+), 128 deletions(-)
----------------------------------------------------------------------



Mime
View raw message