tree d758b42115daf740c6922572e576b493f6217253
parent 527c1460be929321ccdc0686768e07b185726d40
parent e371eecc9708b7ae366aaff065a3534cb3712ce7
author Marco Miller <marco.miller@ericsson.com> 1572460769 -0400
committer Marco Miller <marco.miller@ericsson.com> 1572460785 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Sort .gitignore using LC_COLLATE=C sort
  Bump Bazel version to 1.1.0
  Add src/test/docker/pgdata to .gitignore

Change-Id: I2c081c5f3f96d6215d2b47d4eb442536e605e0f1