tree e35573c594a2a36fc0b8666441e56c787be52618
parent 40e611307bc1d04fba9f55af01e166e094fd7f25
parent 84ec35f64c0d93584284f81add61c106e04dfac6
author Marco Miller <marco.miller@ericsson.com> 1568756130 -0400
committer Marco Miller <marco.miller@ericsson.com> 1568756133 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Documentation: Fix the default peerInfo strategy
  Switch required bazel version to 0.29.1
  Make build tests name consistent with stable-2.15

Change-Id: Ia3efc6ebfba69060f6f1bf6201e4d8aa53624280