Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitter | Vijay Pai | 2015-08-05 |
|\ | |||
* \ | Merge pull request #2765 from ctiller/the-test-be-sleepy | Yang Gao | 2015-08-05 |
|\ \ | |||
* \ \ | Merge pull request #2732 from ctiller/primary-goat-whisperer | Vijay Pai | 2015-08-05 |
|\ \ \ | |||
* \ \ \ | Merge pull request #2713 from ctiller/plucking-hell | Vijay Pai | 2015-08-05 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #2767 from ctiller/no-poop-on-pizza | Abhishek Kumar | 2015-08-05 |
|\ \ \ \ \ | |||
| | | | | * | Merge remote-tracking branch 'upstream/master' into reconnect_branch_based_on... | yang-g | 2015-08-05 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | |||
| | | | * | | Merge branch 'primary-goat-whisperer' into the-test-be-sleepy | Craig Tiller | 2015-08-05 |
| | | | |\ \ | | | | |/ / | | | |/| | | |||
| | | * | | | Merge github.com:grpc/grpc into primary-goat-whisperer | Craig Tiller | 2015-08-05 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||
* | | | | | | Merge pull request #2791 from pmarks-net/uri | Craig Tiller | 2015-08-04 |
|\ \ \ \ \ \ | |||
| * | | | | | | Return normalized IPv4 addresses from grpc_sockaddr_to_uri(). | Paul Marks | 2015-08-04 |
* | | | | | | | Merge pull request #2749 from yang-g/default_host_to_null | Craig Tiller | 2015-08-04 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #2779 from jtattermusch/properly_decrement_active_ports | Nicolas Noble | 2015-08-04 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | clarified comment and silenced error log | Jan Tattermusch | 2015-08-04 |
| | | | | | * | | Merge branch 'primary-goat-whisperer' into the-test-be-sleepy | Craig Tiller | 2015-08-04 |
| | | | | | |\ \ | | | | | | |/ / | | | | | |/| | | |||
| | | | | * | | | Back-out unnecessary change | Craig Tiller | 2015-08-04 |
| | | | | | * | | Merge branch 'primary-goat-whisperer' into the-test-be-sleepy | Craig Tiller | 2015-08-04 |
| | | | | | |\ \ | | | | | | |/ / | | | | | |/| | | |||
| | | | | * | | | Merge branch 'plucking-hell' into primary-goat-whisperer | Craig Tiller | 2015-08-04 |
| | | | | |\ \ \ | | | | | |/ / / | | | | |/| | | | |||
| | | | * | | | | Update comment | Craig Tiller | 2015-08-04 |
| | | | * | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-08-04 |
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||
* | | | | | | | | Change cast to avoid warning | Christian Blichmann | 2015-08-04 |
* | | | | | | | | Use an unsigned pointer compare, as the highest bit may sometimes be set. | Christian Blichmann | 2015-08-04 |
| * | | | | | | | properly decrement active_ports | Jan Tattermusch | 2015-08-03 |
* | | | | | | | | Fix compilation under VS 2010 | Jan Tattermusch | 2015-08-03 |
| | | | | | | * | merge with head and resolve conflicts | yang-g | 2015-08-03 |
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | | | |||
| | | * | | | | | Rename grpc_server_add_http2_port to grpc_server_add_insecure_http2_port | Craig Tiller | 2015-08-03 |
| |_|/ / / / / |/| | | | | | | |||
| | | | | * | | Fix edge cases resulting in close not being sent | Craig Tiller | 2015-08-03 |
* | | | | | | | Merge pull request #2743 from ctiller/ampidextrous-parrot | Eric Anderson | 2015-08-03 |
|\ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ | Merge pull request #2751 from ctiller/alphanumeric-juju-fish | Michael Lumish | 2015-08-03 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||
| | | | | | * | | Merge branch 'plucking-hell' into the-test-be-sleepy | Craig Tiller | 2015-08-03 |
| | | | | | |\ \ | | | | | |_|/ / | | | | |/| | | | |||
| | | | * | | | | Fix typo | Craig Tiller | 2015-08-03 |
| | | | | | * | | Merge branch 'plucking-hell' into the-test-be-sleepy | Craig Tiller | 2015-08-03 |
| | | | | | |\ \ | | | | | |_|/ / | | | | |/| | | | |||
| | | | * | | | | Dont crash on too many pluckers | Craig Tiller | 2015-08-01 |
| | | | * | | | | Formalize max pluckers | Craig Tiller | 2015-08-01 |
| | | | * | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-08-01 |
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||
| | | * | | | | | check before unref, this will fail in BadCreds test | yang-g | 2015-07-31 |
| |_|/ / / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #2717 from ctiller/yeah-we-know-what-youre-talking-about | Yang Gao | 2015-07-31 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Respond to review | Craig Tiller | 2015-07-31 |
| | * | | | | | | Remove optional parameter from watch connectivity state | Craig Tiller | 2015-07-31 |
| | | | | | * | | Spam cleanup | Craig Tiller | 2015-07-31 |
| | | | | |/ / | |||
| | | | | * | | Merge branch 'plucking-hell' into primary-goat-whisperer | Craig Tiller | 2015-07-31 |
| | | | | |\ \ | | | | | |/ / | | | | |/| | | |||
| | | * / | | | Switch ALPN/NPN to advertise only h2 | Craig Tiller | 2015-07-31 |
| |_|/ / / / |/| | | | | | |||
| | | * | | | Save some iterations | Craig Tiller | 2015-07-31 |
| | | | * | | Merge branch 'plucking-hell' into primary-goat-whisperer | Craig Tiller | 2015-07-31 |
| | | | |\ \ | | | | |/ / | | | |/| | | |||
* | | | | | | Merge github.com:grpc/grpc into insolent-pork-chop | Craig Tiller | 2015-07-31 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | * | | | | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | Craig Tiller | 2015-07-31 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | * | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-07-30 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | | | * | | Merge branch 'plucking-hell' into primary-goat-whisperer | Craig Tiller | 2015-07-30 |
| | | | |\ \ | | | | |/ / | | | |/| | | |||
| * | | | | | Merge pull request #2723 from a-veitch/issue_2710 | Michael Lumish | 2015-07-30 |
| |\ \ \ \ \ | |||
| | | | * \ \ | Merge branch 'plucking-hell' of github.com:ctiller/grpc into plucking-hell | Craig Tiller | 2015-07-30 |
| | | | |\ \ \ | |||
| | | | * \ \ \ | Merge branch 'regen-and-vs-tweaks' of github.com:nicolasnoble/grpc into tepid... | Craig Tiller | 2015-07-30 |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | |