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/02/26 19:19:11 UTC

[38/50] [abbrv] incubator-usergrid git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into apache_usergrid/two-dot-o

Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid 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/085223fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/085223fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/085223fc

Branch: refs/heads/USERGRID-280
Commit: 085223fc269fefd6809322b1ce2a73d81cfe4630
Parents: 8206b72 7e1509e
Author: Rod Simpson <ro...@rodsimpson.com>
Authored: Wed Feb 25 13:26:39 2015 -0700
Committer: Rod Simpson <ro...@rodsimpson.com>
Committed: Wed Feb 25 13:26:39 2015 -0700

----------------------------------------------------------------------
 .../apache/usergrid/rest/PartialUpdateTest.java |  2 +-
 .../collection/BrowserCompatibilityTest.java    | 68 +++++++++-----------
 .../collection/groups/GroupResourceIT.java      |  4 +-
 .../endpoints/CollectionEndpoint.java           | 58 ++++++++++++++---
 .../endpoints/EntityEndpoint.java               |  2 -
 .../rest/test/resource2point0/model/Entity.java |  7 +-
 6 files changed, 89 insertions(+), 52 deletions(-)
----------------------------------------------------------------------