Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
# By Shawn Feldman # Via Shawn Feldman * 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: devicestest fix collectionsresourceit fix applicationsCreateit appinfomigration Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/81b2c040 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/81b2c040 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/81b2c040 Branch: refs/heads/USERGRID-685 Commit: 81b2c0406a0112acd8954d3db0e9f30e98cad097 Parents: ec2f883 92ecf01 Author: GERey <gre...@apigee.com> Authored: Tue Jun 2 11:35:08 2015 -0700 Committer: GERey <gre...@apigee.com> Committed: Tue Jun 2 11:35:08 2015 -0700 ---------------------------------------------------------------------- .../corepersistence/CpEntityManager.java | 5 ++++- .../corepersistence/index/IndexServiceImpl.java | 4 +++- .../apache/usergrid/rest/NotificationsIT.java | 9 +++++++-- .../rest/applications/ApplicationCreateIT.java | 20 +++++++++----------- .../collection/CollectionsResourceIT.java | 11 ++++++----- .../collection/devices/DevicesResourceIT.java | 3 ++- .../migration/AppInfoMigrationPluginTest.java | 6 ++++-- 7 files changed, 35 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
