Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1a50e2fd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1a50e2fd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1a50e2fd Branch: refs/heads/master Commit: 1a50e2fddcb39b89adec71c6f7591a0e22764a13 Parents: 5f06500 5c4578e Author: Sebastien Goasguen <[email protected]> Authored: Sun Jun 23 23:33:45 2013 -0400 Committer: Sebastien Goasguen <[email protected]> Committed: Sun Jun 23 23:33:45 2013 -0400 ---------------------------------------------------------------------- docs/en-US/Release_Notes.xml | 9 ++--- docs/en-US/about-password-encryption.xml | 2 +- docs/en-US/citrix-xenserver-installation.xml | 5 ++- docs/en-US/database-replication.xml | 12 +++++-- .../management-server-install-db-external.xml | 2 +- .../management-server-install-db-local.xml | 4 +-- .../management-server-install-multi-node.xml | 4 +-- docs/en-US/region-add.xml | 6 ++-- patches/systemvm/debian/buildsystemvm.sh | 37 ++++++++++---------- .../debian/config/etc/init.d/cloud-early-config | 5 ++- 10 files changed, 47 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
