commit 423547441a96b5397e620e23010561838c784c5b
author David Pursehouse <dpursehouse@collab.net> Mon Jul 22 16:47:29 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Mon Jul 22 16:53:02 2019 +0900
tree a30bd82d19b32becf56017f238f008e5ef5cd36c
parent a3cf8a61980a84ae710b15cb93d9a2a7423d93cf
parent 3b1b656d09eb2dd73f94f50772bbeb39d167b540

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Revert "Remove replication event from pending when runway is allowed"
  ReplicationFileBasedConfig: Fix setting default sshConnectionTimeout
  SshHelper: Add class javadoc
  Make more classes and fields public to ease extensibility
  Allow to configure timeout for SSH connection and commands
  StartCommand:  Fix synchronization on non-final field
  Destination: Suppress FutureReturnValueIgnored warning

Change-Id: I0cbbf0db0bb8d6b44e7f86ec7ad3e0f2067f3a6d