You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/21 16:37:51 UTC

[6/6] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-1565

Merge remote-tracking branch 'origin/develop' into feature/GEODE-1565


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/539696d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/539696d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/539696d5

Branch: refs/heads/feature/GEODE-1565
Commit: 539696d5d70114e56db6e62ae6e25f32a572eeac
Parents: a3d5c6e 83c7c66
Author: Kirk Lund <kl...@pivotal.io>
Authored: Tue Jun 21 09:29:33 2016 -0700
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Tue Jun 21 09:29:33 2016 -0700

----------------------------------------------------------------------
 .../CreateAlterDestroyRegionCommands.java       |  2 +-
 .../internal/cli/i18n/CliStrings.java           |  8 +-
 .../cache30/PreloadedRegionTestCase.java        | 16 ++--
 .../gemfire/distributed/LocatorDUnitTest.java   |  1 +
 .../commands/HelpCommandsIntegrationTest.java   |  4 +
 .../cli/commands/golden-help-offline.properties | 82 ++++++++++----------
 .../lucene/internal/LuceneEventListener.java    | 10 ++-
 .../LuceneIndexForPartitionedRegion.java        |  1 +
 .../LuceneIndexMaintenanceIntegrationTest.java  | 35 +++++++++
 .../internal/LuceneEventListenerJUnitTest.java  | 21 +++++
 10 files changed, 120 insertions(+), 60 deletions(-)
----------------------------------------------------------------------