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
@@ -1,5 +1,13 @@
 ---
+<<<<<<< HEAD
 reviewers:
+||||||| merged common ancestors
+approvers:
+- crassirostris
+=======
+reviewers:
+- crassirostris
+>>>>>>> merge master to 1.10, with fixes (#7682)
 - piosz
 - x13n
 title: Events in Stackdriver