Merge pull request grpc#1 from grpc/master

merge
SouthStar · Aug 25, 2016 · ed96de4 · ed96de4
2 parents 5e193cb + 19ea0cf
commit ed96de4
Show file tree

Hide file tree

Showing 253 changed files with 11,995 additions and 3,333 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 # C/C++ build outputs
+.build/
 bins
 gens
 libs

diff --git a/.gitmodules b/.gitmodules
@@ -4,7 +4,7 @@
 [submodule "third_party/protobuf"]
 	path = third_party/protobuf
 	url = https://github.com/google/protobuf.git
-	branch = 3.0.0-beta-3
+	branch = 3.0.0-GA
 [submodule "third_party/gflags"]
 	path = third_party/gflags
 	url = https://github.com/gflags/gflags.git
@@ -17,3 +17,6 @@
 [submodule "third_party/nanopb"]
 	path = third_party/nanopb
 	url = https://github.com/nanopb/nanopb.git
+[submodule "third_party/thrift"]
+	path = third_party/thrift
+	url = https://github.com/apache/thrift.git
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     # C/C++ build outputs
+    .build/
     bins
     gens
     libs
@@ Expand Down @@