You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2018/04/24 20:48:23 UTC
[geode] 01/02: Merge branch 'develop' of github.com:apache/geode
into develop
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-925
in repository https://gitbox.apache.org/repos/asf/geode.git
commit c5f8089a0b8f737a0afae73e6cb08f904224c666
Merge: a7b9736 d5045a9
Author: Udo Kohlmeyer <uk...@pivotal.io>
AuthorDate: Tue Apr 24 11:44:32 2018 -0700
Merge branch 'develop' of github.com:apache/geode into develop
.../internal/cli/DescribeConnectionCommand.java | 76 +++---
.../jdbc/internal/cli/DescribeMappingCommand.java | 60 ++---
.../jdbc/internal/cli/ListConnectionCommand.java | 55 ++--
.../jdbc/internal/cli/ListMappingCommand.java | 54 ++--
.../internal/configuration/ConnectorService.java | 6 +-
.../cli/DescribeConnectionCommandDUnitTest.java | 70 +++--
.../cli/DescribeConnectionCommandTest.java | 59 +++--
.../cli/DescribeMappingCommandDUnitTest.java | 68 +++--
.../internal/cli/DescribeMappingCommandTest.java | 54 ++--
.../cli/ListConnectionCommandDUnitTest.java | 79 +++---
.../internal/cli/ListConnectionCommandTest.java | 48 ++--
.../internal/cli/ListMappingCommandDUnitTest.java | 84 +++---
.../jdbc/internal/cli/ListMappingCommandTest.java | 50 ++--
.../configuration/ConnectorServiceTest.java | 4 +-
.../asyncqueue/internal/AsyncEventQueueStats.java | 8 +-
.../geode/cache/configuration/CacheConfig.java | 4 +-
.../geode/cache/configuration/XSDRootElement.java | 32 +++
.../distributed/ClusterConfigurationService.java | 20 --
.../InternalClusterConfigurationService.java | 27 +-
.../internal/cache/AbstractBucketRegionQueue.java | 4 +
.../geode/internal/cache/AbstractRegionMap.java | 278 +++++++++-----------
.../geode/internal/cache/BucketRegionQueue.java | 2 +-
.../org/apache/geode/internal/cache/HARegion.java | 4 +
.../geode/internal/cache/ha/HARegionQueue.java | 91 ++++++-
.../internal/cache/wan/AbstractGatewaySender.java | 5 +-
.../wan/AbstractGatewaySenderEventProcessor.java | 2 +-
.../internal/cache/wan/GatewaySenderStats.java | 79 ++++--
.../wan/parallel/ParallelQueueRemovalMessage.java | 10 +
.../apache/geode/internal/config/JAXBService.java | 93 ++-----
.../internal/cli/commands/ListGatewayCommand.java | 8 +-
.../internal/cli/domain/DurableCqNamesResult.java | 11 -
.../internal/cli/util/ClasspathScanLoadHelper.java | 9 +
.../cache/RegionExpirationDistributedTest.java | 42 +--
.../SerialAsyncEventQueueImplJUnitTest.java | 7 +-
.../internal/CacheConfigIntegrationTest.java | 2 +-
.../InternalClusterConfigurationServiceTest.java | 12 +-
.../internal/cache/AbstractRegionMapTest.java | 96 +++++++
.../geode/internal/cache/ha/HARegionDUnitTest.java | 13 +-
.../internal/cache/ha/HARegionQueueDUnitTest.java | 13 +-
.../cache/ha/HARegionQueueIntegrationTest.java | 286 +++++++++++++++++++++
.../cache/tier/sockets/HABug36738DUnitTest.java | 13 +-
.../cache/wan/AsyncEventQueueTestBase.java | 6 +-
.../ParallelQueueRemovalMessageJUnitTest.java | 10 +-
.../geode/internal/config/JAXBServiceTest.java | 18 +-
.../bean/stats/AsyncEventQueueStatsJUnitTest.java | 5 +
.../cli/commands/ListGatewayCommandTest.java | 13 +
...onUsingLegacySecurityWithFailoverDUnitTest.java | 37 +--
.../distributed/LuceneQueryFunctionJUnitTest.java | 16 +-
.../geode/internal/cache/wan/WANTestBase.java | 13 +-
.../parallel/ParallelWANConflationDUnitTest.java | 51 +++-
50 files changed, 1334 insertions(+), 773 deletions(-)
--
To stop receiving notification emails like this one, please contact
udo@apache.org.