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

.bazelversion

diff --git a/.bazelversion b/.bazelversion
index 3eefcb9..9084fa2 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-1.0.0
+1.1.0

.gitignore

diff --git a/.gitignore b/.gitignore
index 30da2c2..bc98942 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,15 @@
+# LC_COLLATE=C sort
 /.apt_generated/
 /.classpath
+/.primary_build_tool
 /.project
 /.settings/
-/.primary_build_tool
 /bazel-bin
+/bazel-high-availability
 /bazel-out
 /bazel-reviewers
 /bazel-testlogs
-/bazel-high-availability
 /eclipse-out/
+/src/test/docker/gitvolume
+/src/test/docker/pgdata
+/src/test/docker/shareddir