Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-643
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b1d9ac28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b1d9ac28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b1d9ac28 Branch: refs/heads/USERGRID-641 Commit: b1d9ac283d1bf8ab17a5d9fd305b38447b5799d1 Parents: dbfff99 bc3cafb Author: Todd Nine <[email protected]> Authored: Tue May 12 10:43:32 2015 -0700 Committer: Todd Nine <[email protected]> Committed: Tue May 12 10:43:32 2015 -0700 ---------------------------------------------------------------------- .../usergrid/corepersistence/CpRelationManager.java | 4 ++-- .../java/org/apache/usergrid/persistence/Query.java | 13 ++++--------- .../usergrid/services/AbstractCollectionService.java | 4 ++-- .../org/apache/usergrid/services/ServiceRequest.java | 2 +- 4 files changed, 9 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
