diff options
| author |  Mark D. Roth <roth@google.com> | 2016-12-08 14:27:56 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-12-08 14:27:56 -0800 |
| commit | 3c1cd531870c9bd047cf9cf507c9abdf69882634 (patch) | |
| tree | e6472585ab09cb4f14dcde2aaddcaf4b2b79d54e /.gitmodules | |
| parent | 3059828bf6129d6ecb6ce705347fc43e0affa209 (diff) | |
| parent | ad13e597e5664391589d3100efbe8337fad557b2 (diff) | |
Merge remote-tracking branch 'upstream/master' into handshaker_early_exit
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index c32881cb95..04d155cfb4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,6 +17,6 @@ [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 |