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/09/10 21:30:50 UTC
[2/4] usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0b78668c
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0b78668c
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0b78668c
Branch: refs/heads/usergrid-103-upgrade-jersey
Commit: 0b78668cb72e6b61f9f75652d65de4f75d84960a
Parents: 11ec2e7 b67f0b1
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Sep 10 09:28:27 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Sep 10 09:28:27 2015 -0600
----------------------------------------------------------------------
.../corepersistence/util/CpNamingUtils.java | 3 +
.../org/apache/usergrid/rest/ApiResponse.java | 14 ++
.../rest/applications/ServiceResource.java | 24 ++-
.../organizations/OrganizationResource.java | 54 ++++++
.../organizations/OrganizationsResource.java | 1 +
.../usergrid/management/ManagementService.java | 10 ++
.../usergrid/management/OrganizationConfig.java | 170 +++++++++++++++++++
.../cassandra/ManagementServiceImpl.java | 84 +++++++++
8 files changed, 356 insertions(+), 4 deletions(-)
----------------------------------------------------------------------