Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #3183 from ctiller/second-coming | 2015-09-02 | |
|\ | |||
* | | fix C# nuget package building | 2015-09-02 | |
| * | get directories right | 2015-09-01 | |
| * | Exclude some tests from Windows until we figure things out better | 2015-09-01 | |
| * | Update generated code | 2015-09-01 | |
| * | Merge branch 'third-coming' into endpoints | 2015-09-01 | |
| |\ | |||
| * | | Use msbuild for tests | 2015-09-01 | |
|/ / | |||
* | | Merge github.com:grpc/grpc into cleaner-build | 2015-08-31 | |
|\ \ | |||
| * \ | Merge pull request #3107 from a-veitch/view_api | 2015-08-31 | |
| |\ \ | |||
| | * | | change aggregation_ops to internal type | 2015-08-31 | |
| | | * | C tests dont need protobuf | 2015-08-31 | |
| | | * | Merge branch 'cleaner-build' into third-coming | 2015-08-31 | |
| | | |\ | |_|_|/ |/| | | | |||
| | | * | Merge github.com:grpc/grpc into second-coming | 2015-08-31 | |
| | | |\ | | |_|/ | |/| | | |||
* / | | | Generated changes | 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 pull request #2863 from jtattermusch/csharp_upgrade_to_proto3 | 2015-08-27 | |
| |\ \ \ \ | |||
| | | | | * | Add a portable test of endpoint pairs | 2015-08-27 | |
| | |_|_|/ | |/| | | | |||
| | * | | | upgrade third_party/protobufs to 3.0.0-beta-1 | 2015-08-27 | |
* | | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | 2015-08-26 | |
|\ \ \ \ \ | |||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into string_ref_auth | 2015-08-26 | |
| | |\ \ \ \ | |||
| | | | * \ \ | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 | 2015-08-26 | |
| | | | |\ \ \ | | | | |/ / / | | | |/| | | | |||
| | | * | | | | Merge pull request #3065 from yang-g/string_ref | 2015-08-26 | |
| | | |\ \ \ \ | |||
| | * | | | | | | auth context api change for string_ref | 2015-08-25 | |
| | | |/ / / / | | |/| | | | | |||
| | | * | | | | More merge conflict fix | 2015-08-25 | |
| | | * | | | | Merge remote-tracking branch 'upstream/master' into timespec | 2015-08-25 | |
| | | |\ \ \ \ | |||
| | | | * \ \ \ | Merge pull request #3021 from ctiller/reject-the-stuffs | 2015-08-25 | |
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||
| | | | | | | * | merge to head | 2015-08-25 | |
| | | | | | | |\ | | | | | |_|_|/ | | | | |/| | | | |||
| | | * | | | | | Merge remote-tracking branch 'upstream/master' into timespec | 2015-08-25 | |
| | | |\| | | | | |||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into string_ref | 2015-08-25 | |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||
| | | * | | | | | add missing headers from 2495 | 2015-08-25 | |
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into string_ref | 2015-08-25 | |
| | |\| | | | | | |||
| | * | | | | | | impl | 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 | |
| | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'master' into fray | 2015-08-24 | |
| | | |\ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ | Merge pull request #3019 from dgquintas/channel_args_compression | 2015-08-24 | |
| | | | |\ \ \ \ \ \ | |||
| | | | * | | | | | | | Remove accidental dependency on zookeeper in shutdown_test | 2015-08-24 | |
| | | | | |_|/ / / / | | | | |/| | | | | | |||
| | | * / | | | | | | Eliminate public thread-pool interface | 2015-08-24 | |
| | | |/ / / / / / | |||
| | | | | | * | | | Update projects | 2015-08-24 | |
| | * | | | | | | | split stream.h into sync_stream.h and async_stream.h | 2015-08-21 |