Merge branch '2.1.x'

Closes gh-17369
2019-06-29 21:52:30 +01:00
parent 6441cdc49d 65b95f0d7b
commit e1394d4b12
1 changed files with 1 additions and 1 deletions
--- a/.bomr/bomr.yaml
+++ b/.bomr/bomr.yaml
@@ -18,7 +18,7 @@ bomr:
          - '[10.15,)'
  verify:
    ignored-dependencies:
-      # Avoid confliciting transitive requirements for
+      # Avoid conflicting transitive requirements for
      # io.grpc:grpc-core:jar:[1.0.1,1.0.1] (Jetty),
      # io.grpc:grpc-core:jar:[1.14.0,1.14.0] (Micrometer's Azure Registry), and
      # io.grpc:grpc-core:jar:[1.15.0,1.15.0] (Micrometer's Stackdriver Registry)