tree 0c7764b33b0e0aa9f762d6bcc88f7bff42643483
parent 1fda499fea1052fc7accf96f32a3bb89718a0e0e
parent af5edf6047f2a730c5a9fbc6b08dad6edba21dab
author David Pursehouse <david.pursehouse@sonymobile.com> 1444883237 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1444883237 +0900

Merge branch 'stable-2.11'

* stable-2.11:
  Add waiting time and number of retries to replication log

Change-Id: If98f8917071715b0d5823a0afa8ceee82c8be723