You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/12/02 00:34:45 UTC

[6/8] incubator-usergrid git commit: Merge remote-tracking branch 'origin/two-dot-o' into USERGRID-252

Merge remote-tracking branch 'origin/two-dot-o' into USERGRID-252


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e3a2595a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e3a2595a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e3a2595a

Branch: refs/heads/USERGRID-252
Commit: e3a2595a46f1b17c6443440acc9cc4ac9ffe20bf
Parents: 2e1d8bd de455c3
Author: Todd Nine <tn...@apigee.com>
Authored: Mon Dec 1 15:26:11 2014 -0700
Committer: Todd Nine <tn...@apigee.com>
Committed: Mon Dec 1 15:26:11 2014 -0700

----------------------------------------------------------------------
 .../rest/management/users/UsersResource.java    |  38 ++-
 .../applications/queries/BasicGeoTests.java     | 268 +++++++++++++++++++
 .../applications/queries/basicGeoTests.java     | 184 -------------
 3 files changed, 292 insertions(+), 198 deletions(-)
----------------------------------------------------------------------