Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-28 |
|\ | |||
* | | Fixed wrong usage of global var | David Garcia Quintas | 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. | ||
* | | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-27 |
|\ \ \ | | |/ | |/| | |||
* | | | DONE!!1one | David Garcia Quintas | 2016-01-27 |
| | | | |||
* | | | After GrpcLibrary refactoring. Compiles and passes. WIP still | David Garcia Quintas | 2016-01-27 |
| | | | |||
| | * | 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 |
| | | | | |||
| | | * | Removing Makefile circular dependencies. | Nicolas "Pixel" Noble | 2016-01-27 |
| | | | | |||
| | * | | Merge github.com:grpc/grpc into mwah | Craig Tiller | 2016-01-27 |
| | |\| | |||
| | | * | Finally fixing the issue with CC, CX, LD, and AR not being overridable from ↵ | Nicolas "Pixel" Noble | 2016-01-27 |
| | | | | | | | | | | | | | | | | the environment. | ||
| | | * | Cleaning up our Makefile. | Nicolas "Pixel" Noble | 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. | ||
* | | | pre sync_stream.cc creation. Does not compile | David Garcia Quintas | 2016-01-25 |
| | | | |||
* | | | async_stream.h done. Compiles | David Garcia Quintas | 2016-01-25 |
| | | | |||
* | | | Further work. Compiles. WIP | David Garcia Quintas | 2016-01-25 |
| | | | |||
| | * | Merge branch 'mwah' of github.com:ctiller/grpc into mwah | Craig Tiller | 2016-01-25 |
| | |\ | |||
| | * \ | Merge github.com:grpc/grpc into mwah | Craig Tiller | 2016-01-25 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge remote-tracking branch 'upstream/master' into bump_version_0_13 | Jan Tattermusch | 2016-01-25 |
| |\ \ \ | |||
* | \ \ \ | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-25 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| | | | * | Fix compiler flags | Craig Tiller | 2016-01-25 |
| | | |/ | |||
| | | * | Fix *SAN compilation | Craig Tiller | 2016-01-25 |
| | | | | |||
| | | * | Fix a build error on newer clangs with msan | Craig Tiller | 2016-01-25 |
| | |/ | |/| | |||
| * | | Merge pull request #4750 from a-veitch/tag_set | Bogdan Drutu | 2016-01-22 |
| |\ \ | | | | | | | | | Census Tag Set API and implementation | ||
| | | * | regenerate projects | Jan Tattermusch | 2016-01-22 |
| | |/ | |/| | |||
| * | | Merge pull request #4812 from ctiller/integrate-zlib | Jan Tattermusch | 2016-01-22 |
| |\ \ | | | | | | | | | Make zlib a first class build citizen | ||
* | | | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-21 |
|\| | | | |||
* | | | | made codegen targets in build.yaml | David Garcia Quintas | 2016-01-21 |
| | | | | |||
| * | | | 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. | ||
* | | | | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-21 |
|\| | | | | |||
| * | | | | Add some time dilation for ASAN builds | Craig Tiller | 2016-01-21 |
| | | | | | |||
| | | * | | Make zlib a first class build citizen | Craig Tiller | 2016-01-21 |
| | | | | | |||
* | | | | | added missing codegen deps for grp | David Garcia Quintas | 2016-01-21 |
| | | | | | |||
* | | | | | Made "codedgen" directories closed over #includes | David Garcia Quintas | 2016-01-21 |
| | | | | | |||
| | * | | | Merge remote-tracking branch 'upstream/release-0_12' into integrate_0_12_changes | Jan Tattermusch | 2016-01-20 |
| | |\ \ \ | | | |/ / | | |/| | | |||
| * | | | | Fix C++ | Craig Tiller | 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. | ||
* | | | | regenerated projects | David Garcia Quintas | 2016-01-20 |
| | | | | |||
* | | | | Regenerated projects | David Garcia Quintas | 2016-01-20 |
| | | | | |||
| | | * | Merge branch 'master' into tag_set | Alistair Veitch | 2016-01-15 |
| | | |\ | | |_|/ | |/| | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into sync_async_mix | yang-g | 2016-01-15 |
|\| | | | |||
| * | | | Fix TSAN on Jenkins and on my machine | Craig Tiller | 2016-01-15 |
| | | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into sync_async_mix | yang-g | 2016-01-15 |
|\| | | | |||
| * | | | Merge pull request #4739 from ctiller/fix-the-fscking-tsan-build | Nicolas Noble | 2016-01-15 |
| |\ \ \ | | | | | | | | | | | Hard code text segment address for msan, tsan | ||
| * \ \ \ | Merge pull request #4688 from jtattermusch/static_deps | Nicolas Noble | 2016-01-15 |
| |\ \ \ \ | | | | | | | | | | | | | Statically link dependencies of grpc_csharp_ext | ||
* | | | | | | move utilities to a separate file | yang-g | 2016-01-15 |
| | | | | | | |||
* | | | | | | Merge remote-tracking branch 'upstream/master' into sync_async_mix | yang-g | 2016-01-15 |
|\| | | | | | |||
| | | * | | | Hard code text segment address for msan, tsan | Craig Tiller | 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. | ||
* | | | | | | Add new public header | yang-g | 2016-01-14 |
| | | | | | |