tree 1bfe464c31e0daa9ac03247ab299e8f57e455a97
parent f88c39a52c45933f0196b94e570904383aa865ec
parent 7b1df75e6efbdf4202628ec2e3f9117c559d170d
author Hugo Arès <hugo.ares@ericsson.com> 1505414622 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1505414830 -0400

Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Fix minor nits in documentation of replication.maxRetries
  Fix replication retries when maxRetries is set to 0
  Set max retries to avoid queue congestion

Change-Id: Icf972f3df7d3d59925db670bc1f033028306d0c1