You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2017/04/11 23:58:03 UTC
[4/7] geode git commit: Merge remote-tracking branch 'origin/develop'
into feature/GEODE-2097
Merge remote-tracking branch 'origin/develop' into feature/GEODE-2097
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/4d069fbc
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/4d069fbc
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/4d069fbc
Branch: refs/heads/feature/GEODE-2097
Commit: 4d069fbc5e9830c644eb006dd5a77020e25b8d85
Parents: bf20e0a 591391e
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Apr 11 14:00:18 2017 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Apr 11 14:00:18 2017 -0700
----------------------------------------------------------------------
.../tools/pulse/PulseVerificationTest.java | 2 +-
.../cache/query/internal/DefaultQuery.java | 2 +-
.../query/internal/index/IndexManager.java | 4 +-
.../org/apache/geode/internal/SystemTimer.java | 2 +-
.../geode/internal/cache/DistributedRegion.java | 6 +-
.../geode/internal/cache/GemFireCacheImpl.java | 28 +-
.../geode/internal/cache/LocalRegion.java | 6 +-
.../cache/PartitionedRegionDataView.java | 4 +-
.../geode/internal/cache/TXManagerImpl.java | 32 +-
.../apache/geode/internal/cache/TXState.java | 4 +-
.../geode/internal/cache/TXStateProxy.java | 4 +-
.../geode/internal/cache/TXStateProxyImpl.java | 8 +-
.../cache/tier/sockets/CacheClientProxy.java | 8 +-
.../pdx/internal/PeerTypeRegistration.java | 2 +-
.../org/apache/geode/TXExpiryJUnitTest.java | 2 +-
.../test/java/org/apache/geode/TXJUnitTest.java | 98 +++---
.../geode/cache30/MultiVMRegionTestCase.java | 6 +-
.../cache/ClientServerTransactionDUnitTest.java | 12 +-
.../internal/cache/GemFireCacheImplTest.java | 23 --
.../cache/RemoteTransactionDUnitTest.java | 50 +--
.../cache/TransactionsWithDeltaDUnitTest.java | 2 +-
.../cache/execute/MyTransactionFunction.java | 8 +-
.../cli/commands/ExportLogsDUnitTest.java | 2 +-
.../ExportLogsWithMemberGroupDUnitTest.java | 144 ++++++++
geode-pulse/build.gradle | 3 +
.../tools/pulse/internal/PulseAppListener.java | 108 ++----
.../controllers/ExceptionHandlingAdvice.java | 7 +-
.../internal/controllers/PulseController.java | 65 +---
.../tools/pulse/internal/data/Cluster.java | 61 +---
.../tools/pulse/internal/data/DataBrowser.java | 33 +-
.../pulse/internal/data/JMXDataUpdater.java | 350 +++++++------------
.../pulse/internal/data/JmxManagerFinder.java | 3 -
.../tools/pulse/internal/data/PulseConfig.java | 2 +-
.../pulse/internal/data/PulseConstants.java | 4 +-
.../tools/pulse/internal/data/Repository.java | 20 +-
.../tools/pulse/internal/log/LogWriter.java | 245 -------------
.../pulse/internal/log/MessageFormatter.java | 98 ------
.../pulse/internal/log/PulseLogWriter.java | 284 ---------------
.../tools/pulse/internal/log/PulseLogger.java | 139 --------
.../security/GemFireAuthentication.java | 3 -
.../security/GemFireAuthenticationProvider.java | 11 +-
.../pulse/internal/security/LogoutHandler.java | 9 +-
.../service/ClusterSelectedRegionService.java | 7 +-
.../ClusterSelectedRegionsMemberService.java | 26 +-
.../pulse/testbed/PropMockDataUpdater.java | 9 +-
45 files changed, 522 insertions(+), 1424 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/4d069fbc/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
----------------------------------------------------------------------