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 0FE6AD3C4 for ; Thu, 16 May 2013 07:14:10 +0000 (UTC) Received: (qmail 6128 invoked by uid 500); 16 May 2013 07:14:09 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 5977 invoked by uid 500); 16 May 2013 07:14:09 -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 5951 invoked by uid 99); 16 May 2013 07:14:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 07:14:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9B3501463C; Thu, 16 May 2013 07:14:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mice@apache.org To: commits@cloudstack.apache.org Message-Id: <59c0984f2e074ed39fed151aa629e533@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to e7fef86 Date: Thu, 16 May 2013 07:14:08 +0000 (UTC) Updated Branches: refs/heads/master e26081731 -> e7fef86c8 CLOUDSTACK-2456 usage:usage parser throws runtime exception while parsing networkoffering usage Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e7fef86c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e7fef86c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e7fef86c Branch: refs/heads/master Commit: e7fef86c8086a3bad3a5f3aacaa39dd5ddef3ab4 Parents: e260817 Author: Mice Xia Authored: Thu May 16 15:19:05 2013 +0800 Committer: Mice Xia Committed: Thu May 16 15:19:05 2013 +0800 ---------------------------------------------------------------------- .../usage/dao/UsageNetworkOfferingDaoImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7fef86c/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java index c3fc5a6..4ed7c27 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java @@ -118,18 +118,18 @@ public class UsageNetworkOfferingDaoImpl extends GenericDaoBase