Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 pull request #4804 from kriswuollett/kriswuollett-protomethod-httppath-fix | Jorge Canizales | 2016-01-21 |
|\ \ | | | | | | | Fixed proto method without package naming in ObjC. | ||
| * | | Fixed proto method without package naming in ObjC. | Kristopher Wuollett | 2016-01-20 |
| | | | |||
| | * | Merge remote-tracking branch 'upstream/release-0_12' into integrate_0_12_changes | Jan Tattermusch | 2016-01-20 |
| |/| |/| | | |||
* | | | Merge pull request #4787 from jtattermusch/upgrade_protobuf_beta2 | Michael Lumish | 2016-01-20 |
|\ \ \ | |/ / |/| | | Upgrade to Protobuf 3.0.0-beta2 | ||
* | | | fix 32bit compilation on mac | Jan Tattermusch | 2016-01-20 |
| | | | |||
* | | | Merge pull request #4776 from jtattermusch/fix_32bit_artifacts | Jan Tattermusch | 2016-01-20 |
|\ \ \ | | | | | | | | | Improve grpc_chttp2_decode_timeout implementation | ||
| | * | | regenerate C# protos | Jan Tattermusch | 2016-01-20 |
| | | | | |||
| | * | | fix C# generate_protos.sh script | Jan Tattermusch | 2016-01-20 |
| | | | | |||
| | * | | upgrade Grpc.sln to newest Google.Protobuf nuget | Jan Tattermusch | 2016-01-20 |
| | | | | |||
| | * | | Remove leftovers from packages.config | Jan Tattermusch | 2016-01-20 |
| | | | | |||
| | * | | update C# generator to the new API | Jan Tattermusch | 2016-01-20 |
| |/ / |/| | | |||
* | | | Merge pull request #4783 from ctiller/cpu-cost | Jan Tattermusch | 2016-01-20 |
|\ \ \ | | | | | | | | | Use CPU cost modelling to better utilize test resources | ||
| * | | | Add C++ CPU costs | Craig Tiller | 2016-01-20 |
| | | | | |||
| | * | | fix copyrights | Jan Tattermusch | 2016-01-19 |
| | | | | |||
| | * | | improve decode_timeout implementation | Jan Tattermusch | 2016-01-19 |
| |/ / | |||
* / / | A test of the Cython Channel | Nathaniel Manista | 2016-01-20 |
|/ / | | | | | | | | | This exposes a bug somewhere in how channel connectivity events get published on completion queues. Investigation remains active. | ||
* | | Merge pull request #4683 from yang-g/epollset | Craig Tiller | 2016-01-19 |
|\ \ | | | | | | | Tsan error fix. | ||
* \ \ | Merge pull request #4730 from jtattermusch/revamp_native_loader | Michael Lumish | 2016-01-19 |
|\ \ \ | | | | | | | | | Revamp C# native loader | ||
* \ \ \ | Merge pull request #4676 from stanley-cheung/php_gcov_reports | Michael Lumish | 2016-01-19 |
|\ \ \ \ | | | | | | | | | | | Add gcov php coverage report | ||
* | | | | | Copyright date fixes for Python generator files | Nathaniel Manista | 2016-01-19 |
| | | | | | | | | | | | | | | | | | | | | These changes should have been included in dc8c32393918dc817f98e8844a. | ||
* | | | | | Merge pull request #4755 from ↵ | Masood Malekghassemi | 2016-01-16 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | nathanielmanistaatgoogle/remove-alpha-code-generation Remove Python alpha code generation | ||
| * | | | | | Remove Python alpha code generation | Nathaniel Manista | 2016-01-16 |
| | | | | | | |||
| | | | * | | Merge remote-tracking branch 'upstream/master' into epollset | yang-g | 2016-01-15 |
| | | | |\ \ | |_|_|_|/ / |/| | | | | | |||
* | | | | | | Merge pull request #4744 from dgquintas/check_newlines | Craig Tiller | 2016-01-15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added sanity check for trailing newlines | ||
| | | | * | | | extend copyright to 2016 | Jan Tattermusch | 2016-01-15 |
| | | | | | | | |||
| | | | * | | | revamp C# native library loader | Jan Tattermusch | 2016-01-15 |
| |_|_|/ / / |/| | | | | | |||
| | | | * | | Merge remote-tracking branch 'upstream/master' into epollset | yang-g | 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 | ||
| | * | | | | | Updated copyrights... | David Garcia Quintas | 2016-01-15 |
| | | | | | | | |||
| | * | | | | | Merge branch 'master' of github.com:grpc/grpc into check_newlines | David Garcia Quintas | 2016-01-15 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #4742 from bogdandrutu/bug | Alistair Veitch | 2016-01-15 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Fix the bug that was causing census_initialization to never work. | ||
| | | | | | * | Update Ruby README with simpler install instructions | murgatroid99 | 2016-01-15 |
| | | | | | | | |||
* | | | | | | | Merge pull request #4743 from murgatroid99/node_doc_gen_config_update | Michael Lumish | 2016-01-15 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update Node API documentation generation configuration for move to repo root | ||
| | | | * | | | | Added sanity check for trailing newlines | David Garcia Quintas | 2016-01-14 |
| | | | | | | | | |||
* | | | | | | | | Merge pull request #4709 from murgatroid99/node_method_names_no_capitalize | Michael Lumish | 2016-01-14 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Don't modify proto method names in service paths in Node library | ||
| | * | | | | | | | Update Node API documentation generation configuration for move to repo root | murgatroid99 | 2016-01-14 |
| | | | | | | | | | |||
| | | * | | | | | | Fix the bug that was causing census_initialization to never work. | Bogdan Drutu | 2016-01-14 |
| |_|/ / / / / / |/| | | | | | | | |||
* | | | | | | | | Added back trailing newlines | David Garcia Quintas | 2016-01-14 |
| | | | | | | | | |||
* | | | | | | | | Merge pull request #4729 from sreecha/import_issues_proto | Craig Tiller | 2016-01-14 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Generate transitive dependencies as well in gen_build_yaml.py for protos | ||
* | | | | | | | | Merge pull request #4653 from murgatroid99/release-0_12_master_merge | Craig Tiller | 2016-01-14 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Release 0 12 master merge | ||
| | * | | | | | | | update copyright | Sree Kuchibhotla | 2016-01-14 |
| | | | | | | | | | |||
| | * | | | | | | | Fix the error that was causing incorrect Makefile generation | Sree Kuchibhotla | 2016-01-14 |
| | | | | | | | | | |||
| | * | | | | | | | Generate transitive dependencies as well in gen_build_yaml.py for protos | Sree Kuchibhotla | 2016-01-14 |
| |/ / / / / / / |/| | | | | | | | |||
| | * | | | | | | Updated copyright in node/common.js | murgatroid99 | 2016-01-14 |
| | | | | | | | | |||
* | | | | | | | | Fix copyrights again | murgatroid99 | 2016-01-14 |
| |_|_|/ / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #4725 from yang-g/destroy_reader | Vijay Pai | 2016-01-14 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | destroy reader after using it | ||
| | * | | | | | | Re-add missing newline in ruby file | murgatroid99 | 2016-01-14 |
| | | | | | | | | |||
* | | | | | | | | Merge pull request #4720 from sreecha/import_issues | Yang Gao | 2016-01-14 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Rename TestService to EchoTestService to prevent name-conflict with 'TestService' in test.proto | ||
| | | | | | | * \ | Merge remote-tracking branch 'upstream/master' into epollset | yang-g | 2016-01-14 |
| | | | | | | |\ \ |