You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/12/15 16:46:09 UTC
[4/5] usergrid git commit: Merge branch 'master' into USERGRID-872
Merge branch 'master' into USERGRID-872
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/652f64b3
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/652f64b3
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/652f64b3
Branch: refs/heads/USERGRID-872
Commit: 652f64b334aa36a011df2bc37f2edbf0bad3ac09
Parents: bdf518b c6945e3
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Dec 8 07:36:53 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Dec 8 07:36:53 2015 -0500
----------------------------------------------------------------------
.../shard/impl/NodeShardAllocationImpl.java | 2 +-
.../rest/applications/ApplicationResource.java | 1 +
.../rest/applications/AuthResource.java | 10 +-
.../applications/assets/AssetsResource.java | 8 +-
.../rest/applications/queues/QueueResource.java | 10 ++
.../queues/QueueSubscriberResource.java | 5 +
.../queues/QueueSubscriptionResource.java | 5 +
.../queues/QueueTransactionsResource.java | 4 +
.../security/SecuredResourceFilterFactory.java | 93 ++++++++++++++-
.../annotations/CheckPermissionsForPath.java | 32 ++++++
.../usergrid/rest/applications/SecurityIT.java | 115 +++++++++++++++++++
11 files changed, 274 insertions(+), 11 deletions(-)
----------------------------------------------------------------------