Merge branch 'master' into vim51_win8
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/084b6f3e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/084b6f3e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/084b6f3e Branch: refs/heads/master Commit: 084b6f3e05a5e9bb0857077a3e4251ed4f31adee Parents: fbfc5c6 b174165 Author: Min Chen <[email protected]> Authored: Mon Feb 25 11:55:12 2013 -0800 Committer: Min Chen <[email protected]> Committed: Mon Feb 25 11:55:12 2013 -0800 ---------------------------------------------------------------------- docs/en-US/management-server-install-client.xml | 28 ++++---- docs/en-US/management-server-install-db-local.xml | 59 +++++++++++---- .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 14 ++++ 3 files changed, 72 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
