Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-593
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fd6305c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fd6305c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fd6305c1 Branch: refs/heads/two-dot-o-dev Commit: fd6305c18809af324d0c0c233c35c5e2c3b03f80 Parents: 9dc21f9 597dfc2 Author: Todd Nine <[email protected]> Authored: Wed Apr 29 11:49:31 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Wed Apr 29 11:49:31 2015 -0600 ---------------------------------------------------------------------- .../persistence/query/NotSubPropertyIT.java | 6 ++++-- .../persistence/core/rx/RxTaskSchedulerImpl.java | 2 +- .../apache/usergrid/persistence/index/IndexFig.java | 4 ++-- .../index/impl/IndexRefreshCommandImpl.java | 16 +++++++++------- 4 files changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fd6305c1/stack/core/src/test/java/org/apache/usergrid/persistence/query/NotSubPropertyIT.java ----------------------------------------------------------------------
