You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2015/07/28 01:20:07 UTC

[44/50] [abbrv] incubator-geode git commit: Merge branch 'feature/GEODE-148' into develop

Merge branch 'feature/GEODE-148' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9d794955
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9d794955
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9d794955

Branch: refs/heads/feature/GEODE-77
Commit: 9d7949555fce852b10d0b2e023a578aa446ea23a
Parents: 3bfee73 62d010d
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Fri Jul 24 11:45:53 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Fri Jul 24 11:45:53 2015 -0700

----------------------------------------------------------------------
 .../gemfire/internal/cache/AbstractRegion.java  |   2 +-
 .../gemfire/internal/cache/ExpiryTask.java      |   6 +-
 .../gemfire/internal/cache/LocalRegion.java     |  14 +
 .../internal/cache/PartitionedRegion.java       |   8 +
 .../internal/cache/RegionIdleExpiryTask.java    |   2 +-
 .../internal/cache/RegionTTLExpiryTask.java     |   2 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  | 102 +--
 .../gemfire/cache30/RegionTestCase.java         | 626 +++++++------------
 .../test/java/dunit/DistributedTestCase.java    |  11 +
 9 files changed, 310 insertions(+), 463 deletions(-)
----------------------------------------------------------------------