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 2016/02/04 18:57:55 UTC
[31/50] [abbrv] usergrid git commit: Merge commit
'refs/pull/475/head' of github.com:apache/usergrid
Merge commit 'refs/pull/475/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/10733b26
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/10733b26
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/10733b26
Branch: refs/heads/asf-site
Commit: 10733b261db1403ad0b744706839dc778dac88fd
Parents: 019d49e a434b52
Author: Michael Russo <mi...@gmail.com>
Authored: Mon Feb 1 08:46:17 2016 -0800
Committer: Michael Russo <mi...@gmail.com>
Committed: Mon Feb 1 08:46:17 2016 -0800
----------------------------------------------------------------------
.../main/resources/usergrid-default.properties | 5 ++
.../usergrid/rest/AbstractContextResource.java | 52 ++++++++++++++-
.../rest/applications/ApplicationResource.java | 10 ++-
.../rest/applications/ServiceResource.java | 12 ++--
.../rest/applications/users/UserResource.java | 41 ++++++------
.../rest/applications/users/UsersResource.java | 14 ++---
.../rest/management/ManagementResource.java | 5 +-
.../organizations/OrganizationResource.java | 14 ++---
.../rest/management/users/UserResource.java | 66 +++++++++++++-------
.../usergrid/management/ManagementService.java | 13 ++++
.../usergrid/management/OrganizationConfig.java | 27 ++++----
.../management/OrganizationConfigProps.java | 4 ++
.../cassandra/ManagementServiceImpl.java | 54 ++++++++++++++--
.../cassandra/OrganizationConfigPropsImpl.java | 45 ++++++++++---
14 files changed, 266 insertions(+), 96 deletions(-)
----------------------------------------------------------------------