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 2016/05/03 23:52:08 UTC
[19/50] [abbrv] incubator-geode git commit: Merge branch 'develop'
into feature/GEODE-17-2
Merge branch 'develop' into feature/GEODE-17-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7927758a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7927758a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7927758a
Branch: refs/heads/feature/GEODE-1255
Commit: 7927758a12a1a6500ac08ef84957547bf33a305f
Parents: adc885d 9fbcb93
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Tue Apr 26 08:23:52 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Tue Apr 26 08:23:52 2016 -0700
----------------------------------------------------------------------
.../distributed/internal/InternalLocator.java | 6 +-
.../membership/InternalDistributedMember.java | 68 ++++++------
.../internal/membership/NetMember.java | 4 +-
.../internal/membership/gms/GMSMember.java | 36 +++---
.../internal/membership/gms/ServiceConfig.java | 18 +++
.../membership/gms/locator/GMSLocator.java | 2 +-
.../membership/gms/membership/GMSJoinLeave.java | 56 +++-------
.../gms/messenger/JGroupsMessenger.java | 7 +-
.../internal/i18n/ParentLocalizedStrings.java | 2 +-
.../gemfire/distributed/LocatorDUnitTest.java | 110 +++----------------
.../gms/membership/GMSJoinLeaveTestHelper.java | 2 +-
geode-site/website/content/docs/index.html | 2 +-
12 files changed, 111 insertions(+), 202 deletions(-)
----------------------------------------------------------------------