Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Generated projects again | murgatroid99 | 2016-01-13 |
| | |||
* | Merge branch 'master' into release-0_12_master_merge | murgatroid99 | 2016-01-13 |
|\ | |||
| * | Merge pull request #4694 from dgquintas/copyright_fix | Craig Tiller | 2016-01-13 |
| |\ | | | | | | | Added --fix flag to check_copyright.py | ||
| | * | Added --fix flag to check_copyright.py | David Garcia Quintas | 2016-01-12 |
| | | | |||
| * | | Merge pull request #4693 from murgatroid99/transitive_deps_plugin_fix | Sree Kuchibhotla | 2016-01-12 |
| |\ \ | | |/ | |/| | Allow transitive dependencies plugin to process non-existent libs wit… | ||
| | * | Allow transitive dependencies plugin to process non-existent libs without ↵ | murgatroid99 | 2016-01-12 |
| |/ | | | | | | | crashing | ||
| * | Merge pull request #4686 from murgatroid99/sanity_update_copyrights | Craig Tiller | 2016-01-12 |
| |\ | | | | | | | Updated copyrights | ||
| | * | Updated copyrights | murgatroid99 | 2016-01-12 |
| | | | |||
| * | | Merge pull request #4685 from ctiller/copywrong | Michael Lumish | 2016-01-12 |
| |\ \ | | |/ | |/| | Fix check_copyright.py | ||
| | * | Fix check_copyright.py | Craig Tiller | 2016-01-12 |
| | | | |||
| * | | Merge pull request #4678 from ctiller/clangfix | Michael Lumish | 2016-01-12 |
| |\ \ | | | | | | | | | Fix formatting | ||
| * \ \ | Merge pull request #4457 from soltanmm/plate-tectonics | Nathaniel Manista | 2016-01-12 |
| |\ \ \ | | | | | | | | | | | Include core in Python distribution. | ||
| * \ \ \ | Merge pull request #4673 from iancoolidge/port-fixes | Craig Tiller | 2016-01-12 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Port fixes | ||
* | | | | | Merge remote-tracking branch 'upstream/release-0_12' into ↵ | murgatroid99 | 2016-01-11 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | release-0_12_master_merge | ||
| * \ \ \ \ | Merge pull request #4674 from jboeuf/rollback_new_roots.pem | Michael Lumish | 2016-01-11 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Revert "Refreshing the etc/roots.pem file." | ||
| | | | | | * | Fix formatting | Craig Tiller | 2016-01-11 |
| | | | |_|/ | | | |/| | | |||
| | * / | | | Revert "Refreshing the etc/roots.pem file." | Julien Boeuf | 2016-01-11 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 64279c7c314c9a4602848105ee30e348cd963489. The new roots.pem is not compatible with default boringssl. | ||
| | | * | | base64: clarify signedness in negative initialization | Ian Coolidge | 2016-01-11 |
| | | | | | | | | | | | | | | | | | | | | Some platforms do not use signed char (arm) | ||
| | | * | | Fix R/W template argument order in prototypes | Ian Coolidge | 2016-01-11 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the prototype argument order was different than the declaration order. Based on a patch from Sam Leffler. | ||
| | * | | Merge pull request #4642 from yang-g/epollset | Craig Tiller | 2016-01-11 |
| | |\ \ | | | | | | | | | | | Remove from all epoll sets when releasing an fd | ||
| | | | * | Use BoringSSL for Python gRPC | Masood Malekghassemi | 2016-01-11 |
| | | | | | |||
| | | | * | Use default gRPC roots.pem if none provided | Masood Malekghassemi | 2016-01-11 |
| | | | | | |||
| | * | | | Merge pull request #4238 from ctiller/poffy | Vijay Pai | 2016-01-11 |
| | |\ \ \ | | | | | | | | | | | | | Make pick_first fast path lock free | ||
| | * \ \ \ | Merge pull request #4525 from ctiller/proto_names | Vijay Pai | 2016-01-11 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Consolidate C++ proto files under src/proto | ||
| | * \ \ \ \ | Merge pull request #4645 from ctiller/coveralls | Michael Lumish | 2016-01-08 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Refine coverage language list | ||
* | | | | | | | | Fixed a couple of remaining merge issues | murgatroid99 | 2016-01-08 |
| | | | | | | | | |||
| | | | | | * | | merge with head | yang-g | 2016-01-08 |
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | | | |||
| | * | | | | | | Merge pull request #4647 from ctiller/run_errors | Michael Lumish | 2016-01-08 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Handle errors in run_tests.py a little better | ||
| | * \ \ \ \ \ \ | Merge pull request #4652 from ctiller/no-cache | Michael Lumish | 2016-01-08 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Disable ccache for the moment | ||
* | | | | | | | | | | Finished merge | murgatroid99 | 2016-01-08 |
| | | | | | | | | | | |||
* | | | | | | | | | | Update after cloning boringssl | murgatroid99 | 2016-01-08 |
| | | | | | | | | | | |||
* | | | | | | | | | | Merge another file | murgatroid99 | 2016-01-08 |
| | | | | | | | | | | |||
* | | | | | | | | | | Merged from master and resolved merge conflicts | murgatroid99 | 2016-01-08 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | |||
* | | | | | | | | | Merge pull request #4625 from murgatroid99/ruby_client_stub_fix_typo | Craig Tiller | 2016-01-08 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix a bug recently reported in the mailing list | ||
* \ \ \ \ \ \ \ \ \ | Merge pull request #4620 from murgatroid99/ruby_auth_plugin_event_loop | Craig Tiller | 2016-01-08 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Use specific ruby thread to handle auth metadata plugin callbacks | ||
| | | | * | | | | | | | Disable ccache for the moment | Craig Tiller | 2016-01-08 |
| | | |/ / / / / / / | |||
| | | * | | | | | | | Merge pull request #4644 from yoloseem/typo-1 | Nathaniel Manista | 2016-01-08 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix docstring typos in python grpc interfaces. | ||
| | | | | * | | | | | | Flag errors better | Craig Tiller | 2016-01-08 |
| | | | | | | | | | | | |||
| | | | | * | | | | | | Tweak run_tests exit status handling | Craig Tiller | 2016-01-08 |
| | | | |/ / / / / / | | | |/| | | | | | | |||
| | | * | | | | | | | Merge pull request #4627 from daniel-j-born/tcp_fd | Craig Tiller | 2016-01-08 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Expose the fd in grpc_fd and grpc_tcp. | ||
| | | * \ \ \ \ \ \ \ | Merge pull request #4643 from murgatroid99/node_compiler_standard_c99 | Craig Tiller | 2016-01-08 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Compile Node extension with c99 and c++11 | ||
| | | | | | | * | | | | | Refine coverage language list | Craig Tiller | 2016-01-07 |
| | | | |_|_|/ / / / / | | | |/| | | | | | | | |||
| | | | | | * | | | | | Fix docstring typos in python grpc interfaces | Hyunjun Kim | 2016-01-08 |
| | | | |_|/ / / / / | | | |/| | | | | | | |||
| | * | | | | | | | | Resolved merge conflicts with upstream/release-0_12 | murgatroid99 | 2016-01-07 |
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||
| * | | | | | | | | | Fixed mutex and cond var usage | murgatroid99 | 2016-01-07 |
| | | | | | | | | | | |||
| | | | * | | | | | | Removed redundant std= cflag | murgatroid99 | 2016-01-07 |
| | | | | | | | | | | |||
| | | | * | | | | | | Compile Node extension with c99 and c++11 | murgatroid99 | 2016-01-07 |
| | | |/ / / / / / | |||
| | | | | * | | | | Update some wrapped stuff | Craig Tiller | 2016-01-07 |
| | | | | | | | | | |||
* | | | | | | | | | Merge pull request #4640 from murgatroid99/node_use_core_metadata_check | Craig Tiller | 2016-01-07 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use core metadata validation functions in Node library | ||
* \ \ \ \ \ \ \ \ \ | Merge pull request #4637 from murgatroid99/core_metadata_validation_empty_check | Craig Tiller | 2016-01-07 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Make metadata validation functions reject empty keys |