Merge remote-tracking branch 'origin/develop' into feature/GEODE-835
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/52f21b0f Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/52f21b0f Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/52f21b0f Branch: refs/heads/feature/GEODE-835 Commit: 52f21b0fce4fd259c05b30c1b8efac04588819d4 Parents: 7e55922 c674e35 Author: Kirk Lund <kl...@pivotal.io> Authored: Fri May 20 14:17:11 2016 -0700 Committer: Kirk Lund <kl...@pivotal.io> Committed: Fri May 20 14:17:11 2016 -0700 ---------------------------------------------------------------------- .../internal/AdminDistributedSystemImpl.java | 13 +- .../com/gemstone/gemfire/internal/Banner.java | 252 +++++++++---------- .../internal/logging/LogWriterFactory.java | 14 +- .../gemfire/cache30/ReconnectDUnitTest.java | 21 +- ...rRemoteWithCustomLoggingIntegrationTest.java | 0 .../DistributedSystemLogFileJUnitTest.java | 2 +- .../test/dunit/standalone/DUnitLauncher.java | 4 + .../test/dunit/standalone/ProcessManager.java | 4 + .../cq/dunit/CqPerfUsingPoolDUnitTest.java | 2 +- .../LuceneIndexCreationIntegrationTest.java | 38 +-- ...IndexCreationPersistenceIntegrationTest.java | 53 ++++ .../LuceneIndexMaintenanceIntegrationTest.java | 119 +++++++++ .../cache/lucene/LuceneIntegrationTest.java | 8 + .../LuceneServiceImplIntegrationTest.java | 205 +-------------- 14 files changed, 375 insertions(+), 360 deletions(-) ----------------------------------------------------------------------
