Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | | * | Merge github.com:grpc/grpc into bye-bye-completion-queue-pie | Craig Tiller | 2015-05-08 | |
| | | | | |\ | | | |_|_|/ | | |/| | | | ||||
| | * | | | | Addressing comments. | Julien Boeuf | 2015-05-08 | |
| | | | | | | ||||
| | * | | | | Merging with master. | Julien Boeuf | 2015-05-08 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||
| | | | * | | Merge github.com:grpc/grpc into the-churnening | Craig Tiller | 2015-05-08 | |
| | | | |\ \ | | |_|_|/ / | |/| | | | | ||||
| | | * | | | Merge github.com:grpc/grpc into all-the-small-things | Craig Tiller | 2015-05-08 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | ||||
| * | | | | | Merge pull request #1519 from jtattermusch/csharp_protoc_plugin | Michael Lumish | 2015-05-08 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | C# gRPC protoc plugin | |||
| | | | | | * | Merge github.com:grpc/grpc into bye-bye-completion-queue-pie | Craig Tiller | 2015-05-08 | |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | ||||
| * | | | | | | Merge branch 'standalone_benchmarks' of https://github.com/dgquintas/grpc ↵ | Craig Tiller | 2015-05-08 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into dgquintas-standalone_benchmarks | |||
| * \ \ \ \ \ \ | Merge branch 'yang-g-mock' | Craig Tiller | 2015-05-08 | |
| |\ \ \ \ \ \ \ | ||||
| | | | | | * \ \ | Merge github.com:grpc/grpc into all-the-small-things | Craig Tiller | 2015-05-08 | |
| | | | | | |\ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||
| * | | | | | | | | Flagging the QPS binaries as tools, instead of non-runnable tests. | Nicolas Noble | 2015-05-07 | |
| | | | | | | | | | ||||
| | | | * | | | | | added csharp generator plugin | Jan Tattermusch | 2015-05-07 | |
| | |_|/ / / / / | |/| | | | | | | ||||
| | | | * | | | | Adding support for per call credentials in core. | Julien Boeuf | 2015-05-07 | |
| | |_|/ / / / | |/| | | | | | ||||
| | | | | * | | Lose redundant tag on unary calls | Craig Tiller | 2015-05-06 | |
| | |_|_|/ / | |/| | | | | ||||
| | | | * | | Split thread stress from end2end to improve parallelism | Craig Tiller | 2015-05-06 | |
| | |_|/ / | |/| | | | ||||
| | | * | | Split C++'s smoke_test into 4 stand alone ones. | David Garcia Quintas | 2015-05-05 | |
| | |/ / | |/| | | ||||
| | * | | add a test using the mock interfaces | Yang Gao | 2015-05-05 | |
| |/ / | ||||
| | * | Bump version | Craig Tiller | 2015-05-04 | |
| |/ | ||||
* | | Merge branch 'master' into poisson | vjpai | 2015-05-01 | |
|\| | ||||
* | | Merge branch 'master' into poisson | Vijay Pai | 2015-04-30 | |
|\ \ | ||||
| | * | Bump version | Craig Tiller | 2015-04-30 | |
| | | | ||||
| | * | Merge github.com:grpc/grpc into delete-the-old-api | Craig Tiller | 2015-04-30 | |
| | |\ | | |/ | |/| | ||||
| | * | Kill echo test | Craig Tiller | 2015-04-29 | |
| | | | ||||
| * | | Merge remote-tracking branch 'upstream/master' into stap | David Garcia Quintas | 2015-04-29 | |
| |\| | ||||
* | | | Merge branch 'master' into poisson | Vijay Pai | 2015-04-29 | |
|\ \ \ | | |/ | |/| | ||||
| | * | Integration of Systemtap (STAP) for profiling. | David Garcia Quintas | 2015-04-29 | |
| | | | | | | | | | | | | This commit includes a faulty Makefile to be fixed in a follow commit. | |||
* | | | Merge branch 'poisson' of git://github.com/vjpai/grpc into vjpai-poisson | vjpai | 2015-04-27 | |
|\ \ \ | |_|/ |/| | | | | | | | | Conflicts: Makefile | |||
| | * | Merge github.com:grpc/grpc into one-pass | Craig Tiller | 2015-04-25 | |
| | |\ | |_|/ |/| | | | | | | | | Conflicts: Makefile | |||
* | | | Merge pull request #1227 from nicolasnoble/the-purge-2 | Craig Tiller | 2015-04-24 | |
|\ \ \ | | | | | | | | | Refactoring std::chrono out. | |||
* \ \ \ | Merge pull request #1360 from nicolasnoble/flakes | Yang Gao | 2015-04-24 | |
|\ \ \ \ | | | | | | | | | | | Flagging some tests as flaky. | |||
| | * \ \ | Merge branch 'master' of github.com:grpc/grpc into the-purge-2 | Nicolas "Pixel" Noble | 2015-04-24 | |
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Conflicts: include/grpc++/completion_queue.h | |||
* | | | | | Add the new header to build.json and regenerate projects | Yang Gao | 2015-04-24 | |
| | | | | | ||||
| * | | | | Flagging a few census tests as flaky. | Nicolas "Pixel" Noble | 2015-04-24 | |
|/ / / / | ||||
| | | * | Merge github.com:grpc/grpc into one-pass | Craig Tiller | 2015-04-23 | |
| | | |\ | |_|_|/ |/| | | | | | | | | | | | Conflicts: Makefile | |||
| * | | | Merge branch 'master' of github.com:grpc/grpc into the-purge-2 | Nicolas "Pixel" Noble | 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. | Nicolas "Pixel" Noble | 2015-04-23 | |
| | | | | ||||
| | | * | Merge github.com:google/grpc into one-pass | Craig Tiller | 2015-04-22 | |
| | | |\ | |_|_|/ |/| | | | ||||
* | | | | Merge pull request #1339 from nicolasnoble/template-doc | Craig Tiller | 2015-04-22 | |
|\ \ \ \ | | | | | | | | | | | Adding some documentation about the build/template system. | |||
| * | | | | Supporting comments in build-cleaner. | Nicolas "Pixel" Noble | 2015-04-22 | |
| | | | | | ||||
| | | | * | Merge branch 'batch-metadata' of github.com:ctiller/grpc into one-pass | Craig Tiller | 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. | Nicolas "Pixel" Noble | 2015-04-22 | |
| | | | | | ||||
| | | | * | stuff | Craig Tiller | 2015-04-21 | |
| | | | | | ||||
* | | | | | Merge github.com:google/grpc into batch-metadata | Craig Tiller | 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 | |||
| | | * | Random number distributions and test for common distributions | vjpai | 2015-04-21 | |
| | | | | ||||
| * | | | Fixing dependencies. | Nicolas "Pixel" Noble | 2015-04-21 | |
| | | | | ||||
* | | | | Merge github.com:grpc/grpc into batch-metadata | Craig Tiller | 2015-04-20 | |
|\| | | | ||||
| * | | | Merge pull request #1315 from jboeuf/security_connector | Craig Tiller | 2015-04-19 | |
| |\ \ \ | | | | | | | | | | | Refactoring of core security to remove the factories. | |||
| | * | | | Refactoring of core security to remove the factories. | Julien Boeuf | 2015-04-17 | |
| | | |/ | | |/| | | | | | | | | | | | | | - Renamed security_context -> security_connector. - Credentials are now responsible for creating their own connectors. | |||
| * / | | Fixing dependency... | Nicolas "Pixel" Noble | 2015-04-18 | |
| |/ / | ||||
| * | | Move .proto files up for reuse | Abhishek Kumar | 2015-04-16 | |
| | | |