Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6e1ef164 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6e1ef164 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6e1ef164 Branch: refs/heads/two-dot-o-dev Commit: 6e1ef164ccf4e012865f054979eaf0903a24847e Parents: 5b6799c 057feb0 Author: Shawn Feldman <sfeld...@apache.org> Authored: Mon Jun 1 17:53:24 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Mon Jun 1 17:53:24 2015 -0600 ---------------------------------------------------------------------- .../apache/usergrid/rest/applications/queries/GeoPagingTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------