tree 79566e84df4eb5bb558c90cf45b5701cd266523c
parent 85f9e89d8c5e1247261cd59c32c8da40293189f2
parent 9d5ccafb294eb3b863585bff2f2fb928c8d17934
author David Pursehouse <dpursehouse@collab.net> 1585873100 +0900
committer David Pursehouse <dpursehouse@collab.net> 1585873139 +0900

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  e2e-tests: Add JAVA_OPTS support to the framework
  ElasticV{6,7}QueryChangesTest: Add comment about issue 10120

Change-Id: Ic6e1de59325c26568ca23bcf04d4bd0b4b1b27a5