Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | Merge pull request #5359 from nicolasnoble/upmerge | Jan Tattermusch | 2016-02-25 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Upmerge from 0.13 | |||
* \ \ \ \ \ \ \ \ \ | Merge pull request #5407 from stanley-cheung/fix-php-mac-pecl-package | Jan Tattermusch | 2016-02-25 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix PHP pecl package build on Mac | |||
| | | | * \ \ \ \ \ \ | Merge github.com:grpc/grpc into run_gtest | Craig Tiller | 2016-02-25 | |
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||
* | | | | | | | | | | | Merge pull request #5316 from makdharma/patch-1 | Jorge Canizales | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Updated travis to use Xcode 7.2 and SDK 9.2 | |||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5411 from nicolasnoble/round-and-round-we-go | Craig Tiller | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | clang-format all the things. | |||
| * | | | | | | | | | | | | clang-format all the things. | Nicolas "Pixel" Noble | 2016-02-25 | |
|/ / / / / / / / / / / / | ||||
* | | | | | | | | | | | | Merge pull request #5404 from nicolasnoble/format-and-copyright | Craig Tiller | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing format and copyright. | |||
| | | | | | * | | | | | | | Fix bug | Craig Tiller | 2016-02-24 | |
| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Fixing format and copyright. | Nicolas "Pixel" Noble | 2016-02-25 | |
|/ / / / / / / / / / / / | ||||
| | | | | * | | | | | | | Add comment | Craig Tiller | 2016-02-24 | |
| | | | | | | | | | | | | ||||
| | | | | * | | | | | | | Expand gtest suites into individual run_tests tests | Craig Tiller | 2016-02-24 | |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||
| | | | | | | | * | | | Have a dedicated server security connector. | Julien Boeuf | 2016-02-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was overdue and the handshake is now slightly different for clients (channels) and servers. | |||
| | * | | | | | | | | | remove current date from package.xml; | Stanley Cheung | 2016-02-24 | |
| | | | | | | | | | | | ||||
| | * | | | | | | | | | fix bug with pecl install on mac | Stanley Cheung | 2016-02-24 | |
| |/ / / / / / / / / |/| | | | | | | | | | ||||
* | | | | | | | | | | Merge pull request #5315 from makdharma/master | Jorge Canizales | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added tests for code coverage | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #5384 from ctiller/44 | Vijay Pai | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for gcc4.4 | |||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5395 from ctiller/faster-generation | Nicolas Noble | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize generate_projects | |||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5087 from chrisdunelm/coreclr_DefaultSslRootsOverride2 | Jan Tattermusch | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coreclr compatible DefaultSslRootsOverride.cs | |||
| | * | | | | | | | | | | | | Faster code generation | Craig Tiller | 2016-02-24 | |
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge pull request #5401 from daniel-j-born/test_creds | Yang Gao | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Injectable test credentials provider interface. | |||
| | | | * | | | | | | | | | | Fix bug | Craig Tiller | 2016-02-24 | |
| | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | Actually update dockerfile | Craig Tiller | 2016-02-24 | |
| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Use standard include paths. | Dan Born | 2016-02-24 | |
| | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | huh | Craig Tiller | 2016-02-24 | |
| | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | Merge github.com:grpc/grpc into 44 | Craig Tiller | 2016-02-24 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | Use env-var for post git step | Craig Tiller | 2016-02-24 | |
| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Initialize mutex to nullptr. | Dan Born | 2016-02-24 | |
| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Injectable test credentials provider interface. | Dan Born | 2016-02-24 | |
| | | | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | Merge remote-tracking branch 'upstream/master' into v1alpha_to_v1 | yang-g | 2016-02-24 | |
| | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | Order change of includes. | Makarand Dharmapurikar | 2016-02-24 | |
| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Merge pull request #5397 from vjpai/usage_timer | Craig Tiller | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Timer->UsageTimer consistently | |||
| | | | | * | | | | | | | | | Reverted a change, removed empty test. | Makarand Dharmapurikar | 2016-02-24 | |
| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Merge pull request #5387 from vjpai/mac | Kailash Sethuraman | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove outdated ref to openssl from Mac INSTALL instructions | |||
| | | | | | * | | | | | | | | | Fixed nits. | Makarand Dharmapurikar | 2016-02-24 | |
| | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge pull request #5398 from murgatroid99/reports.xml_extraction_fix | Jan Tattermusch | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix name of report.xml in zip execution | |||
| * | | | | | | | | | | | | | | | Fix name of report.xml in zip execution | murgatroid99 | 2016-02-24 | |
|/ / / / / / / / / / / / / / / | ||||
| | * / / / / / / / / / / / / | Timer->UsageTimer consistently | vjpai | 2016-02-24 | |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Merge pull request #5396 from dgquintas/redo-nanopb | Craig Tiller | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | redo the nanopb upgrade | |||
| * | | | | | | | | | | | | | | redo the nanopb upgrade | David Garcia Quintas | 2016-02-24 | |
|/ / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | Merge pull request #5390 from ctiller/tls_init | Vijay Pai | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | Properly initialize TLS var | |||
| | | | * | | | | | | | | | | Merge branch '44' of github.com:ctiller/grpc into 44 | Craig Tiller | 2016-02-24 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge github.com:grpc/grpc into 44 | Craig Tiller | 2016-02-24 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge pull request #5388 from vjpai/bourne_again | Nicolas Noble | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use traditional Bourne shell syntax for piping stdout and stderr | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5365 from ctiller/naming-crisis | Nicolas Noble | 2016-02-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a sanity test to ensure that name aliasing rules are obeyed | |||
| | | * | | | | | | | | | | | | | | Properly initialize TLS var | Craig Tiller | 2016-02-24 | |
| |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | BSD platforms (such as Mac) are likely to have /bin/sh refer to traditional | vjpai | 2016-02-24 | |
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bourne shell syntax, not Bash syntax. Change "|&" to "2>&1 |" since that's the traditional way to redirect stdout and stderr to a pipe | |||
| | * | | | | | | | | | | | | | Remove outdated ref to openssl from Mac instructions | Vijay Pai | 2016-02-24 | |
| | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | * | | Add an implementation firewall against pollset_set | Craig Tiller | 2016-02-24 | |
| | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So multiple implementations can exist in one binary | |||
| | | | | | | | | | | | | * | Merge branch 'hide-the-worker' into hide-the-pollset | Craig Tiller | 2016-02-24 | |
| | | | | | | | | | | | | |\ | | | | | | | | | | | | |_|/ | | | | | | | | | | | |/| | | ||||
| | | | | | | | | | | * | | | Port pollset worker changes to windows | Craig Tiller | 2016-02-24 | |
| | | | | | | | | | | | | | |