Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-06-04 |
|\ | | | | | | | | | Conflicts: tools/doxygen/Doxyfile.core.internal | ||
| * | Expose gpr_asprintf and gpr_strdup | Masood Malekghassemi | 2015-06-03 |
| | | |||
* | | Merge branch 'count-the-things' into we-dont-need-no-backup | Craig Tiller | 2015-06-01 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile src/core/iomgr/pollset_posix.c src/core/surface/call.c src/core/surface/channel.c src/core/surface/server.c src/python/src/grpc/_adapter/_low_test.py tools/doxygen/Doxyfile.core.internal | ||
| * | merge with master | Alistair Veitch | 2015-06-01 |
| | | |||
* | | Merge branch 'but-maybe-i-want-to-poll' into we-dont-need-no-backup | Craig Tiller | 2015-05-30 |
|/ | | | | | | | | | | | | Conflicts: Makefile build.json src/core/security/credentials.c src/core/security/credentials.h src/core/surface/call.c test/core/end2end/tests/request_response_with_payload_and_call_creds.c tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.core | ||
* | Merge branch 'master' of github.com:grpc/grpc into server_auth_context | Julien Boeuf | 2015-05-29 |
|\ | |||
| * | fixing doxygen files after merge. | Julien Boeuf | 2015-05-29 |
| | | |||
* | | Merge branch 'master' of github.com:grpc/grpc into server_auth_context | Julien Boeuf | 2015-05-29 |
|\| | |||
| * | Tagging 0.9.1 on master. | Nicolas "Pixel" Noble | 2015-05-30 |
| | | |||
* | | Merge branch 'master' of github.com:grpc/grpc into server_auth_context | Julien Boeuf | 2015-05-29 |
|/ | |||
* | Add doxygen setups for internal documentation | Craig Tiller | 2015-05-29 |