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 6C35110FFE for ; Wed, 28 May 2014 08:11:59 +0000 (UTC) Received: (qmail 80085 invoked by uid 500); 28 May 2014 08:11:59 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 80053 invoked by uid 500); 28 May 2014 08:11:59 -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 80046 invoked by uid 99); 28 May 2014 08:11:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2014 08:11:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CB75494BF84; Wed, 28 May 2014 08:11:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Message-Id: <6d3ab6544aa94cfeb3ab835cf08e1eff@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4 to 032be54 Date: Wed, 28 May 2014 08:11:58 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4 93cc3e80d -> 032be54fc FIXED CLOUDSTACK-6781 [Automation] integration.smoke.test_portable_publicip.TestPortablePublicIPRange.test_createPortablePublicIPRange failing on 4.4 Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/032be54f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/032be54f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/032be54f Branch: refs/heads/4.4 Commit: 032be54fc63d1306efcc0bc75f49ca8144699f68 Parents: 93cc3e8 Author: Rajani Karuturi Authored: Tue May 27 20:50:07 2014 +0530 Committer: Daan Hoogland Committed: Wed May 28 10:11:47 2014 +0200 ---------------------------------------------------------------------- engine/schema/src/com/cloud/network/dao/IPAddressVO.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/032be54f/engine/schema/src/com/cloud/network/dao/IPAddressVO.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java index 816e063..0be781b 100644 --- a/engine/schema/src/com/cloud/network/dao/IPAddressVO.java +++ b/engine/schema/src/com/cloud/network/dao/IPAddressVO.java @@ -53,7 +53,6 @@ public class IPAddressVO implements IpAddress { @Column(name = "domain_id") private Long allocatedInDomainId = null; - @Id @Column(name = "public_ip_address") @Enumerated(value = EnumType.STRING) private Ip address = null;