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/e70f0472 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e70f0472 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e70f0472 Branch: refs/heads/two-dot-o-dev Commit: e70f0472e2a1ae2391ca4954d2acd48c1eb1248e Parents: 8aa793b e45728e Author: Shawn Feldman <sfeld...@apache.org> Authored: Thu May 28 13:36:34 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Thu May 28 13:36:34 2015 -0600 ---------------------------------------------------------------------- .../src/main/java/org/apache/usergrid/persistence/Query.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
