Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 61F0B189ED for ; Wed, 10 Jun 2015 20:49:44 +0000 (UTC) Received: (qmail 29605 invoked by uid 500); 10 Jun 2015 20:49:42 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 29532 invoked by uid 500); 10 Jun 2015 20:49:42 -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 29036 invoked by uid 99); 10 Jun 2015 20:49:42 -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; Wed, 10 Jun 2015 20:49:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 37CF6E04ED; Wed, 10 Jun 2015 20:49:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ekho@apache.org To: commits@cloudstack.apache.org Date: Wed, 10 Jun 2015 20:49:58 -0000 Message-Id: <70188439b33945ff82baec42ff944d93@git.apache.org> In-Reply-To: <933e594c03724bf4819ee89b11b086d4@git.apache.org> References: <933e594c03724bf4819ee89b11b086d4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/19] git commit: updated refs/heads/feature/vpc-ipv6 to c1b0900 Merge branch 'feature/vpc-ipv6' of github.com:schubergphilis/cloudstack into feature/vpc-ipv6 Rebasing with Master. - We still had a conflict in the database upgrade file 451to460 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fd186850 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fd186850 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fd186850 Branch: refs/heads/feature/vpc-ipv6 Commit: fd1868504e5de3f8d2fc115fa23e0a578b52f96e Parents: c198d44 3b91964 Author: wilderrodrigues Authored: Wed Jun 10 22:20:29 2015 +0200 Committer: wilderrodrigues Committed: Wed Jun 10 22:20:29 2015 +0200 ---------------------------------------------------------------------- ----------------------------------------------------------------------