You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by dh...@apache.org on 2019/06/19 23:54:59 UTC

[geode] 02/02: Merge remote-tracking branch 'origin/develop' into wip/no-int-stats

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

dhemery pushed a commit to branch wip/no-int-stats
in repository https://gitbox.apache.org/repos/asf/geode.git

commit 82f59cf8e427ed857168dd89879df8c938dff43e
Merge: bc2b1cd 94cd789
Author: Dale Emery <de...@pivotal.io>
AuthorDate: Wed Jun 19 16:54:21 2019 -0700

    Merge remote-tracking branch 'origin/develop' into wip/no-int-stats

 .../rest/ClientClusterManagementSSLTest.java       |  4 +-
 .../ClientClusterManagementServiceDunitTest.java   | 10 +++-
 ...ClusterManagementLocatorReconnectDunitTest.java |  4 +-
 .../rest/GatewayReceiverManagementDUnitTest.java   | 14 ++++-
 .../internal/rest/RegionManagementDunitTest.java   |  7 ++-
 .../RegionManagementRestSecurityDUnitTest.java     |  4 +-
 .../integrationTest/resources/assembly_content.txt |  2 +-
 .../api/LocatorClusterManagementService.java       | 30 +++++-----
 .../cli/functions/UpdateCacheFunction.java         | 48 ++++++++++++----
 .../realizers/ConfigurationRealizer.java           |  7 ++-
 .../realizers/GatewayReceiverRealizer.java         | 15 +++--
 .../realizers/RegionConfigRealizer.java            | 21 +++++--
 .../sanctioned-geode-management-serializables.txt  |  1 +
 .../api/LocatorClusterManagementServiceTest.java   | 28 ++++-----
 .../assertions/ClusterManagementResultAssert.java  | 11 +++-
 .../management/api/ClusterManagementResult.java    | 15 +++--
 .../api/{Status.java => RealizationResult.java}    | 50 +++++++++++-----
 .../configuration/MultiGroupCacheElement.java      | 11 ++++
 .../management/api/RealizationResultTest.java      | 66 ++++++++++++++++++++++
 .../ClientClusterManagementServiceDUnitTest.java   | 31 ++++++----
 .../management/client/ConfigurePDXDUnitTest.java   | 19 ++++++-
 21 files changed, 298 insertions(+), 100 deletions(-)