tree ac86f880b7ca6961c309ef034d547dd2ab8d1780
parent b9ed4e7cf152eb9c726b15d1db94a291a4896d45
parent 9658edddbcbf66b5830cfd504cfb25aa31baa173
author David Pursehouse <dpursehouse@collab.net> 1537504481 +0900
committer David Pursehouse <dpursehouse@collab.net> 1537504481 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Set version to 2.14.13
  ElasticContainer: Use Elasticsearch 5.6.12 for V5_6 tests

Change-Id: I65dc172892f6a5217b1db26e9bab288c530aefd0