diff options
author | Yuchen Zeng <zyc@google.com> | 2016-08-17 19:05:25 -0700 |
---|---|---|
committer | Yuchen Zeng <zyc@google.com> | 2016-08-17 19:05:25 -0700 |
commit | 676b6cbc109459aa676d5f7e708e8ed4524450b1 (patch) | |
tree | 421262eac5283d15d20f852a70cf60d4cd8a7ab9 /.gitmodules | |
parent | 15141a630dffa4295e831b5a0159ec8a15105a8e (diff) | |
parent | 5c648dc537121d8ffffbdcf972bb499d47eba000 (diff) |
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 43e6447a69..12956229c6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,3 +21,6 @@ path = third_party/c-ares url = https://github.com/c-ares/c-ares.git branch = cares-1_11_0 +[submodule "third_party/thrift"] + path = third_party/thrift + url = https://github.com/apache/thrift.git |