This is an automated email from the ASF dual-hosted git repository.

eshu11 pushed a commit to branch feature/GEODE-4738
in repository https://gitbox.apache.org/repos/asf/geode.git

commit f61718845961f825047a8f184bc37d891eb06abe
Merge: 887a0f9 101fd19
Author: eshu <[email protected]>
AuthorDate: Mon Feb 26 10:49:11 2018 -0800

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

 .../geode/internal/cache/PRQueryProcessor.java     |    2 +-
 .../geode/internal/cache/PartitionedRegion.java    |   65 +-
 .../internal/cache/PartitionedRegionDataStore.java |   29 +-
 .../test/java/org/apache/geode/DeltaTestImpl.java  |   16 +-
 .../partitioned/PRBasicIndexCreationDUnitTest.java |  947 +++--
 .../PRBasicIndexCreationDeadlockDUnitTest.java     |  240 --
 .../PRBasicMultiIndexCreationDUnitTest.java        |  370 +-
 .../query/partitioned/PRBasicQueryDUnitTest.java   |  466 +--
 .../partitioned/PRBasicRemoveIndexDUnitTest.java   |  132 +-
 .../partitioned/PRColocatedEquiJoinDUnitTest.java  | 1644 +++-----
 .../query/partitioned/PRInvalidQueryDUnitTest.java |  137 +-
 .../partitioned/PRQueryCacheCloseDUnitTest.java    |  319 --
 .../cache/query/partitioned/PRQueryDUnitTest.java  | 1266 ++----
 .../partitioned/PRQueryPortfolioDUnitTest.java     |  467 +++
 .../partitioned/PRQueryRegionCloseDUnitTest.java   |  211 +-
 .../PRQueryRegionDestroyedDUnitTest.java           |  208 +-
 .../PRQueryRemoteNodeExceptionDUnitTest.java       |  792 ++--
 .../internal/cache/DeltaPropagationDUnitTest.java  |   16 +-
 .../EnforceUniqueHostForLonerIntegrationTest.java  |   62 +
 .../geode/internal/cache/OffHeapTestUtil.java      |   11 +-
 .../PRCreationTotalNumBucketsDistributedTest.java  |  135 +
 ...onedRegionAPIConserveSocketsFalseDUnitTest.java |    9 +-
 .../cache/PartitionedRegionAPIDUnitTest.java       | 1811 +++------
 .../PartitionedRegionAsSubRegionDUnitTest.java     |  314 --
 .../PartitionedRegionAsSubregionDUnitTest.java     |  234 ++
 ...dRegionBucketCreationDistributionDUnitTest.java | 1851 +++------
 .../PartitionedRegionCacheCloseDUnitTest.java      |  276 +-
 .../PartitionedRegionCacheXMLExampleDUnitTest.java |  176 +-
 .../cache/PartitionedRegionCreationDUnitTest.java  | 1025 ++---
 .../cache/PartitionedRegionDUnitTestCase.java      |  507 ---
 .../cache/PartitionedRegionDestroyDUnitTest.java   |  361 +-
 .../cache/PartitionedRegionGetSomeKeys.java        |   80 +
 .../cache/PartitionedRegionHADUnitTest.java        |  654 ++-
 ...itionedRegionHAFailureAndRecoveryDUnitTest.java |  689 ++--
 .../PartitionedRegionLocalMaxMemoryDUnitTest.java  |  274 +-
 ...tionedRegionLocalMaxMemoryOffHeapDUnitTest.java |   45 +-
 .../cache/PartitionedRegionMultipleDUnitTest.java  |  576 +--
 .../cache/PartitionedRegionPRIDDUnitTest.java      |  287 +-
 ...itionedRegionSingleNodeOperationsJUnitTest.java |    2 +-
 .../cache/PartitionedRegionSizeDUnitTest.java      |  625 +--
 .../cache/PartitionedRegionStatsDUnitTest.java     |  823 ++--
 .../cache/PartitionedRegionTestUtilsDUnitTest.java |  817 ++--
 .../PartitionedRegionWithSameNameDUnitTest.java    |  920 +----
 .../internal/cache/TestObjectWithIdentifier.java   |   85 +
 .../BooleanFunction.java}                          |   41 +-
 .../ExecuteFunctionInstanceRegressionTest.java     |  188 +
 ...ExceptionsIncludeLocalMemberRegressionTest.java |  136 +
 .../FunctionExecutionOnLonerRegressionTest.java    |  142 +
 .../FunctionExecution_ExceptionDUnitTest.java      |  799 ++--
 .../cache/execute/MonthBasedPartitionResolver.java |   73 +
 .../execute/PRCustomPartitioningDUnitTest.java     |  598 +--
 .../execute/PRFunctionExecutionDUnitTest.java      | 4181 ++++++++------------
 ...FunctionExecutionWithResultSenderDUnitTest.java |  904 ++---
 .../cache/execute/PRPerformanceTestDUnitTest.java  |  417 --
 .../SerializableMonth.java}                        |   50 +-
 .../TimeKeeper.java}                               |   40 +-
 .../internal/cache/functions/TestFunction.java     |    2 +-
 .../DeltaClientAuthorizationDUnitTest.java         |   11 +-
 .../DeltaClientPostAuthorizationDUnitTest.java     |   10 +-
 .../apache/geode/test/dunit/IgnoredException.java  |   11 +-
 .../java/org/apache/geode/test/dunit/LocalVM.java  |   90 +
 .../apache/geode/test/dunit/rules/CacheRule.java   |   23 +-
 .../tier/sockets/ClientToServerDeltaDUnitTest.java |   32 +-
 63 files changed, 10013 insertions(+), 17711 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to