Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into makefile-cleanup | 2016-01-28 | |
|\ | | | | | | | | | | | Conflicts: Makefile templates/Makefile.template | ||
* | | CFLAGS and CXXFLAGS should be specializations of CPPFLAGS, not the over way ↵ | 2016-01-28 | |
| | | | | | | | | around. | ||
* | | Moving some config defaults to build.yaml, and moving others to CPPFLAGS. | 2016-01-28 | |
| | | |||
| * | Merge github.com:grpc/grpc into things_be_slow | 2016-01-27 | |
| |\ | |/ |/| | |||
| * | Reduce CPU, increase MSAN timeouts | 2016-01-27 | |
| | | |||
* | | Merge pull request #4877 from murgatroid99/node_library_bundle | 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 | 2016-01-25 | |
|\ \ | |||
| | * | Make Node library depend on BoringSSL and zlib, and only build them under ↵ | 2016-01-25 | |
| |/ | | | | | | | Windows | ||
| * | Integrate zlib into Python distribution | 2016-01-22 | |
| | | |||
| * | Merge pull request #4750 from a-veitch/tag_set | 2016-01-22 | |
| |\ | | | | | | | Census Tag Set API and implementation | ||
* | | | bump core version to 0.13 | 2016-01-22 | |
|/ / | |||
* | | Merge pull request #4802 from jtattermusch/integrate_0_12_changes | 2016-01-21 | |
|\ \ | | | | | | | Integrate changes from release-0_12 branch back to master. | ||
* | | | Add some time dilation for ASAN builds | 2016-01-21 | |
| | | | |||
| * | | Merge remote-tracking branch 'upstream/release-0_12' into integrate_0_12_changes | 2016-01-20 | |
| |\ \ | |||
* | | | | Move build configs into build.yaml | 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 | 2016-01-20 | |
| | | | |||
* | | | Tweak cpu costs | 2016-01-20 | |
| | | | |||
* | | | Add CPU cost measurement, tune parameters, decrease default maxjobs | 2016-01-20 | |
| | | | |||
* | | | Use CPU cost modelling to increase parallelism | 2016-01-20 | |
| | | | |||
| | * | Merge branch 'master' into tag_set | 2016-01-15 | |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #4696 from jtattermusch/win_static_deps | 2016-01-15 | |
|\ \ \ | | | | | | | | | Link grpc_csharp_ext dependencies on Windows statically | ||
* \ \ \ | Merge pull request #4688 from jtattermusch/static_deps | 2016-01-15 | |
|\ \ \ \ | | | | | | | | | | | Statically link dependencies of grpc_csharp_ext | ||
* \ \ \ \ | Merge pull request #4653 from murgatroid99/release-0_12_master_merge | 2016-01-14 | |
|\ \ \ \ \ | | | | | | | | | | | | | Release 0 12 master merge | ||
| | | | * | | Re-ordering interdependent proto files. | 2016-01-14 | |
| | | | | | | |||
* | | | | | | Merge branch 'master' into bbuf | 2016-01-13 | |
|\ \ \ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'master' into release-0_12_master_merge | 2016-01-13 | |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | | | | | * | Move encode/decode API into census.h | 2016-01-13 | |
| | | | | | | | |||
| | | | | | * | Merge branch 'master' into tag_set | 2016-01-12 | |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| | | | | | * | initial commit | 2016-01-12 | |
| | | | | | | | |||
| | | | * | | | change openssl linkage on windows to static | 2016-01-12 | |
| | | |/ / / | |||
| | | * | | | support static linkage for dependencies | 2016-01-12 | |
| | | | | | | |||
| * | | | | | Merge pull request #4457 from soltanmm/plate-tectonics | 2016-01-12 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Include core in Python distribution. | ||
| | * | | | | Use BoringSSL for Python gRPC | 2016-01-11 | |
| | | | | | | |||
* | | | | | | Merge branch 'master' into bbuf | 2016-01-11 | |
|\| | | | | | |||
* | | | | | | Merge branch 'master' into bbuf | 2016-01-11 | |
|\ \ \ \ \ \ | |||
* | | | | | | | Generic test | 2016-01-11 | |
| |_|_|_|_|/ |/| | | | | | |||
| | | | * | | Merged from master and resolved merge conflicts | 2016-01-08 | |
| | | | |\ \ | | |_|_|/ / | |/| | | / | | | | |/ | |||
| | | * / | Include core in Python distribution | 2016-01-07 | |
| | |/ / | |/| | | |||
| | * | | Merge github.com:grpc/grpc into proto_names | 2016-01-06 | |
| | |\ \ | | |/ / | |/| | | |||
| | | * | Expose core metadata validation functions in public headers | 2016-01-06 | |
| | | | | |||
| * | | | Add a test that public headers compile as C99 | 2016-01-04 | |
|/ / / | |||
| * | | Merge branch 'yawn' into proto_names | 2015-12-22 | |
| |\ \ | |/ / |/| | | |||
* | | | BoringSSL integration: non-vsprojects changes | 2015-12-22 | |
| |/ |/| | |||
| * | Consolidate C++ proto files under src/proto | 2015-12-17 | |
|/ | | | | | | - make the directory structure match the package structure - sanitize the package structure (test --> testing) - add auto-detection of proto file dependencies | ||
* | Merge pull request #4438 from nicolasnoble/json-coverage-2 | 2015-12-11 | |
|\ | | | | | Increasing json code coverage. | ||
| * | Increasing json code coverage. | 2015-12-12 | |
| | | |||
* | | Merge pull request #4430 from ctiller/dns | 2015-12-11 | |
|\ \ | | | | | | | Add dns resolver test | ||
* \ \ | Merge pull request #4381 from dgquintas/compression_coverage_2 | 2015-12-11 | |
|\ \ \ | | | | | | | | | Further coverage for compression | ||
* \ \ \ | Merge pull request #4426 from ctiller/socketutils | 2015-12-11 | |
|\ \ \ \ | | | | | | | | | | | Add iomgr socket_utils and sockaddr_utils tests | ||
| | * | | | Done! | 2015-12-11 | |
| | | | | |