[sling-org-apache-sling-discovery-oak] 01/01: Merge pull request #1 from stefan-egli/master

[stefanegli]

This is an automated email from the ASF dual-hosted git repository.

stefanegli pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git

commit b7c88faeb2a1ff0914f5fea2f955fb85baf1397f
Merge: 052e4f9 9432b1c
Author: stefan-egli <stefane...@apache.org>
AuthorDate: Tue Aug 28 11:37:25 2018 +0200

    Merge pull request #1 from stefan-egli/master
    
    SLING-7830 : introduce invertLeaderElectionPrefixOrder and leaderElec…

 .../org/apache/sling/discovery/oak/Config.java     | 29 +++++++++
 .../oak/cluster/OakClusterViewService.java         | 69 +++++++++++++++++++---
 .../sling/discovery/oak/pinger/OakViewChecker.java |  2 +-
 .../discovery/oak/OakDiscoveryServiceTest.java     | 51 ++++++++++++++++
 .../oak/its/setup/OakVirtualInstanceBuilder.java   |  2 +-
 5 files changed, 143 insertions(+), 10 deletions(-)