You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ja...@apache.org on 2017/05/22 21:02:10 UTC
[2/5] geode git commit: GEODE-269 : Resolving conflicts with develop.
GEODE-269 : Resolving conflicts with develop.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/929687e2
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/929687e2
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/929687e2
Branch: refs/heads/develop
Commit: 929687e28335ee5ace679be5c540857080afd48f
Parents: e2f337a 0c5011e
Author: Deepak Dixit <de...@gmail.com>
Authored: Fri May 12 14:03:39 2017 +0530
Committer: Deepak Dixit <de...@gmail.com>
Committed: Fri May 12 14:03:39 2017 +0530
----------------------------------------------------------------------
.github/PULL_REQUEST_TEMPLATE.md | 22 ++
.../internal/filter/attributes/DeltaEvent.java | 4 -
.../geode/cache/DynamicRegionFactory.java | 2 +-
.../java/org/apache/geode/cache/EntryEvent.java | 57 -----
.../org/apache/geode/cache/client/Pool.java | 12 +-
.../internal/AutoConnectionSourceImpl.java | 14 ++
.../cache/client/internal/ConnectionSource.java | 8 +
.../internal/ExplicitConnectionSourceImpl.java | 5 +
.../geode/cache/client/internal/PoolImpl.java | 5 +
.../cache/client/internal/ProxyRegion.java | 15 +-
.../geode/cache/query/internal/QRegion.java | 2 +-
.../query/internal/index/DummyQRegion.java | 2 +-
.../internal/admin/remote/AdminRegion.java | 11 +-
.../geode/internal/cache/AbstractRegion.java | 6 -
.../geode/internal/cache/LocalDataSet.java | 9 +-
.../geode/internal/cache/LocalRegion.java | 12 +-
.../geode/internal/cache/PartitionedRegion.java | 4 +-
.../geode/internal/cache/PoolFactoryImpl.java | 5 +
.../geode/internal/cache/ha/HARegionQueue.java | 2 +-
.../cache/tier/sockets/AcceptorImpl.java | 2 +-
.../management/internal/cli/GfshParser.java | 3 +
.../functions/GarbageCollectionFunction.java | 35 +--
.../internal/cli/util/BytesToString.java | 50 +++++
.../test/java/org/apache/geode/TXJUnitTest.java | 216 +++++--------------
.../org/apache/geode/cache/ProxyJUnitTest.java | 8 +-
.../internal/AutoConnectionSourceDUnitTest.java | 40 ++++
.../AutoConnectionSourceImplJUnitTest.java | 4 +
.../CacheServerSSLConnectionDUnitTest.java | 73 +++++++
.../client/internal/QueueManagerJUnitTest.java | 10 +
.../index/IndexMaintenanceJUnitTest.java | 21 --
.../geode/cache30/CacheListenerTestCase.java | 33 ++-
.../geode/cache30/CacheLoaderTestCase.java | 32 +--
.../internal/cache/AbstractRegionJUnitTest.java | 2 +-
.../internal/cache/ha/HAGIIBugDUnitTest.java | 2 +-
.../cache/ha/HARQAddOperationJUnitTest.java | 2 +-
.../OffHeapLRURecoveryRegressionTest.java | 20 +-
.../internal/cli/GfshParserIntegrationTest.java | 7 +
.../cli/commands/ShowDeadlockDUnitTest.java | 98 +++------
.../internal/cli/util/BytesToStringTest.java | 115 ++++++++++
.../lucene_integration.html.md.erb | 4 +-
geode-lucene/build.gradle | 2 +
.../apache/geode/cache/lucene/LuceneIndex.java | 45 +++-
.../geode/cache/lucene/LuceneIndexFactory.java | 2 -
.../apache/geode/cache/lucene/LuceneQuery.java | 51 ++++-
.../geode/cache/lucene/LuceneQueryFactory.java | 4 -
.../geode/cache/lucene/LuceneQueryProvider.java | 3 -
.../geode/cache/lucene/LuceneResultStruct.java | 12 +-
.../geode/cache/lucene/LuceneService.java | 4 -
.../cache/lucene/LuceneServiceProvider.java | 9 +-
.../lucene/PageableLuceneQueryResults.java | 13 +-
.../internal/distributed/CollectorManager.java | 10 +-
.../repository/IndexResultCollector.java | 24 ++-
.../lucene/LuceneQueriesIntegrationTest.java | 32 +++
...llelWANPropagationClientServerDUnitTest.java | 1 -
gradle/dependency-versions.properties | 1 +
55 files changed, 702 insertions(+), 485 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/929687e2/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index ede4220,a5293eb..3fc816a
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@@ -183,12 -176,9 +176,9 @@@ public class ShowDeadlockDUnitTest exte
public void run() {
lock.lock();
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- fail("interrupted", e);
- }
- ResultCollector collector = FunctionService.onMember(member).execute(new TestFunction());
+
+ ResultCollector collector =
- FunctionService.onMember(basicGetSystem(), member).execute(new TestFunction());
++ FunctionService.onMember(member).execute(new TestFunction());
// wait the function to lock the lock on member.
collector.getResult();
lock.unlock();