Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 19442200BE2 for ; Thu, 15 Dec 2016 07:40:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 17F99160B2D; Thu, 15 Dec 2016 06:40:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8F18D160B10 for ; Thu, 15 Dec 2016 07:40:36 +0100 (CET) Received: (qmail 12736 invoked by uid 500); 15 Dec 2016 06:40:35 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 12718 invoked by uid 99); 15 Dec 2016 06:40:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Dec 2016 06:40:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C0F6F2DD3; Thu, 15 Dec 2016 06:40:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Thu, 15 Dec 2016 06:40:36 -0000 Message-Id: <05de7f1af9c1486f8a2b6fd61a30e520@git.apache.org> In-Reply-To: <0d92fa2423f94eb1a8d0b286bf816197@git.apache.org> References: <0d92fa2423f94eb1a8d0b286bf816197@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to f850b38 archived-at: Thu, 15 Dec 2016 06:40:37 -0000 Merge pull request #1831 from shapeblue/fix-sql-pr-1615-410 CLOUDSTACK-9671: Fix sql change to corresponding version paths- Fixes issue of failing upgrade paths - Moves schema changes from PR #1615 in the 4.9.1.0 to 4.10.0.0 sql path * pr/1831: CLOUDSTACK-9671: Fix sql change to corresponding version paths Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f850b381 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f850b381 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f850b381 Branch: refs/heads/master Commit: f850b381ad4c90700ec5063ff98e747afe9cb392 Parents: 17653a8 dd321a6 Author: Rohit Yadav Authored: Thu Dec 15 12:09:56 2016 +0530 Committer: Rohit Yadav Committed: Thu Dec 15 12:10:05 2016 +0530 ---------------------------------------------------------------------- setup/db/db/schema-481to490.sql | 4 ---- setup/db/db/schema-4910to41000.sql | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) ----------------------------------------------------------------------