Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-01-28 |
|\ | |||
| * | Merge branch 'master' into makefile-cleanup | Nicolas "Pixel" Noble | 2016-01-28 |
| |\ | | | | | | | | | | | | | | | | Conflicts: Makefile templates/Makefile.template | ||
| * | | CFLAGS and CXXFLAGS should be specializations of CPPFLAGS, not the over way ↵ | Nicolas "Pixel" Noble | 2016-01-28 |
| | | | | | | | | | | | | around. | ||
| * | | Moving some config defaults to build.yaml, and moving others to CPPFLAGS. | Nicolas "Pixel" Noble | 2016-01-28 |
| | | | |||
| | * | Merge github.com:grpc/grpc into things_be_slow | Craig Tiller | 2016-01-27 |
| | |\ | | |/ | |/| | |||
| | * | Reduce CPU, increase MSAN timeouts | Craig Tiller | 2016-01-27 |
| | | | |||
| * | | Merge pull request #4877 from murgatroid99/node_library_bundle | Nicolas Noble | 2016-01-26 |
| |\ \ | | |/ | |/| | Make Node library depend on BoringSSL and zlib, and only build them under Windows | ||
| * | | Merge remote-tracking branch 'upstream/master' into bump_version_0_13 | Jan Tattermusch | 2016-01-25 |
| |\ \ | |||
| | | * | Make Node library depend on BoringSSL and zlib, and only build them under ↵ | murgatroid99 | 2016-01-25 |
| | |/ | | | | | | | | | | Windows | ||
* | | | Get subchannel index working | Craig Tiller | 2016-01-25 |
| | | | |||
* | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-01-25 |
|\ \ \ | | |/ | |/| | |||
* | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-01-22 |
|\ \ \ | |||
| | * | | Integrate zlib into Python distribution | Masood Malekghassemi | 2016-01-22 |
| |/ / | |||
| * | | Merge pull request #4750 from a-veitch/tag_set | Bogdan Drutu | 2016-01-22 |
| |\ \ | | | | | | | | | Census Tag Set API and implementation | ||
| | | * | bump core version to 0.13 | Jan Tattermusch | 2016-01-22 |
| | |/ | |/| | |||
| * | | Merge pull request #4802 from jtattermusch/integrate_0_12_changes | Masood Malekghassemi | 2016-01-21 |
| |\ \ | | | | | | | | | Integrate changes from release-0_12 branch back to master. | ||
| * | | | Add some time dilation for ASAN builds | Craig Tiller | 2016-01-21 |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/release-0_12' into integrate_0_12_changes | Jan Tattermusch | 2016-01-20 |
| | |\ \ | |||
| * | | | | Move build configs into build.yaml | Craig Tiller | 2016-01-20 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Importantly: - allows matching timeout values between makefile and run_tests without repeating ourselves - allows borrowing of compiler flags by other build systems There's still a little too much build configuration built into our Makefile, but we can start attacking that over time. | ||
| * | | | Add C++ CPU costs | Craig Tiller | 2016-01-20 |
| | | | | |||
| * | | | Tweak cpu costs | Craig Tiller | 2016-01-20 |
| | | | | |||
| * | | | Add CPU cost measurement, tune parameters, decrease default maxjobs | Craig Tiller | 2016-01-20 |
| | | | | |||
| * | | | Use CPU cost modelling to increase parallelism | Craig Tiller | 2016-01-20 |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-01-15 |
|\| | | | |||
* | | | | Shared subchannel sketch | Craig Tiller | 2016-01-15 |
| | | | | |||
| | | * | Merge branch 'master' into tag_set | Alistair Veitch | 2016-01-15 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #4696 from jtattermusch/win_static_deps | Nicolas Noble | 2016-01-15 |
| |\ \ \ | | | | | | | | | | | Link grpc_csharp_ext dependencies on Windows statically | ||
| * \ \ \ | Merge pull request #4688 from jtattermusch/static_deps | Nicolas Noble | 2016-01-15 |
| |\ \ \ \ | | | | | | | | | | | | | Statically link dependencies of grpc_csharp_ext | ||
| * \ \ \ \ | Merge pull request #4653 from murgatroid99/release-0_12_master_merge | Craig Tiller | 2016-01-14 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Release 0 12 master merge | ||
| | | | | * | | Re-ordering interdependent proto files. | Nicolas "Pixel" Noble | 2016-01-14 |
| | | | | | | | |||
| * | | | | | | Merge branch 'master' into bbuf | Vijay Pai | 2016-01-13 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||
| | * | | | | | Merge branch 'master' into release-0_12_master_merge | murgatroid99 | 2016-01-13 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
| | | | | | * | Move encode/decode API into census.h | Alistair Veitch | 2016-01-13 |
| | | | | | | | |||
| | | | | | * | Merge branch 'master' into tag_set | Alistair Veitch | 2016-01-12 |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | |||
| | | | | | * | initial commit | Alistair Veitch | 2016-01-12 |
| | | | | | | | |||
| | | | * | | | change openssl linkage on windows to static | Jan Tattermusch | 2016-01-12 |
| | | |/ / / | |||
| | | * | | | support static linkage for dependencies | Jan Tattermusch | 2016-01-12 |
| | | | | | | |||
* | | | | | | Merge pull request #4457 from soltanmm/plate-tectonics | Nathaniel Manista | 2016-01-12 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Include core in Python distribution. | ||
| * | | | | | Use BoringSSL for Python gRPC | Masood Malekghassemi | 2016-01-11 |
| | | | | | | |||
| | * | | | | Merge branch 'master' into bbuf | Vijay Pai | 2016-01-11 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| | * | | | | Merge branch 'master' into bbuf | Vijay Pai | 2016-01-11 |
| | |\ \ \ \ | |||
| | * | | | | | Generic test | vjpai | 2016-01-11 |
| | | |_|_|/ | | |/| | | | |||
| | | | * | | Merged from master and resolved merge conflicts | murgatroid99 | 2016-01-08 |
| | | | |\ \ | | | | |/ / | | | |/| / | | | | |/ | |||
| * | | / | Include core in Python distribution | Masood Malekghassemi | 2016-01-07 |
| | |/ / | |/| | | |||
* | | | | Merge github.com:grpc/grpc into proto_names | Craig Tiller | 2016-01-06 |
|\| | | | |||
| | | * | Expose core metadata validation functions in public headers | murgatroid99 | 2016-01-06 |
| | | | | |||
| * | | | Add a test that public headers compile as C99 | Craig Tiller | 2016-01-04 |
| |/ / | |||
* | | | Merge branch 'yawn' into proto_names | Craig Tiller | 2015-12-22 |
|\| | | |||
| * | | BoringSSL integration: non-vsprojects changes | Craig Tiller | 2015-12-22 |
| |/ | |||
* / | Consolidate C++ proto files under src/proto | Craig Tiller | 2015-12-17 |
|/ | | | | | | - make the directory structure match the package structure - sanitize the package structure (test --> testing) - add auto-detection of proto file dependencies |