tree c93177d60152243e552d2a416586f15d6245d134
parent 742c52e92a738f9ade4c4f99289a6dce4a0c93ee
parent 612977a9b825c9ed0186605aa79eb105ee2b2ad2
author Hugo Arès <hugo.ares@ericsson.com> 1493375271 +0200
committer Hugo Arès <hugo.ares@ericsson.com> 1493375291 +0200

Merge branch 'stable-2.13'

* stable-2.13:
  Don't perform REST calls when remote PeerInfo not available
  Set the timeout in CacheEvictionIT back to 5 seconds

Change-Id: Iaf0ecd2cc5cb565197aa036a561e8b213bd0d972