Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-04 | |
|\ | | | | | | | | | Conflicts: tools/doxygen/Doxyfile.core.internal | ||
| * | Merge pull request #1894 from yang-g/create-thread-pool | 2015-06-03 | |
| |\ | | | | | | | Add ability to override default thread pool | ||
| * | | Expose gpr_asprintf and gpr_strdup | 2015-06-03 | |
| | | | |||
| | * | Add ability to override default thread pool | 2015-06-03 | |
| |/ | |||
* | | Merge branch 'count-the-things' into we-dont-need-no-backup | 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 | 2015-06-01 | |
| |\ | |||
* | \ | Merge branch 'but-maybe-i-want-to-poll' into we-dont-need-no-backup | 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 | 2015-05-29 | |
| |\ \ | |||
| | * | | Removing mdctx from the credentials. | 2015-05-29 | |
| | | | | |||
* | | | | Refactor pollset_kick | 2015-05-28 | |
| | | | | | | | | | | | | | | | | | | | | Allow multiple threads to be polling Remove unnecessary windows stubs | ||
| | | * | Initial refactoring and context API changes | 2015-05-26 | |
| | |/ | |||
| * / | Starting on low level changes to support server side authentication. | 2015-05-20 | |
| |/ | |||
* | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-05-19 | |
|\| | |||
| * | Actually removing grpc_http.h from build.json. | 2015-05-18 | |
| | | |||
* | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-05-17 | |
|\| | |||
| * | Merge pull request #1617 from ctiller/force-a-crash-but-then-dont-crash | 2015-05-15 | |
| |\ | | | | | | | Add subprocess GPR API | ||
| | * | Add header to build.json | 2015-05-15 | |
| | | | |||
| * | | GPR_ASSERT is not an expression | 2015-05-15 | |
| | | | |||
| | * | Add subprocess GPR API | 2015-05-15 | |
| |/ | | | | | | | | | | | | | | | Port fling_test to it. This will be used to: - port remaining tests to Windows - enable testing what happens when servers or clients mysteriously disappear | ||
* | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-05-11 | |
|\| | |||
| * | Addressing comments. | 2015-05-08 | |
| | | |||
| * | Merging with master. | 2015-05-08 | |
| |\ | |||
| | * | added csharp generator plugin | 2015-05-07 | |
| | | | |||
| * | | Adding support for per call credentials in core. | 2015-05-07 | |
| |/ | |||
* / | Initial pollset_set design sketch | 2015-05-07 | |
|/ | |||
* | Merge remote-tracking branch 'upstream/master' into stap | 2015-04-29 | |
|\ | |||
* | | Integration of Systemtap (STAP) for profiling. | 2015-04-29 | |
| | | | | | | | | This commit includes a faulty Makefile to be fixed in a follow commit. | ||
| * | Merge github.com:grpc/grpc into one-pass | 2015-04-25 | |
| |\ | |/ |/| | | | | | Conflicts: Makefile | ||
* | | Merge branch 'master' of github.com:grpc/grpc into the-purge-2 | 2015-04-24 | |
|\ \ | | | | | | | | | | | | | Conflicts: include/grpc++/completion_queue.h | ||
| * | | Add the new header to build.json and regenerate projects | 2015-04-24 | |
| | | | |||
* | | | Merge branch 'master' of github.com:grpc/grpc into the-purge-2 | 2015-04-24 | |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/cpp/client/channel.cc vsprojects/vs2010/grpc++.vcxproj vsprojects/vs2013/grpc++.vcxproj.filters | ||
| | * | Merge branch 'batch-metadata' of github.com:ctiller/grpc into one-pass | 2015-04-22 | |
| | |\ | | |/ | |/| | | | | | | | | | | Conflicts: src/core/channel/http_client_filter.c src/core/channel/http_server_filter.c | ||
| | * | stuff | 2015-04-21 | |
| | | | |||
| * | | Merge github.com:google/grpc into batch-metadata | 2015-04-21 | |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile vsprojects/Grpc.mak vsprojects/vs2010/Grpc.mak vsprojects/vs2010/grpc.vcxproj vsprojects/vs2010/grpc.vcxproj.filters vsprojects/vs2010/grpc_test_util.vcxproj vsprojects/vs2010/grpc_unsecure.vcxproj vsprojects/vs2010/grpc_unsecure.vcxproj.filters | ||
| | * | Adding a helpful warning message on top of the Makefile and BUILD file. | 2015-04-21 | |
| | | | |||
| * | | Merge github.com:grpc/grpc into batch-metadata | 2015-04-20 | |
| |\| | |||
| | * | Refactoring of core security to remove the factories. | 2015-04-17 | |
| | | | | | | | | | | | | | | | - Renamed security_context -> security_connector. - Credentials are now responsible for creating their own connectors. | ||
| | * | Avoid generating libs for unknown types. | 2015-04-16 | |
| | | | |||
| * | | Switching to batch oriented metadata passing | 2015-04-16 | |
| |/ | |||
| * | sync and resolve conflict | 2015-04-15 | |
| |\ | |||
| * | | Remove outdated protos | 2015-04-15 | |
| | | | |||
| * | | Further refactor interop_client and server to libraries | 2015-04-13 | |
| | | | |||
| | * | Merge branch 'master' of git://github.com/vjpai/grpc into timers | 2015-04-13 | |
| | |\ | |||
| | | * | Merge remote-tracking branch 'upstream/master' | 2015-04-13 | |
| | | |\ | |||
| | * | | | Stub out precise clock structure from the overall flow of timers.c so that | 2015-04-13 | |
| | | | | | | | | | | | | | | | | | | | | there are no ifdefs in the middle of structures of the main code path | ||
| | * | | | Move files to a new "profiling" directory to better distinguish from census | 2015-04-13 | |
| | |/ / | | | | | | | | | | | | | statistics | ||
| | | * | Update build files | 2015-04-13 | |
| | | | | |||
| | | * | Merge github.com:grpc/grpc into windows-fixes | 2015-04-13 | |
| | | |\ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: BUILD src/core/iomgr/tcp_server.h src/core/iomgr/tcp_server_posix.c src/core/iomgr/tcp_server_windows.c src/core/security/server_secure_chttp2.c src/core/surface/completion_queue.c src/core/surface/completion_queue.h src/core/surface/server.c test/core/end2end/tests/cancel_after_invoke.c test/core/end2end/tests/cancel_test_helpers.h tools/run_tests/tests.json vsprojects/vs2013/Grpc.mak | ||
| | * | | Merge remote-tracking branch 'upstream/master' | 2015-04-13 | |
| | |\ \ | | |/ / | |/| | | |||
| | * | | Merge branch 'timers' of https://github.com/vjpai/grpc into vjpai-timers | 2015-04-13 | |
| |/| | |