You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/01/13 20:15:21 UTC
[19/50] [abbrv] incubator-usergrid git commit: Merge remote-tracking
branch 'GERey/USERGRID-304_Fix-paging-tests' into apache_usergrid/two-dot-o
Merge remote-tracking branch 'GERey/USERGRID-304_Fix-paging-tests' into apache_usergrid/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/28d19f2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/28d19f2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/28d19f2f
Branch: refs/heads/two-dot-o-import
Commit: 28d19f2f7c0b3036179f17ab1823f411e719e1c2
Parents: 1e3a16e f9927a7
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Jan 7 11:23:32 2015 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Jan 7 11:23:32 2015 -0700
----------------------------------------------------------------------
.../collection/paging/PagingEntitiesTest.java | 132 ------
.../collection/paging/PagingResourceIT.java | 442 +++++++++++--------
.../endpoints/CollectionEndpoint.java | 10 +-
.../endpoints/EntityEndpoint.java | 11 +
.../test/resource2point0/model/Collection.java | 11 +-
5 files changed, 276 insertions(+), 330 deletions(-)
----------------------------------------------------------------------