You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2013/07/01 12:45:10 UTC
[2/3] git commit: updated refs/heads/4.2 to c814cfb
resolving some merge conflicts in docs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9c4719fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9c4719fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9c4719fc
Branch: refs/heads/4.2
Commit: 9c4719fca7cf04411e793470ab1f733feffb3ef0
Parents: 4143137 e600d7c
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Mon Jul 1 06:43:34 2013 -0400
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Jul 1 06:43:34 2013 -0400
----------------------------------------------------------------------
client/tomcatconf/applicationContext.xml.in | 4 +-
client/tomcatconf/componentContext.xml.in | 2 +-
client/tomcatconf/nonossComponentContext.xml.in | 19 +-
.../tomcatconf/simulatorComponentContext.xml.in | 2 +-
docs/en-US/attaching-volume.xml | 57 +-
docs/en-US/creating-new-volumes.xml | 99 ++--
docs/en-US/detach-move-volumes.xml | 58 ++-
docs/en-US/storage.xml | 15 +-
docs/en-US/vm-storage-migration.xml | 27 +-
.../volume-deletion-garbage-collection.xml | 29 +-
docs/en-US/working-with-volumes.xml | 51 +-
packaging/centos63/cloud.spec | 1 +
test/integration/component/test_accounts.py | 2 +-
.../component/test_advancedsg_networks.py | 7 +-
.../component/test_affinity_groups.py | 135 ++---
test/integration/component/test_assign_vm.py | 6 +-
.../component/test_netscaler_configs.py | 8 +-
.../component/test_shared_networks.py | 2 +-
.../component/test_vpc_network_lbrules.py | 4 +-
.../component/test_vpc_network_pfrules.py | 4 +-
.../component/test_vpc_network_staticnatrule.py | 4 +-
test/integration/component/test_vpc_routers.py | 78 ++-
...deploy_vms_with_varied_deploymentplanners.py | 48 +-
test/integration/smoke/test_network.py | 175 +++----
test/integration/smoke/test_vm_snapshots.py | 519 ++++++++++---------
tools/marvin/marvin/deployDataCenter.py | 3 +-
26 files changed, 682 insertions(+), 677 deletions(-)
----------------------------------------------------------------------