Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E66D1DB59 for ; Tue, 5 Mar 2013 02:09:50 +0000 (UTC) Received: (qmail 18347 invoked by uid 500); 5 Mar 2013 02:09:47 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 18250 invoked by uid 500); 5 Mar 2013 02:09:47 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 17704 invoked by uid 99); 5 Mar 2013 02:09:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Mar 2013 02:09:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5A207314BC7; Tue, 5 Mar 2013 02:09:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [27/40] git commit: refs/heads/master - Merge branch 'master' into vim51_win8 Message-Id: <20130305020946.5A207314BC7@tyr.zones.apache.org> Date: Tue, 5 Mar 2013 02:09:46 +0000 (UTC) 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 Authored: Mon Feb 25 11:55:12 2013 -0800 Committer: Min Chen 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(-) ----------------------------------------------------------------------