| commit | 8379a06f8dddbe99b9f99163111255794eff07b5 | [log] [tgz] |
|---|---|---|
| author | Craig Tiller <craig.tiller@gmail.com> | Tue Jan 20 22:43:32 2015 -0800 |
| committer | Craig Tiller <craig.tiller@gmail.com> | Tue Jan 20 22:43:32 2015 -0800 |
| tree | 4273119573ade442f3cf43671aab8e24b28ee7a1 | |
| parent | 18d4a86982178ff7bbec345a9772184c713cda35 [diff] | |
| parent | 5d19e96f63ebeae7572e2495cfe9f628f74dffc2 [diff] |
Merge branch 'new_invoke_api' of github.com:google/grpc into update-api Conflicts: src/cpp/client/channel.cc src/cpp/stream/stream_context.cc src/cpp/stream/stream_context.h src/php/ext/grpc/call.c test/core/end2end/tests/max_concurrent_streams.c