Merge branch 'master' into makefile_ruby_version_fixes

coderanger · Jan 17, 2017 · 58233db · 58233db
2 parents c781f64 + 1e27758
commit 58233db
Show file tree

Hide file tree

Showing 757 changed files with 21,474 additions and 11,218 deletions.
diff --git a/.gitignore b/.gitignore
@@ -96,10 +96,17 @@ DerivedData
 Pods/
 
 # Artifacts directory
-artifacts/
+/artifacts/
 
 # Git generated files for conflicting
 *.orig
 
 # IDE specific folder for JetBrains IDEs
 .idea/
+
+# Blaze files
+bazel-bin
+bazel-genfiles
+bazel-grpc
+bazel-out
+bazel-testlogs
diff --git a/.gitmodules b/.gitmodules
@@ -17,6 +17,9 @@
 [submodule "third_party/thrift"]
 	path = third_party/thrift
 	url = https://github.com/apache/thrift.git
-[submodule "third_party/google_benchmark"]
-	path = third_party/google_benchmark
+[submodule "third_party/benchmark"]
+	path = third_party/benchmark
 	url = https://github.com/google/benchmark
+[submodule "third_party/boringssl-with-bazel"]
+	path = third_party/boringssl-with-bazel
+	url = https://boringssl.googlesource.com/boringssl