aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-05
* Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-05
|\
| * Merge pull request #2767 from ctiller/no-poop-on-pizzaGravatar Abhishek Kumar2015-08-05
| |\
| * \ Merge pull request #2789 from yang-g/cancelGravatar Craig Tiller2015-08-05
| |\ \
| | * | regenerate projectsGravatar yang-g2015-08-05
| | * | Merge remote-tracking branch 'upstream/master' into cancelGravatar yang-g2015-08-05
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #2798 from ctiller/nerd-burgerGravatar Vijay Pai2015-08-05
| |\ \ \
| | * | | Revert "Fixing environments where pkg-config isn't installed."Gravatar Craig Tiller2015-08-05
| |/ / /
* | | | Update zookeeper in docker file againGravatar Hongwei Wang2015-08-04
| | * | allow null tagGravatar yang-g2015-08-04
| * | | Merge pull request #2787 from nicolasnoble/no-pkgconfig-is-brokenGravatar Craig Tiller2015-08-04
| |\ \ \
| * \ \ \ Merge pull request #2790 from nicolasnoble/using-jenkins-for-our-badgeGravatar Craig Tiller2015-08-04
| |\ \ \ \
| | | | * \ Merge remote-tracking branch 'upstream/master' into cancelGravatar yang-g2015-08-04
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #2652 from nicolasnoble/tests-depend-on-opensslGravatar Craig Tiller2015-08-04
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #2791 from pmarks-net/uriGravatar Craig Tiller2015-08-04
| |\ \ \ \ \ \
| | * | | | | | Return normalized IPv4 addresses from grpc_sockaddr_to_uri().Gravatar Paul Marks2015-08-04
| | | | * | | | Moving our build status badge from Travis to Jenkins.Gravatar Nicolas "Pixel" Noble2015-08-05
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #2748 from soltanmm/whats-up-docGravatar Nicolas Noble2015-08-04
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #2346 from jboeuf/upgrade-openssl-1.0.2dGravatar Nicolas Noble2015-08-04
| |\ \ \ \ \ \ \
| | | | | | | * | Add AsyncNotifyWhenDoneGravatar yang-g2015-08-04
| | | | | |_|/ / | | | | |/| | |
| * | | | | | | Merge pull request #2749 from yang-g/default_host_to_nullGravatar Craig Tiller2015-08-04
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #2686 from nathanielmanistaatgoogle/2570Gravatar Craig Tiller2015-08-04
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #2757 from jtattermusch/runtest_polishingGravatar Craig Tiller2015-08-04
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | | | | | | | * | Fixing environments where pkg-config isn't installed.Gravatar Nicolas "Pixel" Noble2015-08-04
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Add zookeeper test in MakefileGravatar Hongwei Wang2015-08-04
| * | | | | | | | Merge pull request #2756 from jtattermusch/csharp_channel_stateGravatar Jan Tattermusch2015-08-04
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Update zookeeper in docker againGravatar Hongwei Wang2015-08-04
| | * | | | | | | | watch connectivity state API has changed in the meantimeGravatar Jan Tattermusch2015-08-04
| | * | | | | | | | add DefaultAuthority constant to channel optionsGravatar Jan Tattermusch2015-08-04
| | * | | | | | | | expose Channel.Target propertyGravatar Jan Tattermusch2015-08-04
| | * | | | | | | | use NULL for default host in grpc_channel_call_createGravatar Jan Tattermusch2015-08-04
| | * | | | | | | | add HealthCheck tests to run_tests.pyGravatar Jan Tattermusch2015-08-04
| | * | | | | | | | Added channel state APIGravatar Jan Tattermusch2015-08-04
| | * | | | | | | | tolerate occasional StatusCode.Internal on timeoutGravatar Jan Tattermusch2015-08-04
| |/ / / / / / / /
| * | | | | | | | Merge pull request #2779 from jtattermusch/properly_decrement_active_portsGravatar Nicolas Noble2015-08-04
| |\ \ \ \ \ \ \ \
| | * | | | | | | | clarified comment and silenced error logGravatar Jan Tattermusch2015-08-04
* | | | | | | | | | Update zookeeper dependencies in docker fileGravatar Hongwei Wang2015-08-04
| * | | | | | | | | Merge pull request #2782 from cblichmann-google/masterGravatar Craig Tiller2015-08-04
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Change cast to avoid warningGravatar Christian Blichmann2015-08-04
| | * | | | | | | | | Use an unsigned pointer compare, as the highest bit may sometimes be set.Gravatar Christian Blichmann2015-08-04
| |/ / / / / / / / /
| | * | | | | | | | properly decrement active_portsGravatar Jan Tattermusch2015-08-03
* | | | | | | | | | Add zookeeper dependencies in jenkins dockerfileGravatar Hongwei Wang2015-08-03
| * | | | | | | | | Merge pull request #2774 from jcanizales/diagnose-jenkinsGravatar Michael Lumish2015-08-03
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Formatting and documentationGravatar Jorge Canizales2015-08-03
| | * | | | | | | | | Use the protoc made when one isn’t yet installedGravatar Jorge Canizales2015-08-03
| * | | | | | | | | | Merge pull request #2772 from nicolasnoble/don-t-commit-cache-filesGravatar Michael Lumish2015-08-03
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Adding a sanity check that the cached makefile variables aren't committed.Gravatar Nicolas "Pixel" Noble2015-08-04
| |/ / / / / / / / / /
* | | | | | | | | | | Let's not commit config cache files.Gravatar Hongwei Wang2015-08-03
| * | | | | | | | | | Merge pull request #2769 from grpc/make_vs2010_happyGravatar Nicolas Noble2015-08-03
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix compilation under VS 2010Gravatar Jan Tattermusch2015-08-03
| |/ / / / / / / / / /