tree cbb22dd0660904f937f0bbc0573c558cb1b2e8d4
parent 1544be5c58d81dd43378a0bf257124f5e2ae0bfe
parent cdea6c0c2dcb09ff68bf0914a693fa7969e9207e
author David Pursehouse <dpursehouse@collab.net> 1510623556 +0900
committer David Pursehouse <dpursehouse@collab.net> 1510623556 +0900

Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  JGroupsPeerInfoProvider: Fix broken log formatting

Change-Id: I622772dcd31305db13ce488826c1c80e7541bd5f