Merge branch 'master' into release-0_11

Conflicts: .gitignore gRPC.podspec
cj525 · Oct 16, 2015 · 7aa1f82 · 7aa1f82
2 parents 432ca59 + ff46610
commit 7aa1f82
Show file tree

Hide file tree

Showing 4,619 changed files with 40,188 additions and 427,360 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ objs
 python*_virtual_environment
 
 # gcov coverage data
+reports
 coverage
 *.gcno
 
@@ -36,10 +37,15 @@ cache.mk
 
 # Temporary test reports
 report.xml
+latency_trace.txt
 
 # port server log
 portlog.txt
 
+# gyp generated make files
+*-gyp.mk
+out
+
 # XCode
 build/
 *.pbxuser

diff --git a/.istanbul.yml b/.istanbul.yml
@@ -0,0 +1,6 @@
+reporting:
+    watermarks:
+        statements: [80, 95]
+        lines: [80, 95]
+        functions: [80, 95]
+        branches: [80, 95]