Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Regenerate projects | 2017-02-07 | |
| | |||
* | Merge remote-tracking branch 'upstream/v1.1.x' into ↵ | 2017-02-06 | |
|\ | | | | | | | automate-objc-version-advancement-v1.1.x | ||
| * | Merge pull request #9514 from muxi/advance-objc-version-1.1.0 | 2017-01-30 | |
| |\ | | | | | | | Advance objc version to v1.1.0 | ||
| | * | Advance objc version to v1.1.0 | 2017-01-30 | |
| | | | |||
* | | | Add modification warning to templated files | 2017-01-30 | |
| |/ |/| | |||
| * | Update gRPC-Core.podspec | 2017-01-30 | |
|/ | |||
* | Advance gRPC version to 1.1.0-pre1 | 2017-01-25 | |
| | |||
* | Revert "Metadata handling rewrite" | 2017-01-20 | |
| | |||
* | Merge github.com:grpc/grpc into metadata_filter | 2017-01-17 | |
|\ | |||
| * | Merge remote-tracking branch 'upstream/master' into ↵ | 2017-01-13 | |
| |\ | | | | | | | | | | revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup | ||
* | | | Fix build | 2017-01-10 | |
| | | | |||
* | | | Merge github.com:grpc/grpc into fix_errors | 2017-01-09 | |
|\ \ \ | | |/ | |/| | |||
* | | | Start fixing http error --> grpc status conversion | 2017-01-06 | |
| | | | |||
| * | | Handshaker plugin mechanism. | 2017-01-06 | |
| | | | |||
| | * | Merge remote-tracking branch 'upstream/master' into ↵ | 2017-01-06 | |
| | |\ | | |/ | |/| | | | | revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup | ||
| * | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2017-01-04 | |
| |\ \ | |||
| * \ \ | Merge branch 'patchy' into slice_with_exec_ctx_and_build | 2017-01-04 | |
| |\ \ \ | |||
| | * | | | Moving message_size_filter properly. | 2017-01-04 | |
| | |/ / | |||
* | | | | Merge branch 'slice_with_exec_ctx' into metadata_filter | 2016-12-27 | |
|\| | | | |||
| * | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-27 | |
| |\| | | |||
| | * | | v1.0.x → master upmerge | 2016-12-16 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual changes: - Fixed use of Exception.message in _invalid_metadata_test.py - Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb - Added "set -e" to generate_build_additions.sh | ||
* | | | | | Merge branch 'slice_with_exec_ctx' into metadata_filter | 2016-12-12 | |
|\| | | | | |||
| * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-12 | |
| |\| | | | |||
| | | | * | Revert "Revert "Revert "Revert "Remove redundant includes from string.h and ↵ | 2016-12-12 | |
| | | |/ | | |/| | | | | | | | | | tmpfile.h"""" | ||
| | * | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | 2016-12-12 | |
| | | | | |||
| * | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-12 | |
| |\| | | |||
* | | | | Merge branch 'slice_interning' into metadata_filter | 2016-12-06 | |
|\ \ \ \ | |||
| * | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | 2016-12-06 | |
| |\| | | | |||
| | * | | | Fix build | 2016-12-06 | |
| | | | | | |||
| | * | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-06 | |
| | |\ \ \ | |||
| | | | * | | Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" | 2016-12-05 | |
| | | |/ / | |||
| | | * | | Revert "Remove redundant includes from string.h and tmpfile.h" | 2016-12-05 | |
| | | | | | |||
| | | * | | Merge pull request #8922 from sreecha/slice_cleanup | 2016-12-05 | |
| | | |\ \ | | | | | | | | | | | | | Remove redundant includes from string.h and tmpfile.h | ||
| | | * | | | Use the same server code for both secure and insecure servers. | 2016-12-02 | |
| | | | | | | |||
| | | | * | | Temporarily enable gpr_slice_* functions to not break api compatibility | 2016-12-01 | |
| | | | | | | |||
| * | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | 2016-11-30 | |
| |\| | | | | |||
| | | * | | | Merge branch 'security_handshaker1' into security_handshaker2 | 2016-11-29 | |
| | | |\| | | |||
| | | | | * | Advance objective c version to v1.0.2 | 2016-11-28 | |
| | | | | | | |||
* | | | | | | Merge branch 'slice_with_exec_ctx' into eliminate_mdstr | 2016-11-18 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-18 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | | | * | | Rename security handshaker files. | 2016-11-17 | |
| | | | | | | |||
| | | | * | | Use the same connector code for both secure and insecure clients. | 2016-11-17 | |
| | | | | | | |||
* | | | | | | Merge branch 'slice_interning' into eliminate_mdstr | 2016-11-16 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | 2016-11-16 | |
| |\| | | | | |||
| | * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-16 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||
| | | | * | | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-16 | |
| | | | |\ \ | | | | |/ / | | | |/| | | |||
| | | * | | | Merge pull request #8680 from ctiller/no_more_legacy | 2016-11-15 | |
| | | |\ \ \ | | | | | | | | | | | | | | | Remove legacy poller | ||
| | | * \ \ \ | Merge pull request #8335 from y-zeng/tos | 2016-11-11 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Add grpc_socket_mutator | ||
* | | | | | | | | Progress towards mdstr elimination | 2016-11-10 | |
|/ / / / / / / | |||
* | | | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | 2016-11-10 | |
|\| | | | | | |