You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2015/12/28 23:25:44 UTC

[6/6] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-217

Merge remote-tracking branch 'origin/develop' into feature/GEODE-217


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

Branch: refs/heads/feature/GEODE-217
Commit: f65ef9b17e4f12a1fc2cf3451b52ca8d49fa61d2
Parents: 5c6bc89 093ac12
Author: Kirk Lund <kl...@pivotal.io>
Authored: Mon Dec 28 09:12:30 2015 -0800
Committer: Kirk Lund <kl...@pivotal.io>
Committed: Mon Dec 28 09:12:30 2015 -0800

----------------------------------------------------------------------
 .gitignore                                      |   3 +-
 .../gms/mgr/GMSMembershipManager.java           |  24 ++-
 .../internal/process/FileProcessController.java |  39 +++-
 .../distributed/LocatorStateJUnitTest.java      | 208 +++++++++++++++++++
 ...leProcessControllerIntegrationJUnitTest.java | 155 ++++++++++++++
 gradle/rat.gradle                               |   4 +
 6 files changed, 418 insertions(+), 15 deletions(-)
----------------------------------------------------------------------