Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | post merge | Alistair Veitch | 2016-02-02 |
| | |||
* | Merge pull request #4883 from soltanmm/fixfix | Nathaniel Manista | 2016-01-25 |
|\ | | | | | Add missing "support" import. | ||
| * | Add missing import | Masood Malekghassemi | 2016-01-25 |
| | | | | | | | | I have no idea how this mistake got through. | ||
* | | Merge pull request #4847 from jtattermusch/bump_version_0_13 | Craig Tiller | 2016-01-25 |
|\ \ | | | | | | | Bump gRPC version to 0.13 and get C# version autogenerated | ||
| * | | update copyrights | Jan Tattermusch | 2016-01-25 |
| | | | |||
| * | | Merge remote-tracking branch 'upstream/master' into bump_version_0_13 | Jan Tattermusch | 2016-01-25 |
| |\ \ | |/ / |/| | | |||
* | | | Merge pull request #4855 from jtattermusch/upgrade_csharp_dependencies | Michael Lumish | 2016-01-25 |
|\ \ \ | |_|/ |/| | | Update C# dependencies | ||
* | | | Merge pull request #4876 from ctiller/copy-- | Michael Lumish | 2016-01-25 |
|\ \ \ | | | | | | | | | Fix copyright | ||
* \ \ \ | Merge pull request #4821 from soltanmm/install-doctor | Masood Malekghassemi | 2016-01-25 |
|\ \ \ \ | | | | | | | | | | | Add compiler error diagnostics to Python setup | ||
* \ \ \ \ | Merge pull request #4849 from jtattermusch/embedding_is_good | Stanley Cheung | 2016-01-25 |
|\ \ \ \ \ | | | | | | | | | | | | | Make sure we embed openssl and zlib in C# artifacts | ||
* \ \ \ \ \ | Merge pull request #4680 from daniel-j-born/tcp_listener | Craig Tiller | 2016-01-25 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make grpc_tcp_listener private. | ||
| | | | * | | | Fix copyright | Craig Tiller | 2016-01-25 |
| |_|_|/ / / |/| | | | | | |||
| | | | * | | update C# dependencies | Jan Tattermusch | 2016-01-25 |
| |_|_|/ / |/| | | | | |||
* | | | | | Merge pull request #4846 from murgatroid99/ruby_coverage_reporting | Michael Lumish | 2016-01-25 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix path where we check for ruby coverage report | ||
* \ \ \ \ \ | Merge pull request #4866 from grpc/Update-readme | Jan Tattermusch | 2016-01-25 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update README.md | ||
* \ \ \ \ \ \ | Merge pull request #4861 from jtattermusch/macos_nuget_restore | Craig Tiller | 2016-01-23 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Run nuget restore on mac as well | ||
* \ \ \ \ \ \ \ | Merge pull request #4854 from soltanmm/zedhead | Masood Malekghassemi | 2016-01-23 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Integrate zlib into Python distribution | ||
| | | * | | | | | | Update README.md | Craig Tiller | 2016-01-23 |
| |_|/ / / / / / |/| | | | | | | | |||
* | | | | | | | | Merge pull request #4863 from jtattermusch/fix_copyrights_again | Yang Gao | 2016-01-23 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix copyrights in server_context.cc | ||
| | | * | | | | | | fix copyright | Jan Tattermusch | 2016-01-23 |
| | | | | | | | | | |||
| * | | | | | | | | fix copyrights in server_context | Jan Tattermusch | 2016-01-23 |
|/ / / / / / / / | |||
* | | | | | | | | Merge pull request #4856 from yang-g/deadline | Craig Tiller | 2016-01-22 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | init deadline in server context | ||
| | | * | | | | | | Run nuget restore on mac as well | Jan Tattermusch | 2016-01-22 |
| | | | | | | | | | |||
* | | | | | | | | | Merge pull request #4860 from jtattermusch/tag_set_win_fix | Craig Tiller | 2016-01-22 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Fix compilation on windows | ||
| * | | | | | | | | fix compilation on windows | Jan Tattermusch | 2016-01-22 |
| | | | | | | | | | |||
* | | | | | | | | | Merge pull request #4858 from jtattermusch/master_should_be_green | Craig Tiller | 2016-01-22 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Fix formatting of census.h | ||
| * | | | | | | | | fix formatting | Jan Tattermusch | 2016-01-22 |
|/ / / / / / / / | |||
* | | | | | | | | Merge pull request #4857 from a-veitch/tag_set_fix | Craig Tiller | 2016-01-22 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix uninitialized variable usage | ||
| * | | | | | | | | fix uninitialized variable usage | Alistair Veitch | 2016-01-22 |
|/ / / / / / / / | |||
| * / / / / / / | init deadline_ | yang-g | 2016-01-22 |
|/ / / / / / / | |||
| * / / / / / | Integrate zlib into Python distribution | Masood Malekghassemi | 2016-01-22 |
|/ / / / / / | |||
* | | | | | | Merge pull request #4851 from ctiller/WTF | Jan Tattermusch | 2016-01-22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix build | ||
| | | | | * | | Add compiler error diagnostics to Python setup | Masood Malekghassemi | 2016-01-22 |
| |_|_|_|/ / |/| | | | | | |||
| * | | | | | Fix build | Craig Tiller | 2016-01-22 |
|/ / / / / | |||
* | | | | | Merge pull request #4750 from a-veitch/tag_set | Bogdan Drutu | 2016-01-22 |
|\ \ \ \ \ | | | | | | | | | | | | | Census Tag Set API and implementation | ||
* \ \ \ \ \ | Merge pull request #4848 from jtattermusch/fix_objc_copyrights | Stanley Cheung | 2016-01-22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix ObjC copyrights | ||
| | | | | * | | make sure we embed openssl and zlib in artifacts | Jan Tattermusch | 2016-01-22 |
| |_|_|_|/ / |/| | | | | | |||
| * | | | | | fix copyrights | Jan Tattermusch | 2016-01-22 |
|/ / / / / | |||
| | | | * | fix copyrights | Jan Tattermusch | 2016-01-22 |
| | | | | | |||
| | | | * | get C# version generated by templates | Jan Tattermusch | 2016-01-22 |
| | | | | | |||
| | * | | | Fix path where we check for ruby coverage report | murgatroid99 | 2016-01-22 |
| |/ / / |/| | | | |||
| | | * | regenerate projects | Jan Tattermusch | 2016-01-22 |
| | | | | |||
| | | * | bump core version to 0.13 | 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 pull request #4820 from jtattermusch/new_csharp_nuget | Michael Lumish | 2016-01-22 |
|\ \ \ \ | | | | | | | | | | | Revamp C# Nuget package | ||
| | | * | | Don't use buf_size as input and output in encode | Alistair Veitch | 2016-01-22 |
| | | | | | |||
* | | | | | Merge pull request #4823 from soltanmm/protostuffs | Nathaniel Manista | 2016-01-22 |
|\ \ \ \ \ | | | | | | | | | | | | | Depend on protobuf>=3.0.0a3 in grpcio. | ||
* \ \ \ \ \ | Merge pull request #4830 from soltanmm/going-slightly-mad | Nathaniel Manista | 2016-01-22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix broken Python package builds. | ||
| | | | | * | | Single encode function | Alistair Veitch | 2016-01-22 |
| | | | | | | | |||
* | | | | | | | Merge pull request #4790 from adelez/update_interop_url | Yang Gao | 2016-01-22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update interop test service url to grpc-test.sandbox.googleapis.com. |