merge master to 1.10, with fixes (#7682)

2018-03-08 14:03:55 -05:00
parent 7f40782850
commit 3d79703d23
60 changed files with 26896 additions and 762 deletions
@@ -90,8 +90,13 @@ aliases:
    - bradamant3
    - steveperry-53
    - zacharysarah
+<<<<<<< HEAD
    - bradtopol
    - heckj
+||||||| merged common ancestors
+=======
+    - bradtopol
+>>>>>>> merge master to 1.10, with fixes (#7682)
  sig-federation: #Team: Federation; e.g. Federated Clusters
    - csbell
  sig-gcp: #Google Cloud Platform; GH: sig-gcp-pr-reviews