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/07/10 15:37:38 UTC
[32/50] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
into two-dot-o
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/31c1f21c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/31c1f21c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/31c1f21c
Branch: refs/heads/two-dot-o-import
Commit: 31c1f21c1319af25d1175104b24f4e2a1de2f1b1
Parents: d8fdc3a 7fd643c
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Jun 10 14:58:16 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Jun 10 14:58:16 2015 -0400
----------------------------------------------------------------------
.../org/apache/usergrid/rest/IndexResource.java | 10 +--
.../apache/usergrid/rest/IndexResourceIT.java | 92 ++++++++++++++------
.../rest/test/resource2point0/ClientSetup.java | 12 ++-
.../endpoints/SystemResource.java | 21 +++++
.../endpoints/mgmt/ApplicationResource.java | 6 +-
5 files changed, 105 insertions(+), 36 deletions(-)
----------------------------------------------------------------------