Commit Graph

9 Commits

Author SHA1 Message Date
Alexander Polcyn f5521c33f9 Revert "Merge branch 'master' into v1.3.x"
This reverts commit 79759fea1a, reversing
changes made to dc36f4df6a.
2017-04-26 14:18:39 -07:00
Craig Tiller ee880fd373 Merge github.com:grpc/grpc into count_now 2017-04-21 15:43:27 -07:00
Nicolas "Pixel" Noble ddab452096 Merge branch 'master' of https://github.com/grpc/grpc into cpp_bazelness 2017-03-22 18:30:44 +01:00
Craig Tiller e1523e95c1 Track calls to gpr_now() 2017-03-14 21:10:42 -07:00
Craig Tiller a08b11f33a Dont track allocations if we are not going to use them 2017-03-10 20:34:08 -08:00
Craig Tiller af11581260 Merge github.com:grpc/grpc into cpp_bazelness 2017-03-09 15:09:34 -08:00
Craig Tiller 71c286466a Dont use memory counters unless counters mode is on 2017-03-09 08:03:27 -08:00
Craig Tiller f09ec59222 Fix mac build 2017-03-03 16:52:37 -08:00
Craig Tiller 5e3215338f Move helpers to a common place, use them everywhere 2017-03-03 08:50:25 -08:00