merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7b4ef60c Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7b4ef60c Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7b4ef60c Branch: refs/heads/USERGRID-628 Commit: 7b4ef60c1858662f2c9b4d3997ee8e4cb60f5fee Parents: 7f7dc82 45b4feb Author: Shawn Feldman <sfeld...@apache.org> Authored: Fri May 29 16:50:34 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Fri May 29 16:50:34 2015 -0600 ---------------------------------------------------------------------- .../collection/paging/PagingResourceIT.java | 14 +++++++++++--- .../rest/applications/queries/AndOrQueryTest.java | 4 ++-- .../rest/applications/queries/OrderByTest.java | 8 ++++---- .../usergrid/rest/management/OrganizationsIT.java | 5 +++++ .../rest/test/resource2point0/ClientSetup.java | 6 +++--- .../rest/test/resource2point0/model/Organization.java | 4 +++- 6 files changed, 28 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
