Merge branch '1.x' into usergrid-1099
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d37be706 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d37be706 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d37be706 Branch: refs/heads/usergrid-1099 Commit: d37be7066db054688dc85c3a9b497d51acb07138 Parents: c776a2f 7cb7b3f Author: Dave Johnson <[email protected]> Authored: Thu Nov 5 14:20:36 2015 -0500 Committer: Dave Johnson <[email protected]> Committed: Thu Nov 5 14:20:36 2015 -0500 ---------------------------------------------------------------------- .../src/main/java/CpQueryFilter.tokens | 47 -------------------- 1 file changed, 47 deletions(-) ----------------------------------------------------------------------
