Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into grand-unified-closures | 2016-08-04 | |
|\ | |||
| * | Merge pull request #7600 from dgquintas/fix_includes | 2016-08-02 | |
| |\ | | | | | | | fixed include guard script and faulty .h | ||
| * \ | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | |
| |\ \ | | | | | | | | | Add Census resource API and implementation. | ||
| | | * | fixed include guard script and faulty .h | 2016-08-01 | |
| | |/ | |/| | |||
| * | | Merge pull request #7502 from dgquintas/cpp_compression_level | 2016-07-28 | |
| |\ \ | | | | | | | | | C++ Compression Level set properly | ||
| * \ \ | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | 2016-07-25 | |
| |\ \ \ | | | | | | | | | | | V1.0.x merge into master | ||
| * \ \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | 2016-07-25 | |
| |\ \ \ \ | | | | | | | | | | | | | Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf | ||
* | \ \ \ \ | Merge github.com:grpc/grpc into grand-unified-closures | 2016-07-24 | |
|\ \ \ \ \ \ | |||
| | | | | * \ | Merge branch 'master' of github.com:grpc/grpc into cpp_compression_level | 2016-07-22 | |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | | * | | | Merge v1.0.x into master | 2016-07-22 | |
| | |_|/| | | | |/| | | | | | |||
| | | | | * | | C++ Compression Level set properly | 2016-07-21 | |
| | | | | | | | |||
| | * | | | | | Removed unused version of async_stream.h | 2016-07-21 | |
| |/ / / / / | |||
| * | | | | | Merge pull request #7488 from ghemawat/slice_user_data | 2016-07-21 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Add gpr_slice_new_with_user_data. | ||
| | | | | * | merge to upstream/master | 2016-07-21 | |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | * | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | 2016-07-21 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #7486 from dgquintas/alive_typo | 2016-07-21 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | fixed typo | ||
| | | | | * \ | Merge pull request #7400 from yang-g/ga_branch2 | 2016-07-21 | |
| | | | | |\ \ | | | | | | | | | | | | | | | | | Cherrypick #7319 into v1.0.x | ||
| * | | | | \ \ | Merge pull request #7469 from yang-g/proto_lite | 2016-07-21 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add a macro to support protobuf lite | ||
| | | | * | | | | | Add gpr_slice_new_with_user_data. | 2016-07-21 | |
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gpr_slice_new_with_user_data is like gpr_slice_new, but allows the caller to specify a distinct pointer to pass to the destroy function. This is useful when the data is part of a larger data structure that should be destroyed when the data is no longer needed. | ||
| | | | | * | | | Merge pull request #7470 from dgquintas/v1.0.x | 2016-07-20 | |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | grpc_args doxygen docstrings | ||
| | | * | | | | | | fixed typo | 2016-07-20 | |
| | |/ / / / / / | |/| | | | | | | |||
| | | * | | | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | 2016-07-19 | |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | | | * | | | | Merge pull request #7425 from jcanizales/p0-dynamic-frameworks-build-tests | 2016-07-19 | |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | Automatic test that the library builds correctly with frameworks | ||
| * | | | \ \ \ \ | Merge pull request #7444 from y-zeng/fix_typo | 2016-07-19 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix typos in config_protobuf.h | ||
* | | | | | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-07-19 | |
|\| | | | | | | | | | |||
| * | | | | | | | | | Merge pull request #7399 from sreecha/poll_alloc_fix | 2016-07-19 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Reduce the number of unnecessary allocations | ||
| | | | | | | | * | | | grpc_args doxygen | 2016-07-19 | |
| | | | | | | |/ / / | | | | | | |/| | | | |||
| | | | * | | | | | | Add a macro to support protobuf lite | 2016-07-19 | |
| | | | | | | | | | | |||
* | | | | | | | | | | Fix gcc4.4 error | 2016-07-19 | |
| | | | | | | | | | | |||
| * | | | | | | | | | grpc_args doxygen | 2016-07-18 | |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Fix merge error | 2016-07-18 | |
| | | | | | | | | | |||
| | | | * | | | | | Separate generated file and protobuf dependency | 2016-07-18 | |
| | | | | | | | | | |||
| | | | | * | | | | Polish grpcio_health_checking package | 2016-07-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Rename namespace to grpc_health->grpc to match spec -Proper use of NOT_FOUND status code -Improve testing -Add source distribution to artifact build | ||
| | | | * | | | | | fix typo | 2016-07-18 | |
| | |_|/ / / / / | |/| | | | | | | |||
| | | * | | | | | fix typo | 2016-07-18 | |
| | |/ / / / / | |/| | | | | | |||
| | | | * | | | Solve warnings by adding headers not included by grpc.h | 2016-07-15 | |
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | The two log.h can’t be listed, though, as they include the nefarious <inttypes.h> (See discussing at BoringSSL.podspec). Not listing them seems to be alright, though. | ||
* | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-07-15 | |
|\| | | | | | |||
| | | | * | | prevent spurious wake up and unstarted/already shutdown server | 2016-07-14 | |
| | | | | | | |||
| | * | | | | Reduce the number of unnecessary allocations | 2016-07-14 | |
| |/ / / / | |||
| * | | | | Merge pull request #7319 from yang-g/wait_async | 2016-07-14 | |
| |\ \ \ \ | | | | | | | | | | | | | Make Server::Wait work for async only server. | ||
| | * | | | | prevent spurious wake up and unstarted/already shutdown server | 2016-07-14 | |
| | | | | | | |||
| | | | * | | Make Server::Wait work for async only server. | 2016-07-13 | |
| | | |/ / | |||
* | | | | | Merge branch 'delayed-write' into grand-unified-closures | 2016-07-13 | |
|\| | | | | |||
| * | | | | Merge remote-tracking branch 'upstream/master' into slice | 2016-07-12 | |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| | | * | | Make Server::Wait work for async only server. | 2016-07-11 | |
| | |/ / | |||
* | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-07-08 | |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #7219 from jcanizales/merge-0.14-into-master | 2016-07-08 | |
| |\ \ \ | | | | | | | | | | | Merge 0.14 into master | ||
* | | | | | Merge github.com:grpc/grpc into atm2 | 2016-07-07 | |
|\| | | | | |||
| * | | | | Merge branch 'master' of github.com:grpc/grpc into bb_reader_error | 2016-07-06 | |
| |\ \ \ \ | |||
| | * \ \ \ | Merge pull request #7174 from dgquintas/remove_unused_status_code_enum_file | 2016-07-06 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | removed unused version of status_code_enum.h |