tree 8e813bb924cfc6de30f9a06508a6acd7df8f9c75
parent 28eac81d9107eea16543613ef01dcecbc6ac4570
parent bd6c9eba5d43ad2d79a84909feef36d22389d636
author Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1530837231 -0400
committer Hector Oswaldo Caballero <hector.caballero@ericsson.com> 1530837231 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Remove use of Thread.sleep
  Use logger built-in format

Change-Id: Id0c679494b7132fc6f21bc820817d0ed1c176802