tree 2a8c3d436f9c9748e83a254b2704a02fa8f34a5d
parent 34076d0ec84d2cc897a2a8f2ec8b44504133e8a8
parent 147e06cf17bd7c10198d44115dd3e939e70092db
author Marco Miller <marco.miller@ericsson.com> 1601391372 -0400
committer Marco Miller <marco.miller@ericsson.com> 1601391661 -0400

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Elasticsearch: Remove support for EOL 6.7 version
  Update the recommended buildifier version to 3.5.0
  Remove unused Documentation/config-login-register.txt

From this branch, the downstream dev-contributing.txt content moved to
dev-crafting-changes.txt.

Change-Id: I2578843a42f29e09f90ee2918bd5206e3dd273db