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:05 UTC
[6/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/98c56f6e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/98c56f6e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/98c56f6e
Branch: refs/heads/feature/GEODE-2097
Commit: 98c56f6e0e6be30fb9e344f9cd846eb03bcdd640
Parents: 9bbf461 2bf910a
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Apr 11 16:56:03 2017 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Apr 11 16:56:03 2017 -0700
----------------------------------------------------------------------
README.md | 14 +--
.../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 +-
.../internal/cli/i18n/CliStrings.java | 11 ++-
.../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 | 27 ++++++
.../cache/RemoteTransactionDUnitTest.java | 50 +++++-----
.../cache/TransactionsWithDeltaDUnitTest.java | 2 +-
.../cache/execute/MyTransactionFunction.java | 8 +-
.../cli/commands/golden-help-offline.properties | 12 +--
24 files changed, 212 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/98c56f6e/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
----------------------------------------------------------------------