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 D73DF200B11 for ; Mon, 13 Jun 2016 15:53:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D4BB8160A64; Mon, 13 Jun 2016 13:53:40 +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 603D6160A62 for ; Mon, 13 Jun 2016 15:53:40 +0200 (CEST) Received: (qmail 36760 invoked by uid 500); 13 Jun 2016 13:53:39 -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 36260 invoked by uid 99); 13 Jun 2016 13:53:39 -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, 13 Jun 2016 13:53:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CB2F0E108B; Mon, 13 Jun 2016 13:53:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Mon, 13 Jun 2016 13:53:43 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/7] git commit: updated refs/heads/master to 22c6b47 archived-at: Mon, 13 Jun 2016 13:53:41 -0000 Merge pull request #1584 from shapeblue/usage-roleid-dbfix [BLOCKER][FIX] CLOUDSTACK-9409: Add role_id to cloud_usage.accountAdds role_id column to cloud_usage.account, fixes UsageDaoImpl to insert Accounts with role_id from account table. Without the fix, usage server fails to work. This fixes a *blocker* for 4.9.0 reported by @nvazquez (thanks!) /cc @swill @nvazquez for review and merge thanks. * pr/1584: CLOUDSTACK-9409: Add role_id to cloud_usage.account Signed-off-by: Will Stevens Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76d5350f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76d5350f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76d5350f Branch: refs/heads/master Commit: 76d5350f71ddbb588ead27f5eda576c9a68a9648 Parents: 971c8a7 fd67871 Author: Will Stevens Authored: Mon Jun 13 09:52:48 2016 -0400 Committer: Will Stevens Committed: Mon Jun 13 09:52:49 2016 -0400 ---------------------------------------------------------------------- .../src/com/cloud/upgrade/dao/Upgrade481to490.java | 8 +++++++- engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java | 11 ++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) ----------------------------------------------------------------------