Merge branch 'master' into jlx201811031619

evanphx · Nov 17, 2018 · 6159bab · 6159bab
2 parents 0094e05 + ec2e767
commit 6159bab
Show file tree

Hide file tree

Showing 2,701 changed files with 88,157 additions and 39,491 deletions.
diff --git a/.gitignore b/.gitignore
@@ -127,3 +127,6 @@ zz_generated_*_test.go
 
 /bazel-*
 *.pyc
+
+# generated by verify-godeps.sh
+vendordiff.patch
diff --git a/CHANGELOG-1.10.md b/CHANGELOG-1.10.md