aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #4920 from a-veitch/census_init_fixGravatar Bogdan Drutu2016-01-27
|\
* \ Merge pull request #4871 from ctiller/mwahGravatar Vijay Pai2016-01-27
|\ \
| | * Remove bad error return in census_initializeGravatar Alistair Veitch2016-01-27
* | | Merge pull request #4919 from murgatroid99/copyright_fixGravatar Craig Tiller2016-01-27
|\ \ \
* \ \ \ Merge pull request #4905 from vjpai/qps_loggingGravatar David G. Quintas2016-01-27
|\ \ \ \
| | * | | Fix copyrightsGravatar murgatroid992016-01-27
| |/ / / |/| | |
* | | | Merge pull request #4887 from wilhuff/buffer-newGravatar Michael Lumish2016-01-27
|\ \ \ \
* \ \ \ \ Merge pull request #4917 from ctiller/copy---Gravatar Michael Lumish2016-01-27
|\ \ \ \ \
| | | * | | Sanity failures (copyright, clang-format)Gravatar vjpai2016-01-27
| | | * | | Merge branch 'master' into qps_loggingGravatar vjpai2016-01-27
| | | |\ \ \
| * | | | | | Fix copyrightsGravatar Craig Tiller2016-01-27
|/ / / / / /
| | | | * | Merge github.com:grpc/grpc into mwahGravatar Craig Tiller2016-01-27
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #4903 from nicolasnoble/ruby-cleanupGravatar Michael Lumish2016-01-26
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #4901 from nicolasnoble/makefile-cleanupGravatar Craig Tiller2016-01-26
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #4788 from murgatroid99/node_binary_precompileGravatar Nicolas Noble2016-01-26
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| | * | | | | | Finally fixing the issue with CC, CX, LD, and AR not being overridable from t...Gravatar Nicolas "Pixel" Noble2016-01-27
| | | | | * | | clang-formatGravatar vjpai2016-01-26
| | | | | * | | Fix copyrightGravatar vjpai2016-01-26
| | | | | * | | No need to put \n at end of a log messageGravatar vjpai2016-01-26
| * | | | | | | Merge branch 'master' into node_binary_precompileGravatar murgatroid992016-01-26
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #4894 from vjpai/qps_localhostGravatar Jan Tattermusch2016-01-26
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #4877 from murgatroid99/node_library_bundleGravatar Nicolas Noble2016-01-26
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge pull request #4904 from ctiller/c++Gravatar Nicolas Noble2016-01-26
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge pull request #4819 from ctiller/less-cpu-sanityGravatar Nicolas Noble2016-01-26
|\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | Properly state client nameGravatar Vijay Pai2016-01-26
| | | | | | | | | * | | Improve logging for testGravatar Vijay Pai2016-01-26
| | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | * | / | | | | | | Alternative ownership for global callbacksGravatar Craig Tiller2016-01-26
| |/ / / / / / / / / |/| | | | | | | | |
| | | | | | * | | | Cleaning up ruby extension code a bit.Gravatar Nicolas "Pixel" Noble2016-01-26
* | | | | | | | | | Merge pull request #4695 from bogdandrutu/masterGravatar Alistair Veitch2016-01-26
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| | | | | | * | | | Cleaning up our Makefile.Gravatar Nicolas "Pixel" Noble2016-01-26
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #4897 from bogdandrutu/fixGravatar Craig Tiller2016-01-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typo.Gravatar Bogdan Drutu2016-01-26
| * | | | | | | | | Initialize census if not initialized yet and some features are available.Gravatar Bogdan Drutu2016-01-26
|/ / / / / / / / /
| | | | * | | | | clang-formatGravatar Vijay Pai2016-01-26
| * | | | | | | | Merge remote-tracking branch 'upstream/master'Gravatar Bogdan Drutu2016-01-26
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| | | | * | | | | localhost -> wildcard addressGravatar Vijay Pai2016-01-26
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #4889 from ctiller/fixesGravatar Jan Tattermusch2016-01-26
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| | | | | | | * Merge branch 'fixes' into mwahGravatar Craig Tiller2016-01-26
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix sanityGravatar Craig Tiller2016-01-26
|/ / / / / / /
| | | | | | * Merge github.com:grpc/grpc into mwahGravatar Craig Tiller2016-01-26
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
| | | | | * | Allocate node Buffer contents with new[]Gravatar Marek Gilbert2016-01-26
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #4883 from soltanmm/fixfixGravatar Nathaniel Manista2016-01-25
|\ \ \ \ \ \
| * | | | | | Add missing importGravatar Masood Malekghassemi2016-01-25
| | | | | | * Merge branch 'mwah' of github.com:ctiller/grpc into mwahGravatar Craig Tiller2016-01-25
| | | | | | |\
| | | | | | * \ Merge github.com:grpc/grpc into mwahGravatar Craig Tiller2016-01-25
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #4847 from jtattermusch/bump_version_0_13Gravatar Craig Tiller2016-01-25
|\ \ \ \ \ \ \ \
| * | | | | | | | update copyrightsGravatar Jan Tattermusch2016-01-25
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into bump_version_0_13Gravatar Jan Tattermusch2016-01-25
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #4855 from jtattermusch/upgrade_csharp_dependenciesGravatar Michael Lumish2016-01-25
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| | | | | * | | | Resolved copyright fix conflictGravatar murgatroid992016-01-25
| | | | | |\ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |