You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/09/07 03:39:18 UTC
[6/6] usergrid git commit: Merge branch 'master' into feature-flags
Merge branch 'master' into feature-flags
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ad0494a4
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ad0494a4
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ad0494a4
Branch: refs/heads/feature-flags
Commit: ad0494a41a0866c15247eadbac0aa88de3c283b7
Parents: f38b131 efb5bfb
Author: Michael Russo <mr...@apigee.com>
Authored: Tue Sep 6 20:38:56 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Tue Sep 6 20:38:56 2016 -0700
----------------------------------------------------------------------
.../usergrid/rest/management/users/UserResource.java | 2 +-
.../apache/usergrid/rest/management/AdminUsersIT.java | 2 +-
.../apache/usergrid/management/ManagementService.java | 2 +-
.../management/cassandra/ManagementServiceImpl.java | 13 ++++++++-----
4 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/ad0494a4/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------