aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-06
|\
| * Merge pull request #2750 from ctiller/propagateGravatar Yang Gao2015-08-06
| |\
| * \ Merge pull request #2781 from yang-g/stuboptionsGravatar Abhishek Kumar2015-08-05
| |\ \
* | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-05
|\| | |
| | | * Merge github.com:grpc/grpc into propagateGravatar Craig Tiller2015-08-05
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitterGravatar Vijay Pai2015-08-05
| |\ \ \
| * \ \ \ Merge pull request #2713 from ctiller/plucking-hellGravatar Vijay Pai2015-08-05
| |\ \ \ \
* | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-05
|\| | | | |
| | | | | * Cleanup unnecessary testGravatar Craig Tiller2015-08-05
| | | | * | regenerate projectsGravatar yang-g2015-08-05
| | | | * | Merge remote-tracking branch 'upstream/master' into stuboptionsGravatar yang-g2015-08-05
| | | | |\ \
| | | * | | | regenerate projectsGravatar yang-g2015-08-05
| | | * | | | Merge remote-tracking branch 'upstream/master' into reconnect_branch_based_on...Gravatar yang-g2015-08-05
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| * | | | | | regenerate projectsGravatar yang-g2015-08-05
| | | | | | * Merge github.com:grpc/grpc into propagateGravatar Craig Tiller2015-08-05
| | | | | | |\ | | | | | |_|/ | | | | |/| |
| | | | * | | Revert "Fixing environments where pkg-config isn't installed."Gravatar Craig Tiller2015-08-05
| | | | * | | Merge pull request #2787 from nicolasnoble/no-pkgconfig-is-brokenGravatar Craig Tiller2015-08-04
| | |_|/| | | | |/| | | | |
| * | | | | | Merge pull request #2652 from nicolasnoble/tests-depend-on-opensslGravatar 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
| | | | | | * Add proxy tests to end2end suiteGravatar Craig Tiller2015-08-04
| | |_|_|_|/ | |/| | | |
| | | | | * Add StubOptionsGravatar yang-g2015-08-03
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-03
|\| | | |
| | | | * merge with head and resolve conflictsGravatar yang-g2015-08-03
| | | | |\ | | |_|_|/ | |/| | |
| | | * | Merge github.com:grpc/grpc into plucking-hellGravatar Craig Tiller2015-08-01
| | | |\ \ | | |_|/ / | |/| | |
* | | | | Add zookeeper end-to-end testGravatar Hongwei Wang2015-07-31
| * | | | Exclude uds from default hostname testsGravatar Craig Tiller2015-07-29
| * | | | Add a subchannel factory decorator libraryGravatar Craig Tiller2015-07-29
| | | * | Allow specific pollers to be wokenGravatar Craig Tiller2015-07-29
* | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-07-28
|\ \ \ \ \ | | |_|/ / | |/| | |
| | | | * merge with upstreamGravatar yang-g2015-07-28
| | | | |\ | | |_|_|/ | |/| | |
* | | | | Merge branch 'iomgr-refcounting' of https://github.com/nicolasnoble/grpc into...Gravatar Hongwei Wang2015-07-27
|\ \ \ \ \
| | | * \ \ Merge branch 'sometimes-its-good-just-to-check-in-with-each-other' into yeah-...Gravatar Craig Tiller2015-07-26
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each...Gravatar Craig Tiller2015-07-26
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #2647 from vjpai/deependGravatar Yang Gao2015-07-24
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #2605 from yang-g/fake_transport_security_to_privateGravatar jboeuf2015-07-24
| |\ \ \ \ \ \
| | | | | | | * Add reconnect interop test client and serverGravatar yang-g2015-07-24
| | | | | |_|/ | | | | |/| |
| | | | | | * The code evolved enough so that we now have tests that directly depend on Ope...Gravatar Nicolas "Pixel" Noble2015-07-24
| | |_|_|_|/ | |/| | | |
| | | * | | Merge branch 'master' into deependGravatar Vijay Pai2015-07-24
| | | |\ \ \ | | |_|/ / / | |/| | | |
| | | | | * Make passing NULL for host not crashGravatar Craig Tiller2015-07-23
| | | | |/
| | | * | Add dynamic thread pool and initial port of testGravatar vjpai2015-07-23
| | | | * Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each...Gravatar Craig Tiller2015-07-23
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #2493 from a-veitch/record_statGravatar Craig Tiller2015-07-23
| |\ \ \ \
| * \ \ \ \ Merge pull request #2542 from ctiller/tell-me-who-you-might-beGravatar Yang Gao2015-07-23
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | | | * | move fake_transport_security_credentials to private APIGravatar yang-g2015-07-21
| | |_|/ / | |/| | |
| | | | * Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each...Gravatar Craig Tiller2015-07-20
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge pull request #2474 from nicolasnoble/lets-actually-build-32-bitsGravatar Jan Tattermusch2015-07-20
| |\ \ \ \
| | * | | | Making sure that 32 bits is being built and run on Jenkins.Gravatar Nicolas "Pixel" Noble2015-07-21
* | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-07-20
|\| | | | |
| | | * | | Add ipv4:, ipv6: schemesGravatar Craig Tiller2015-07-20
| | |/ / / | |/| | |