Merge remote-tracking branch 'origin/develop' into feature/GEODE-2852
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/29fbd25c Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/29fbd25c Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/29fbd25c Branch: refs/heads/feature/GEODE-2852 Commit: 29fbd25cb3cb16a5c759a835402c60270e4f21cd Parents: e94e506 dc6b600 Author: Lynn Hughes-Godfrey <[email protected]> Authored: Tue May 2 13:51:48 2017 -0700 Committer: Lynn Hughes-Godfrey <[email protected]> Committed: Tue May 2 13:51:48 2017 -0700 ---------------------------------------------------------------------- .../geode/internal/cache/EntrySnapshot.java | 6 ++- .../geode/internal/cache/GemFireCacheImpl.java | 20 ++++++--- .../geode/test/process/ProcessWrapper.java | 4 ++ .../managing_a_secure_cache.html.md.erb | 2 +- .../lucene/LuceneIndexExistsException.java | 2 +- .../lucene/internal/LuceneEventListener.java | 21 ++++++---- .../internal/xml/LuceneIndexCreation.java | 2 +- .../LuceneIndexMaintenanceIntegrationTest.java | 43 ++++++++++++++++++++ .../internal/LuceneEventListenerJUnitTest.java | 6 +-- 9 files changed, 85 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
