You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/06/13 13:53:43 UTC
[6/7] git commit: updated refs/heads/master to 22c6b47
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 <wi...@gmail.com>
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 <wi...@gmail.com>
Authored: Mon Jun 13 09:52:48 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
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(-)
----------------------------------------------------------------------