You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/03/03 17:41:07 UTC
[4/8] incubator-usergrid git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-432
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-432
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9f521c7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9f521c7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9f521c7d
Branch: refs/heads/USERGRID-432
Commit: 9f521c7d8f133fc68f6c7907180e3779f199b168
Parents: 0f9e8c9 489bf45
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Mar 2 08:22:54 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Mar 2 08:22:54 2015 -0700
----------------------------------------------------------------------
stack/rest/pom.xml | 37 +----
.../org/apache/usergrid/rest/SimplestTest.java | 35 -----
.../applications/queries/GeoPagingTest.java | 44 +++---
.../endpoints/CollectionEndpoint.java | 155 ++++++++++++++-----
.../endpoints/mgmt/OrgResource.java | 81 +++++++---
.../rest/test/resource2point0/model/Entity.java | 6 -
stack/services/pom.xml | 6 +
stack/test-utils/pom.xml | 11 --
8 files changed, 211 insertions(+), 164 deletions(-)
----------------------------------------------------------------------