Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-05 | |
|\ | |||
| * | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitter | 2015-08-05 | |
| |\ | |||
* | \ | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-08-03 | |
|\ \ \ | |||
| | | * | merge with head and resolve conflicts | 2015-08-03 | |
| | | |\ | | |_|/ | |/| | | |||
| | * | | Merge github.com:grpc/grpc into plucking-hell | 2015-08-01 | |
| | |\ \ | | |/ / | |/| | | |||
* | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-07-31 | |
|\ \ \ \ | |||
* | | | | | Add zookeeper end-to-end test | 2015-07-31 | |
| | * | | | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | 2015-07-31 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | Merge github.com:grpc/grpc into plucking-hell | 2015-07-31 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #2731 from nicolasnoble/regen-and-vs-tweaks | 2015-07-30 | |
| |\ \ \ \ | |||
| | * | | | | Regenerating project files and massaging VS project files. | 2015-07-30 | |
| | | | * | | Merge github.com:grpc/grpc into plucking-hell | 2015-07-30 | |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | | * | | Merge branch 'regen-and-vs-tweaks' of github.com:nicolasnoble/grpc into tepid... | 2015-07-30 | |
| | | | |\ \ | |||
| | | | | * | | Regenerating project files and massaging VS project files. | 2015-07-31 | |
| | | |_|/ / | | |/| | | | |||
| * | | | | | merge with master, fix build issue | 2015-07-30 | |
| * | | | | | Merge branch 'master' into issue_2709 | 2015-07-30 | |
| |\ \ \ \ \ | |||
| * | | | | | | Move grpc_census_call_*_context calls into public header | 2015-07-30 | |
| | | | * | | | Add a subchannel factory decorator library | 2015-07-29 | |
| | | | * | | | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | 2015-07-29 | |
| | | | |\ \ \ | | | |_|/ / / | | |/| | | | | |||
| | | | | * | | Allow specific pollers to be woken | 2015-07-29 | |
| | | | | * | | Regenerate project files. | 2015-07-29 | |
| | | |_|/ / | | |/| | | | |||
* | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-07-28 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | | * | merge with upstream | 2015-07-28 | |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | * | | | regenerate projects | 2015-07-28 | |
| | |/ / / | |/| | | | |||
| * | | | | Merge pull request #2506 from larsonmpdx/gitt | 2015-07-28 | |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'iomgr-refcounting' of https://github.com/nicolasnoble/grpc into... | 2015-07-27 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| | | | * | | Merge branch 'sometimes-its-good-just-to-check-in-with-each-other' into yeah-... | 2015-07-26 | |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | * | | | | Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each... | 2015-07-26 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | | * | Add reconnect interop test client and server | 2015-07-24 | |
| | | |_|/ | | |/| | | |||
| * | | | | Merge branch 'master' into deepend | 2015-07-24 | |
| |\ \ \ \ | |||
| | | | | * | Make passing NULL for host not crash | 2015-07-23 | |
| | | | |/ | | | |/| | |||
| * | | | | Add dynamic thread pool and initial port of test | 2015-07-23 | |
| | | * | | Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each... | 2015-07-23 | |
| | | |\ \ | | | |/ / | | |/| | | |||
| | * | | | Merge pull request #2493 from a-veitch/record_stat | 2015-07-23 | |
| | |\ \ \ | |||
| | | | | * | documentation for windows testing using grpc.mak | 2015-07-21 | |
* | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | 2015-07-20 | |
|\| | | | | | |||
| | | * | | | fix build | 2015-07-20 | |
| | * | | | | Add ipv4:, ipv6: schemes | 2015-07-20 | |
| |/ / / / | |||
| | | * | | Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each... | 2015-07-20 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | Merge branch 'decompression' of https://github.com/dgquintas/grpc into dgquin... | 2015-07-19 | |
| |\ \ \ \ | |||
| | | | | * | nmake: continue on error | 2015-07-19 | |
| | | | | * | documentation of new vcxproj/.sln debug buildgen | 2015-07-19 | |
| | | | | * | new includes / one less warning | 2015-07-19 | |
| | | | | * | new .props that has c++ dependencies | 2015-07-19 | |
| | |_|_|/ | |/| | | | |||
| | | | * | Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each... | 2015-07-17 | |
| | | | |\ | |||
| * | | | \ | Merge with head and resolve conflict | 2015-07-17 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
* | | | | | | Merge branch 'master' into zookeeper | 2015-07-17 | |
|\ \ \ \ \ \ | |||
| | | | | * | | rebuild makefile | 2015-07-17 | |
| | | * | | | | Merge github.com:grpc/grpc into no-worries-i-can-wait | 2015-07-17 | |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge with head | 2015-07-16 | |
| |\ \ \ \ \ \ |