aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Collapse)AuthorAge
* Merge github.com:grpc/grpc into kinetic-lopsided-poetryGravatar Craig Tiller2015-08-06
|\
| * Merge pull request #2750 from ctiller/propagateGravatar Yang Gao2015-08-06
| |\ | | | | | | Core-supported context propagation
| * \ Merge pull request #2781 from yang-g/stuboptionsGravatar Abhishek Kumar2015-08-05
| |\ \ | | | | | | | | Add StubOptions
* | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetryGravatar Craig Tiller2015-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
| |\ \ \ | | | | | | | | | | Connection backoff interop test client and server
| * \ \ \ Merge pull request #2713 from ctiller/plucking-hellGravatar Vijay Pai2015-08-05
| |\ \ \ \ | | | | | | | | | | | | Allow specific pollers to be woken
| | | | | * 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 ↵Gravatar yang-g2015-08-05
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | reconnect_branch_based_on_jitter
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ed6878412d54ad1a6509de45d6351a3f697bb48.
* | | | | | | Revert "Fixing environments where pkg-config isn't installed."Gravatar Craig Tiller2015-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ed6878412d54ad1a6509de45d6351a3f697bb48.
* | | | | | | Merge github.com:grpc/grpc into kinetic-lopsided-poetryGravatar Craig Tiller2015-08-05
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #2787 from nicolasnoble/no-pkgconfig-is-brokenGravatar Craig Tiller2015-08-04
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Fixing environments where pkg-config isn't installed.
| * | | | | | Merge pull request #2652 from nicolasnoble/tests-depend-on-opensslGravatar Craig Tiller2015-08-04
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | The code evolved enough so that we now have tests that directly depend on OpenSSL
* | | | | | | | Testing port serverGravatar Craig Tiller2015-08-04
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run_tests.py will start a server (if it's not running, or if the running port server mismatches the 'current' one) that serves ports to use for tests. The server is left running after run_tests.py finishes, so that in environments such as Mac and Windows where tests run unshielded from each other, we don't start jumping on already used ports.
| | * / / / / Fixing environments where pkg-config isn't installed.Gravatar Nicolas "Pixel" Noble2015-08-04
| |/ / / / / |/| | | | | | | | | | | | | | | | | Depending on the presence of pkg-config, we're not necessarily doing the right thing in the Makefile. Zlib is a pkg-config dependency, but libm, libpthread, librt aren't.
| | | | | * Add proxy tests to end2end suiteGravatar Craig Tiller2015-08-04
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Currently the oauth2 variant of these tests is disabled. Will work with @jboeuf to figure out how to turn them on.
| | | | * Add StubOptionsGravatar yang-g2015-08-03
| |_|_|/ |/| | |
| | | * merge with head and resolve conflictsGravatar yang-g2015-08-03
| | | |\ | |_|_|/ |/| | |
| | * | Merge github.com:grpc/grpc into plucking-hellGravatar Craig Tiller2015-08-01
| | |\ \ | |_|/ / |/| | | | | | | | | | | Conflicts: Makefile
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if two threads call grpc_completion_queue_pluck on the same completion queue for different tags, there is a 50% chance that we deliver the completion wakeup to the wrong poller - forcing the correct poller to wait until its polling times out before it can return an event up to the application. This change tweaks our polling interfaces so that we can indeed wake a specific poller. Nothing has been performance tuned yet. It's definitely sub-optimal in a number of places. Wakeup file-descriptors should be recycled. We should have a path that avoids calling poll() followed by epoll(). We can probably live without it right at the second though. This code will fail on Windows at least (I'll do that port when I'm in the office and have a Windows machine).
| | | * merge with upstreamGravatar yang-g2015-07-28
| | | |\ | | | |/ | | |/|
* | | | Merge branch 'sometimes-its-good-just-to-check-in-with-each-other' into ↵Gravatar Craig Tiller2015-07-26
|\ \ \ \ | | |/ / | |/| | | | | | yeah-we-know-what-youre-talking-about
| * | | Merge github.com:grpc/grpc into ↵Gravatar Craig Tiller2015-07-26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other Conflicts: src/core/iomgr/tcp_server_windows.c
| | * \ \ Merge pull request #2647 from vjpai/deependGravatar Yang Gao2015-07-24
| | |\ \ \ | | | | | | | | | | | | Dynamic-sized thread pool
| | * \ \ \ Merge pull request #2605 from yang-g/fake_transport_security_to_privateGravatar jboeuf2015-07-24
| | |\ \ \ \ | | | | | | | | | | | | | | Fake transport security to private
| | | | | | * 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 ↵Gravatar Nicolas "Pixel" Noble2015-07-24
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | OpenSSL. Reflecting that in the Makefile so that we don't race against the system when building.
| | | | * 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 ↵Gravatar Craig Tiller2015-07-23
|\| | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other
| * | | Merge pull request #2493 from a-veitch/record_statGravatar Craig Tiller2015-07-23
| |\ \ \ | | | | | | | | | | Census record stats API
| * \ \ \ Merge pull request #2542 from ctiller/tell-me-who-you-might-beGravatar Yang Gao2015-07-23
| |\ \ \ \ | | |_|_|/ | |/| | | Expose call peer uri from C core
| | | | * move fake_transport_security_credentials to private APIGravatar yang-g2015-07-21
| | |_|/ | |/| |
* | | | Merge github.com:grpc/grpc into ↵Gravatar Craig Tiller2015-07-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other Conflicts: include/grpc/grpc.h
| * | | Merge pull request #2474 from nicolasnoble/lets-actually-build-32-bitsGravatar Jan Tattermusch2015-07-20
| |\ \ \ | | | | | | | | | | Making sure we build 32 bits in Jenkins.
| | * | | Making sure that 32 bits is being built and run on Jenkins.Gravatar Nicolas "Pixel" Noble2015-07-21
| | | | |
| | | * | Add ipv4:, ipv6: schemesGravatar Craig Tiller2015-07-20
| | |/ / | |/| |
* | | | Merge github.com:grpc/grpc into ↵Gravatar Craig Tiller2015-07-20
|\| | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other
| * | | Merge branch 'decompression' of https://github.com/dgquintas/grpc into ↵Gravatar Craig Tiller2015-07-19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dgquintas-decompression Conflicts: Makefile vsprojects/Grpc.mak
* | \ \ \ Merge github.com:grpc/grpc into ↵Gravatar Craig Tiller2015-07-17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other
| | * \ \ \ Merge with head and resolve conflictGravatar yang-g2015-07-17
| | |\ \ \ \ | | |/ / / / | |/| | | |