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 | |
| | | | |||
* | | | Removing Makefile circular dependencies. | 2016-01-27 | |
| | | | |||
| | * | Merge github.com:grpc/grpc into mwah | 2016-01-27 | |
| | |\ | |_|/ |/| | | |||
* | | | Finally fixing the issue with CC, CX, LD, and AR not being overridable from ↵ | 2016-01-27 | |
| | | | | | | | | | | | | the environment. | ||
* | | | Cleaning up our Makefile. | 2016-01-26 | |
|/ / | | | | | | | | | -) Adding question marks to important tools so they can be overriden from environment variables. -) Removing all traces of -ldl since BoringSSL doesn't implement OpenSSL's DSO and doesn't require it. | ||
| * | Merge branch 'mwah' of github.com:ctiller/grpc into mwah | 2016-01-25 | |
| |\ | |||
| * \ | Merge github.com:grpc/grpc into mwah | 2016-01-25 | |
| |\ \ | |/ / |/| | | |||
* | | | Merge remote-tracking branch 'upstream/master' into bump_version_0_13 | 2016-01-25 | |
|\ \ \ | |||
| | | * | Fix compiler flags | 2016-01-25 | |
| | |/ | |||
| | * | Fix *SAN compilation | 2016-01-25 | |
| | | | |||
| | * | Fix a build error on newer clangs with msan | 2016-01-25 | |
| |/ | |||
| * | Merge pull request #4750 from a-veitch/tag_set | 2016-01-22 | |
| |\ | | | | | | | Census Tag Set API and implementation | ||
* | | | regenerate projects | 2016-01-22 | |
|/ / | |||
* | | Merge pull request #4812 from ctiller/integrate-zlib | 2016-01-22 | |
|\ \ | | | | | | | Make zlib a first class build citizen | ||
* \ \ | 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 | |
| | | | | |||
| | * | | Make zlib a first class build citizen | 2016-01-21 | |
| | | | | |||
| * | | | Merge remote-tracking branch 'upstream/release-0_12' into integrate_0_12_changes | 2016-01-20 | |
| |\ \ \ | | |/ / | |/| | | |||
* | | | | Fix C++ | 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. | ||
| | * | Merge branch 'master' into tag_set | 2016-01-15 | |
| | |\ | |_|/ |/| | | |||
* | | | Fix TSAN on Jenkins and on my machine | 2016-01-15 | |
| | | | |||
* | | | Merge pull request #4739 from ctiller/fix-the-fscking-tsan-build | 2016-01-15 | |
|\ \ \ | | | | | | | | | Hard code text segment address for msan, tsan | ||
* \ \ \ | Merge pull request #4688 from jtattermusch/static_deps | 2016-01-15 | |
|\ \ \ \ | | | | | | | | | | | Statically link dependencies of grpc_csharp_ext | ||
| | * | | | Hard code text segment address for msan, tsan | 2016-01-15 | |
| | | | | | | | | | | | | | | | | | | | | Somehow these are getting loaded at bad addresses by whatever kernels we have on our Jenkins slaves. Fix the load address to something safe to avoid this. | ||
* | | | | | 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 | |
| | | | | | |||
* | | | | | Regen projects | 2016-01-13 | |
| | | | | | |||
* | | | | | 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 | |
| | | | | | | |||
| | | * | | | regenerate makefile | 2016-01-12 | |
| | | | | | | |||
| * | | | | | Updated copyrights | 2016-01-12 | |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'master' into bbuf | 2016-01-11 | |
|\| | | | | |||
* | | | | | Merge branch 'master' into bbuf | 2016-01-11 | |
|\ \ \ \ \ | |||
* | | | | | | Fix bugs and include build files | 2016-01-11 | |
| | | | | | | |||
| | | * | | | Update after cloning boringssl | 2016-01-08 | |
| | | | | | | |||
| | | * | | | Merged from master and resolved merge conflicts | 2016-01-08 | |
| | | |\ \ \ | | |_|/ / / | |/| | / / | | | |/ / | |||
| | * | | | Merge github.com:grpc/grpc into proto_names | 2016-01-07 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #4616 from ctiller/i-like-pie | 2016-01-07 | |
| |\ \ \ \ | | | | | | | | | | | | | Tweak compiler settings to hopefully make Jenkins more robust | ||
| * | | | | | Fixes | 2016-01-06 | |
| | | | | | | |||
| | | * | | | Merge github.com:grpc/grpc into proto_names | 2016-01-06 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | | | * | | Expose core metadata validation functions in public headers | 2016-01-06 | |
| | | | | | | |||
| * | | | | | Merge pull request #4589 from ctiller/enforcer | 2016-01-06 | |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Add a test to ensure public core headers are C89 |