Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-609
# By Shawn Feldman # Via Shawn Feldman * 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: fixing test consistency Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d5572940 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d5572940 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d5572940 Branch: refs/heads/USERGRID-614 Commit: d5572940475d77d08f14bf9bf833be8efa4de05b Parents: 54871b5 d18b8ee Author: GERey <[email protected]> Authored: Mon May 4 10:26:26 2015 -0700 Committer: GERey <[email protected]> Committed: Mon May 4 10:26:26 2015 -0700 ---------------------------------------------------------------------- .../persistence/index/impl/EntityIndexTest.java | 121 ++++++++++--------- 1 file changed, 61 insertions(+), 60 deletions(-) ----------------------------------------------------------------------
