Merge pull request #1551 from shapeblue/rbac-mysql-fix dynamic-roles: packaging improvementsOn some MySQL server envs, this may cause a SQL statement error, though I was unable to reproduce it. Since it's not needed, an order by 'sort_order' is enough, we can safely remove it.
/cc @swill @anshulgangwar @DaanHoogland and others * pr/1551: migrate-dynamicroles: use mysql.connector due to #1054 packaging: don't bundle systemvm.zip in rpms packaging: backup commands.properties as it does not exist in new rpms dynamic-roles: remove unnecessary order by ID Signed-off-by: Will Stevens <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34111df0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34111df0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34111df0 Branch: refs/heads/master Commit: 34111df02f5f1740718b3599242de3c3c20fee7f Parents: a38b17f 05e1db7 Author: Will Stevens <[email protected]> Authored: Fri May 20 08:30:38 2016 -0400 Committer: Will Stevens <[email protected]> Committed: Fri May 20 08:30:39 2016 -0400 ---------------------------------------------------------------------- .../apache/cloudstack/acl/dao/RolePermissionsDaoImpl.java | 1 - packaging/centos63/cloud.spec | 9 +++++++-- packaging/centos7/cloud.spec | 9 +++++++-- packaging/fedora20/cloud.spec | 9 +++++++-- packaging/fedora21/cloud.spec | 9 +++++++-- scripts/util/migrate-dynamicroles.py | 6 +++--- 6 files changed, 31 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
