Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Finished merge | 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 | ||
| | | * | Merge pull request #4644 from yoloseem/typo-1 | Nathaniel Manista | 2016-01-08 |
| | | |\ | | | | | | | | | | | Fix docstring typos in python grpc interfaces. | ||
| | | * \ | Merge pull request #4627 from daniel-j-born/tcp_fd | Craig Tiller | 2016-01-08 |
| | | |\ \ | | | | | | | | | | | | | Expose the fd in grpc_fd and grpc_tcp. | ||
| | | | | * | 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 |
| | | | | | |||
* | | | | | 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 | ||
* \ \ \ \ \ \ | Merge pull request #4634 from murgatroid99/ruby_metadata_downcasing | Craig Tiller | 2016-01-07 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make the Ruby extension throw an error when passed invalid metadata | ||
* \ \ \ \ \ \ \ | Merge pull request #4610 from murgatroid99/node_dependencies_version_update | Craig Tiller | 2016-01-07 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update some Node dependencies to more recent versions | ||
| | | | * \ \ \ \ | Merge branch 'core_metadata_validation_empty_check' into ↵ | murgatroid99 | 2016-01-07 |
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | node_use_core_metadata_check | ||
| | | * | | | | | | Make metadata validation functions reject empty keys | murgatroid99 | 2016-01-07 |
| |_|/ / / / / / |/| | | | | | | | |||
| | | * | | | | | Make Node library use core metadata validation instead of duplicating it | murgatroid99 | 2016-01-07 |
| |_|/ / / / / |/| | | | | | | |||
| | | | | * | | Merge pull request #4635 from ctiller/spam_cleanup | Sree Kuchibhotla | 2016-01-07 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | Spam cleanup | ||
| | | | | | * | | Spam cleanup | Craig Tiller | 2016-01-06 |
| | | | | | | | | |||
| | * | | | | | | Updated dependencies, fixed a couple of tests | murgatroid99 | 2016-01-06 |
| | | | | | | | | |||
| | * | | | | | | Make the Ruby extension throw an error when passed invalid metadata | murgatroid99 | 2016-01-06 |
| | | | | | | | | |||
| | | | | * | | | Merge github.com:grpc/grpc into clangfmt | Craig Tiller | 2016-01-06 |
| | | | | |\| | | |||
| | * | | | | | | Merge branch 'core_validate_metadata' into ruby_metadata_downcasing | murgatroid99 | 2016-01-06 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||
* | | | | | | | | Fix header include syntax | murgatroid99 | 2016-01-06 |
| | | | | | | | | |||
* | | | | | | | | Expose core metadata validation functions in public headers | murgatroid99 | 2016-01-06 |
| | | | | | | | | |||
| | | | | | * | | Merge pull request #4562 from ctiller/ints | jboeuf | 2016-01-06 |
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | Switch to using C99 types for fixed size integers | ||
| | * | | | | | | | Parital implementation of ruby header checking | murgatroid99 | 2016-01-06 |
| |/ / / / / / / |/| | | | | | | | |||
| | | | | * | | | Merge pull request #4591 from nathanielmanistaatgoogle/protobuf-version | Masood Malekghassemi | 2016-01-05 |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | Remove ceiling on required protobuf version | ||
| | | | | | | | * | Expose the fd in grpc_fd and grpc_tcp. | Dan Born | 2016-01-05 |
| | | | | | |_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | Fixes a bug where grpc_fd::released was not initialized. | ||
| | | | | * | | | Merge pull request #4609 from yang-g/timespec | Vijay Pai | 2016-01-05 |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | Make possible lossy conversion explicit. | ||
| | | * | | | | | | Update copyright | murgatroid99 | 2016-01-05 |
| | | | | | | | | | |||
| | | * | | | | | | Made ruby per-rpc creds interop use auth plugin API | murgatroid99 | 2016-01-05 |
| | | | | | | | | | |||
| | | * | | | | | | Fix typo in method call | murgatroid99 | 2016-01-05 |
| |_|/ / / / / / |/| | | | | | | | |||
* | | | | | | | | Merge pull request #4611 from murgatroid99/ruby_0.12_version_update | Craig Tiller | 2016-01-05 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update Ruby library version for next release | ||
| | | | | * | | | | Add tox to Py build-from-source instructions | Masood Malekghassemi | 2016-01-05 |
| | | | | | | | | | |||
| | | * | | | | | | Free what we alloc | murgatroid99 | 2016-01-05 |
| | | | | | | | | | |||
| | | * | | | | | | Use specific ruby thread to handle auth metadata plugin callbacks | murgatroid99 | 2016-01-05 |
| | | | | | | | | | |||
* | | | | | | | | | Merge pull request #4615 from murgatroid99/backport_copyright_sanity_test | Craig Tiller | 2016-01-05 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Backport copyright changes | ||
| | | | | | * | | | | Copyright checker fixes | Craig Tiller | 2016-01-05 |
| | | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #4579 from jboeuf/security_connector_fixes-0_12 | Craig Tiller | 2016-01-04 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | Security connector fixes for 0.12 branch | ||
| | | | | | * | | | | Merge pull request #4554 from yang-g/stalled_and_destroy | Craig Tiller | 2016-01-04 |
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | remove stream from stalled_by_transport list before destroy it | ||
| | | | | | * \ \ \ \ | Merge pull request #4590 from yang-g/unreachable | Craig Tiller | 2016-01-04 |
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix one use of unreachable macro | ||
| | | | | | * \ \ \ \ \ | Merge pull request #4608 from a11r/import1_4 | Craig Tiller | 2016-01-04 |
| | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Added exception handling for ImportError | ||
| | * | | | | | | | | | | | Update copyrights | Craig Tiller | 2016-01-04 |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Add copyright checks to sanity; make them verify copyright year is valid | Craig Tiller | 2016-01-04 |
| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | Update copyrights | Craig Tiller | 2016-01-04 |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | |||
| | | | | * | | | | | | | Update copyrights | Craig Tiller | 2016-01-04 |
| | | | | | | | | | | | | |||
| | | | | | | | | | | * | Merge github.com:grpc/grpc into ints | Craig Tiller | 2016-01-04 |
| | | | | | | | | | | |\ | | | | | | |_|_|_|_|_|/ | | | | | |/| | | | | | | |||
| | * | | | | | | | | | | Updated copyright in Ruby version file | murgatroid99 | 2016-01-04 |
| | | | | | | | | | | | | |||
| | | | * | | | | | | | | Update copyrights | Craig Tiller | 2016-01-04 |
| | | | | | | | | | | | |