Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Bump version | 2015-04-30 | |
| | |||
* | Merge github.com:grpc/grpc into delete-the-old-api | 2015-04-30 | |
|\ | |||
* | | Kill echo test | 2015-04-29 | |
| | | |||
| * | 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 pull request #1227 from nicolasnoble/the-purge-2 | 2015-04-24 | |
| |\ | | | | | | | Refactoring std::chrono out. | ||
| * \ | Merge pull request #1360 from nicolasnoble/flakes | 2015-04-24 | |
| |\ \ | | | | | | | | | Flagging some tests as flaky. | ||
| | | * | 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 | |
| | | | | |||
| | * | | Flagging a few census tests as flaky. | 2015-04-24 | |
| |/ / | |||
* | | | Merge github.com:grpc/grpc into one-pass | 2015-04-23 | |
|\| | | | | | | | | | | | | | | Conflicts: Makefile | ||
| | * | 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 | ||
| * | | More work in not having to compile OpenSSL. | 2015-04-23 | |
| | | | |||
* | | | Merge github.com:google/grpc into one-pass | 2015-04-22 | |
|\| | | |||
| * | | Merge pull request #1339 from nicolasnoble/template-doc | 2015-04-22 | |
| |\ \ | | | | | | | | | Adding some documentation about the build/template system. | ||
| | * | | Supporting comments in build-cleaner. | 2015-04-22 | |
| | | | | |||
* | | | | 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 | ||
| | * | | Adding some documentation about the build/template system. | 2015-04-22 | |
| | | | | |||
* | | | | 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 | ||
| * | | Fixing dependencies. | 2015-04-21 | |
| | | | |||
* | | | Merge github.com:grpc/grpc into batch-metadata | 2015-04-20 | |
|\| | | |||
| * | | Merge pull request #1315 from jboeuf/security_connector | 2015-04-19 | |
| |\ \ | | | | | | | | | Refactoring of core security to remove the factories. | ||
| | * | | 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. | ||
| * | | | Fixing dependency... | 2015-04-18 | |
| |/ / | |||
| * | | Move .proto files up for reuse | 2015-04-16 | |
| | | | |||
| * | | Moving test.proto to an outer directory so others can depend on it. | 2015-04-16 | |
| | | | |||
* | | | Kill transport end2end tests: not useful | 2015-04-16 | |
| | | | |||
* | | | Switching to batch oriented metadata passing | 2015-04-16 | |
| | | | |||
| * | | Wrap ParseCommandLineFlags in InitTest | 2015-04-15 | |
|/ / | |||
* | | sync and resolve conflict | 2015-04-15 | |
|\ \ | |||
* | | | Remove outdated protos | 2015-04-15 | |
| | | | |||
| * | | Merge pull request #1267 from vjpai/timers | 2015-04-14 | |
| |\ \ | | | | | | | | | Infrastructure for timer insertion, logging, and testing | ||
| * \ \ | Merge pull request #1241 from ctiller/local_worker | 2015-04-14 | |
| |\ \ \ | | | | | | | | | | | Allow RunScenarios to spawn in-process workers | ||
| * \ \ \ | Merge pull request #1272 from yang-g/interop | 2015-04-13 | |
| |\ \ \ \ | |/ / / / |/| | | | | Further refactor interop_client and server to libraries | ||
* | | | | | 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 | ||
| * | | | | 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 | |
| | | |\ \ | |||
| | | | * | | Infrastructure for timer insertion, logging, and testing. | 2015-04-13 | |
| | | | | | | |||
* | | | | | | Merge pull request #1249 from ctiller/tls | 2015-04-10 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Thread local storage for grpc | ||
| | | | | | * | Merge branch 'master' of https://github.com/grpc/grpc into the-purge-2 | 2015-04-11 | |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/cpp/end2end/async_end2end_test.cc test/cpp/end2end/end2end_test.cc test/cpp/interop/client.cc | ||
| | | | | | * | Adjusting build.json. | 2015-04-11 | |
| | | | | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into local_worker | 2015-04-10 | |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #1258 from yang-g/interop | 2015-04-10 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | It turns out I missed an indirect dependency after all in 1244 |