aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge branch 'oops-i-split-it-again' into tis-but-thy-nameGravatar Craig Tiller2015-06-25
|\
* | Plumbing transport_op changes throughGravatar Craig Tiller2015-06-25
| |
| * Addressing commentsGravatar Craig Tiller2015-06-25
| |
* | chop chop chopGravatar Craig Tiller2015-06-25
| |
* | Merge branch 'oops-i-split-it-again' into tis-but-thy-nameGravatar Craig Tiller2015-06-25
|\|
* | Merge github.com:grpc/grpc into tis-but-thy-nameGravatar Craig Tiller2015-06-25
|\ \
| | * Simpler codeGravatar Craig Tiller2015-06-25
| | |
| | * Remove dead codeGravatar Craig Tiller2015-06-25
| | |
| | * Merge github.com:grpc/grpc into oops-i-split-it-againGravatar Craig Tiller2015-06-25
| | |\ | | |/ | |/|
* | | s/grpc_transport_op/grpc_transport_stream_op/gGravatar Craig Tiller2015-06-25
| | |
* | | Refactoring progress towards integrating client configsGravatar Craig Tiller2015-06-25
| | |
| * | Merge pull request #2209 from murgatroid99/objective_c_const_conversionGravatar Jorge Canizales2015-06-24
| |\ \ | | | | | | | | Remove const cast warning in GRPCSecureChannel.m
| | * | Remove const cast warning in GRPCSecureChannel.mGravatar murgatroid992015-06-24
| | | |
* | | | Implementation work for client_configGravatar Craig Tiller2015-06-24
| | | | | | | | | | | | | | | | | | | | - uri parsing - dns resolution
| * | | Merge pull request #2148 from a11r/interopsGravatar Eric Anderson2015-06-24
| |\ \ \ | | | | | | | | | | Expanded testing protocol
| * \ \ \ Merge pull request #2202 from nicolasnoble/don-t-recursive-lock-meGravatar Craig Tiller2015-06-24
| |\ \ \ \ | | | | | | | | | | | | Let's inform the system of the lock to unlock...
| | | * | | Spelling fix: UnImplementedService -> UnimplementedServiceGravatar Abhishek Kumar2015-06-24
| | | | | |
| * | | | | Merge pull request #2205 from nicolasnoble/threadpools-need-to-cascade-kickGravatar Craig Tiller2015-06-24
| |\ \ \ \ \ | | | | | | | | | | | | | | Cascade-kick pollsets when shutting down.
| * \ \ \ \ \ Merge pull request #2206 from ↵Gravatar Craig Tiller2015-06-24
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | nicolasnoble/windows-needs-to-kick-its-pollset-on-shutdown On pollset shutdown, we need to unconditionally start the kick cascade.
| | * | | | | On pollset shutdown, we need to unconditionally start the kick cascade.Gravatar Nicolas "Pixel" Noble2015-06-24
| |/ / / / /
| | * / / / Cascade-kick pollsets when shutting down.Gravatar Nicolas "Pixel" Noble2015-06-24
| |/ / / / | | | | | | | | | | | | | | | In the case we're using a threadpool, depending on where the threads are waiting in completion queue's next, they'll get stuck on shutdown because we're only kicking one of them. Instead, let's cascade-kick the pollsets when we shutdown so that we make sure all of them are exitting properly.
| * | | | Merge pull request #2189 from nicolasnoble/vs2013-is-sadGravatar Craig Tiller2015-06-24
| |\ \ \ \ | | | | | | | | | | | | Fixing Visual Studio 2013 build of grpc++.
| * \ \ \ \ Merge pull request #2185 from ctiller/it-hides-themGravatar Nicolas Noble2015-06-24
| |\ \ \ \ \ | | | | | | | | | | | | | | Move some code out of src/ into tools/
| * \ \ \ \ \ Merge pull request #2167 from ctiller/everyone-is-specialGravatar David G. Quintas2015-06-24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Return dummy data for empty histograms
| * \ \ \ \ \ \ Merge pull request #2188 from ↵Gravatar Michael Lumish2015-06-24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ctiller/so-freaking-sick-of-irrelevant-merge-conflicts Make it less likely a build.json change triggers a merge conflict
| | | | | | * | | Let's inform the system of the lock to unlock...Gravatar Nicolas "Pixel" Noble2015-06-24
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes #2190. In grpc_pollset_work we need to pass down which lock to unlock before actually doing something.
* | | | | | | | Merge branch 'that-which-we-call-a-rose' into tis-but-thy-nameGravatar Craig Tiller2015-06-24
|\ \ \ \ \ \ \ \
| * | | | | | | | Missed fileGravatar Craig Tiller2015-06-24
| | | | | | | | |
| * | | | | | | | Merge github.com:grpc/grpc into that-which-we-call-a-roseGravatar Craig Tiller2015-06-24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce resolver_factory
* | | | | | | | | Stub DNS resolverGravatar Craig Tiller2015-06-24
|/ / / / / / / /
| | * | | | | | Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflictsGravatar Craig Tiller2015-06-24
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #2196 from jcanizales/bazel-grxGravatar Michael Lumish2015-06-24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add BUILD target for Objective-C's RxLibrary
| * \ \ \ \ \ \ \ Merge pull request #2195 from jcanizales/rewrite-grpcclient-includesGravatar Michael Lumish2015-06-24
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Have Cocoapods rename includes in the core wrapper
| | | | | | | | | * Merge github.com:grpc/grpc into oops-i-split-it-againGravatar Craig Tiller2015-06-24
| | | | | | | | | |\ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge pull request #2193 from jcanizales/import-based-on-pathGravatar Michael Lumish2015-06-24
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Don't import using directories created by Cocoapods
| | | | | | | | | | * Added commentsGravatar Craig Tiller2015-06-24
| | | | | | | | | | |
| | | | * | | | | | | Add BUILD target for Objective-C's RxLibraryGravatar Jorge Canizales2015-06-23
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of https://github.com/grpc/grpc/issues/2120 Depends on https://github.com/grpc/grpc/pull/2193
| | | * | | | | | | Have Cocoapods rename includes in the core wrapperGravatar Jorge Canizales2015-06-23
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/grpc/grpc/issues/2194 .
| | * | | | | | | Import headers based on path in the generated codeGravatar Jorge Canizales2015-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192
| | * | | | | | | Import headers based on path in sample appGravatar Jorge Canizales2015-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192
| | * | | | | | | Import headers based on path in the tests projectGravatar Jorge Canizales2015-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192
| | * | | | | | | Import headers based on path in the runtime librariesGravatar Jorge Canizales2015-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192
| | * | | | | | | Move header_mappings_dir one dir up so imports are like <RxLibrary/...>Gravatar Jorge Canizales2015-06-23
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192
| | * | | | | | Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflictsGravatar Craig Tiller2015-06-23
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec templates/gRPC.podspec.template
| | | | | * | | std::function is no longer implicitly included. Fixing this.Gravatar Nicolas "Pixel" Noble2015-06-24
| | | | | | | |
| * | | | | | | Merge pull request #2172 from murgatroid99/podspec_remove_include_pathsGravatar Jorge Canizales2015-06-23
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | Move /include/... up on pod install, to put it on a search path Cocoapods supports
| * | | | | | | Merge pull request #2187 from ↵Gravatar Michael Lumish2015-06-23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tbetbetbe/grpc-ruby-bump-version-for-release-branch-release Bump version of grpc ruby for release on the release branch
| | | | * | | | | Make it less likely a build.json change triggers a merge conflictGravatar Craig Tiller2015-06-23
| | | | | | | | |
| | | * | | | | | Made podspec move include/grpc up a levelGravatar murgatroid992015-06-23
| | | | | | | | |
| | * | | | | | | Bump version of grpc ruby for release on the release branchGravatar Tim Emiola2015-06-23
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - grpc ruby 0.9.3 should have released from the release branch but was not - it needs to be re-released from that branch