Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/465c9ec5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/465c9ec5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/465c9ec5 Branch: refs/heads/object_store_migration Commit: 465c9ec5c3916009a6f87d1d450a5fe39e57b8fe Parents: 70b2c01 718bc37 Author: Edison Su <[email protected]> Authored: Fri Oct 25 18:24:29 2013 -0700 Committer: Edison Su <[email protected]> Committed: Fri Oct 25 18:24:29 2013 -0700 ---------------------------------------------------------------------- .../org/apache/cloudstack/api/APICommand.java | 4 +++ .../acl/StaticRoleBasedAPIAccessChecker.java | 37 +++++++++++++++++--- .../spring-server-core-managers-context.xml | 1 + .../system/spring-server-system-context.xml | 36 +++++++++++++++++++ .../com/cloud/server/ManagementServerImpl.java | 18 ++++++++-- ui/scripts/system.js | 1 + 6 files changed, 89 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
