Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #3107 from a-veitch/view_api | 2015-08-31 | |
|\ | |||
| * | change aggregation_ops to internal type | 2015-08-31 | |
| * | merge | 2015-08-31 | |
| |\ | |||
* | | | Fixing headers and paths after merge with upstream. | 2015-08-30 | |
* | | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | 2015-08-30 | |
|\ \ \ | | |/ | |/| | |||
| * | | Merge branch 'master' into tracing_api | 2015-08-28 | |
| |\ \ | |||
| | | * | merge to head | 2015-08-28 | |
| | | |\ | | | |/ | | |/| | |||
* | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | 2015-08-27 | |
|\ \ \ \ | | |/ / | |/| | | |||
| | | * | view and aggregation API | 2015-08-27 | |
* | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | 2015-08-26 | |
|\ \ \ \ | |||
| | * | | | More merge conflict fix | 2015-08-25 | |
| | | * | | merge to head | 2015-08-25 | |
| | | |\| | |||
| | * | | | Merge remote-tracking branch 'upstream/master' into timespec | 2015-08-25 | |
| | |\ \ \ | | | | |/ | | | |/| | |||
| | | * | | add missing headers from 2495 | 2015-08-25 | |
| | | * | | Merge pull request #2945 from maxwell-demon/master | 2015-08-25 | |
| | |/| | | |/| | | | |||
| * | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_string_ref | 2015-08-24 | |
| |\ \ \ \ | |||
| * | | | | | Adding grpc::string_ref class. | 2015-08-24 | |
| | | * | | | Move core/profiling/timers_preciseclock.h to core/support/ such that we | 2015-08-24 | |
| | |/ / / | |/| | | | |||
| | * | | | Fix merge failures | 2015-08-24 | |
| | * | | | merge with head | 2015-08-24 | |
| | |\ \ \ | |||
| | | * | | | Eliminate public thread-pool interface | 2015-08-24 | |
| | |/ / / | |/| | | | |||
| | * | | | split stream.h into sync_stream.h and async_stream.h | 2015-08-21 | |
| | * | | | headers reorg | 2015-08-21 | |
| | | * | | rename census_filter.{c,h} to grpc_filter.{c,h} | 2015-08-21 | |
| | * | | | Make Channel ctor private | 2015-08-20 | |
| | * | | | remove internal_stub | 2015-08-20 | |
| | | * | | Merge remote-tracking branch 'upstream/master' | 2015-08-20 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | * | | Move census_filters from .../channel to .../census | 2015-08-19 | |
| | * | | | Remove ChannelInterface and replace it with Channel | 2015-08-19 | |
| |/ / / | |||
* | | | | Adding new header in build.json. | 2015-08-15 | |
| * | | | Merge pull request #2549 from hongweiwang/zookeeper | 2015-08-14 | |
| |\ \ \ | |||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | 2015-08-13 | |
| |\ \ \ \ | |/ / / / |/| | | | | |||
* | | | | | Removing gpr_cancelable. | 2015-08-13 | |
| * | | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | 2015-08-13 | |
| |\ \ \ \ | |/ / / / |/| | | | | |||
* | | | | | Let grpc target depend on //external:zlib so that "-lz" or a real zlib | 2015-08-13 | |
| | | | * | Merge branch 'master' into tracing_api | 2015-08-13 | |
| | | | |\ | |_|_|_|/ |/| | | | | |||
| | | | * | add all new content | 2015-08-13 | |
| | | * | | Merge remote-tracking branch 'upstream/master' | 2015-08-11 | |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| | | * | | Build file changes | 2015-08-11 | |
| | * | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-10 | |
| | |\ \ \ | |_|/ / / |/| | | | | |||
* | | | | | move auth property iterator declaration into auth_context.h | 2015-08-10 | |
| |_|/ / |/| | | | |||
| | * | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-07 | |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | 2015-08-06 | |
|\ \ \ \ | |||
| | | * \ | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-06 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | Regenerated project files | 2015-08-06 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #2781 from yang-g/stuboptions | 2015-08-05 | |
| |\ \ \ \ | |||
* | | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetry | 2015-08-05 | |
|\| | | | | | |||
| | | | * | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-05 | |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | | | * | merge with upstream/master | 2015-08-04 | |
| | | | | |\ | |||
* | | | | | | | Testing port server | 2015-08-04 | |
| |_|_|_|_|/ |/| | | | | |