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 6E2EFEA6A for ; Sun, 27 Jan 2013 17:17:23 +0000 (UTC) Received: (qmail 44014 invoked by uid 500); 27 Jan 2013 17:17:21 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 43939 invoked by uid 500); 27 Jan 2013 17:17:20 -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 43574 invoked by uid 99); 27 Jan 2013 17:17:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jan 2013 17:17:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4A2768260BD; Sun, 27 Jan 2013 17:17:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [7/15] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Message-Id: <20130127171720.4A2768260BD@tyr.zones.apache.org> Date: Sun, 27 Jan 2013 17:17:20 +0000 (UTC) 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/2c9e3144 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2c9e3144 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2c9e3144 Branch: refs/heads/events-framework Commit: 2c9e314477de7cf6b263773b34a957b06a6871ef Parents: 4ccbdbd 8f11f63 Author: Min Chen Authored: Fri Jan 25 14:15:22 2013 -0800 Committer: Min Chen Committed: Fri Jan 25 14:15:22 2013 -0800 ---------------------------------------------------------------------- docs/en-US/offerings.xml | 32 +++++------ docs/en-US/sys-offering-sysvm.xml | 75 +++++++++++++++++++++++++++ ui/scripts/accounts.js | 8 ++- ui/scripts/system.js | 7 +++ ui/scripts/ui-custom/instanceWizard.js | 15 +++++- 5 files changed, 116 insertions(+), 21 deletions(-) ----------------------------------------------------------------------