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 2016/09/13 19:12:23 UTC
[36/50] [abbrv] incubator-geode git commit: Merge branch 'develop'
into feature/GEODE-420
Merge branch 'develop' into feature/GEODE-420
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a97ea4ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a97ea4ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a97ea4ee
Branch: refs/heads/develop
Commit: a97ea4ee5f9fd6d3ff9b0e955315d647cc697b4e
Parents: c8c2bdd 331cf28
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Sep 1 04:37:30 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Sep 1 04:37:30 2016 +1000
----------------------------------------------------------------------
.../membership/gms/interfaces/Messenger.java | 6 +-
.../gemfire/internal/cache/ExpiryTask.java | 4 +
.../internal/cache/GemFireCacheImpl.java | 16 +-
.../gemfire/internal/cache/LocalRegion.java | 7 +-
.../com/gemstone/gemfire/TXExpiryJUnitTest.java | 4 +
.../cache30/ClientServerCCEDUnitTest.java | 1350 +++++++++---------
.../gemfire/cache30/RegionTestCase.java | 57 +-
7 files changed, 787 insertions(+), 657 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a97ea4ee/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------