You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2014/12/22 17:54:45 UTC
[39/50] incubator-usergrid git commit: Merge branch
'UG-rest-test-framework-overhaul' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
apache_usergrid/UG-rest-test-framework-overhaul
Merge branch 'UG-rest-test-framework-overhaul' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into apache_usergrid/UG-rest-test-framework-overhaul
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fe23da87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fe23da87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fe23da87
Branch: refs/heads/two-dot-o
Commit: fe23da873789a40c5a5cd7a0fd2307d364d2a41d
Parents: 21a0266 fcc1bc8
Author: Rod Simpson <ro...@apigee.com>
Authored: Thu Dec 18 17:01:21 2014 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Thu Dec 18 17:01:21 2014 -0700
----------------------------------------------------------------------
.../rest/management/OrganizationsIT.java | 29 ++++++++----
.../endpoints/mgmt/AdminUserResource.java | 42 +++++++++++++++++
.../endpoints/mgmt/AdminUsersResource.java | 49 ++++++++++++++++++++
.../endpoints/mgmt/OrganizationResource.java | 7 ++-
.../rest/test/resource2point0/model/User.java | 10 ++++
5 files changed, 127 insertions(+), 10 deletions(-)
----------------------------------------------------------------------