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 4F3F2186E0 for ; Mon, 8 Jun 2015 14:10:46 +0000 (UTC) Received: (qmail 92815 invoked by uid 500); 8 Jun 2015 14:10:45 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 92717 invoked by uid 500); 8 Jun 2015 14:10:45 -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 92507 invoked by uid 99); 8 Jun 2015 14:10:45 -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; Mon, 08 Jun 2015 14:10:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2A9B2DFF78; Mon, 8 Jun 2015 14:10:45 +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: Mon, 08 Jun 2015 14:10:50 -0000 Message-Id: <18011b55212c4c16b481c4d06e89d134@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/7] git commit: updated refs/heads/feature/vpc-ipv6 to 873cbdd Merge branch 'feature/vpc-ipv6' of https://github.com/schubergphilis/cloudstack into feature/vpc-ipv6 This closes #371 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/873cbddb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/873cbddb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/873cbddb Branch: refs/heads/feature/vpc-ipv6 Commit: 873cbddb9f882a9fca61500db9fc23d5ad9abe54 Parents: 6140db5 f2d24cf Author: wilderrodrigues Authored: Mon Jun 8 15:52:30 2015 +0200 Committer: wilderrodrigues Committed: Mon Jun 8 16:09:37 2015 +0200 ---------------------------------------------------------------------- api/src/com/cloud/dc/DataCenter.java | 5 +++ api/src/com/cloud/network/vpc/Vpc.java | 6 ++++ .../entity/api/db/EngineDataCenterVO.java | 30 ++++++++++++++++-- .../provisioning/test/ProvisioningTest.java | 2 +- .../schema/src/com/cloud/dc/DataCenterVO.java | 32 ++++++++++++++++++-- .../schema/src/com/cloud/network/vpc/VpcVO.java | 11 ++++++- .../vmware/VmwareDatacenterApiUnitTest.java | 2 +- .../cloudstack/storage/test/VolumeTest.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 2 +- .../com/cloud/network/vpc/VpcManagerImpl.java | 2 +- .../configuration/ConfigurationManagerTest.java | 8 ++--- server/test/com/cloud/vpc/VpcApiUnitTest.java | 2 +- .../test/com/cloud/vpc/dao/MockVpcDaoImpl.java | 4 +-- setup/db/db/schema-451to460.sql | 4 +++ 14 files changed, 94 insertions(+), 18 deletions(-) ----------------------------------------------------------------------