usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject [2/2] usergrid git commit: Merge commit 'refs/pull/498/head' of github.com:apache/usergrid into release-2.1.1
Date Fri, 01 Apr 2016 06:05:29 GMT
Merge commit 'refs/pull/498/head' of github.com:apache/usergrid into release-2.1.1


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/43d85599
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/43d85599
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/43d85599

Branch: refs/heads/release-2.1.1
Commit: 43d85599f2100cbd6072956ddc5a1082ee9d38d8
Parents: 492ac59 cac5569
Author: Michael Russo <mrusso@apigee.com>
Authored: Thu Mar 31 23:05:19 2016 -0700
Committer: Michael Russo <mrusso@apigee.com>
Committed: Thu Mar 31 23:05:19 2016 -0700

----------------------------------------------------------------------
 .../rest/applications/ServiceResource.java      |  5 +--
 .../OAuth2AccessTokenSecurityFilter.java        |  3 +-
 .../cassandra/ManagementServiceImpl.java        | 10 ++++-
 .../usergrid/security/tokens/TokenService.java  |  3 ++
 .../tokens/cassandra/TokenServiceImpl.java      | 40 ++++++++++++--------
 5 files changed, 40 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/43d85599/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------


Mime
View raw message