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 5BCB7E562 for ; Sat, 26 Jan 2013 16:21:46 +0000 (UTC) Received: (qmail 2473 invoked by uid 500); 26 Jan 2013 16:21:45 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 2313 invoked by uid 500); 26 Jan 2013 16:21:44 -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 1301 invoked by uid 99); 26 Jan 2013 16:21:39 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2013 16:21:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D9E94825DDA; Sat, 26 Jan 2013 16:21:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [50/50] [abbrv] git commit: Merge branch 'master' into marvin-refactor-phase1 Message-Id: <20130126162138.D9E94825DDA@tyr.zones.apache.org> Date: Sat, 26 Jan 2013 16:21:38 +0000 (UTC) Updated Branches: refs/heads/marvin-refactor-phase1 f435ffb2e -> ba27f7667 Merge branch 'master' into marvin-refactor-phase1 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ba27f766 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ba27f766 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ba27f766 Branch: refs/heads/marvin-refactor-phase1 Commit: ba27f766722c60692ed5ef105c976b57131dfd44 Parents: 7d4124c 17c419c Author: Prasanna Santhanam Authored: Sat Jan 26 21:50:14 2013 +0530 Committer: Prasanna Santhanam Committed: Sat Jan 26 21:50:14 2013 +0530 ---------------------------------------------------------------------- .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +- setup/db/create-schema.sql | 1 + setup/db/db/schema-40to410.sql | 2 ++ ui/scripts/accounts.js | 8 ++++++-- ui/scripts/system.js | 7 +++++++ ui/scripts/ui-custom/instanceWizard.js | 15 +++++++++++++-- 6 files changed, 30 insertions(+), 5 deletions(-) ----------------------------------------------------------------------