aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge github.com:grpc/grpc into oops-i-split-it-againGravatar Craig Tiller2015-06-25
|\
| * Merge pull request #2209 from murgatroid99/objective_c_const_conversionGravatar Jorge Canizales2015-06-24
| |\
| | * Remove const cast warning in GRPCSecureChannel.mGravatar murgatroid992015-06-24
| * | Merge pull request #2148 from a11r/interopsGravatar Eric Anderson2015-06-24
| |\ \
| * \ \ Merge pull request #2202 from nicolasnoble/don-t-recursive-lock-meGravatar Craig Tiller2015-06-24
| |\ \ \
| | | * | Spelling fix: UnImplementedService -> UnimplementedServiceGravatar Abhishek Kumar2015-06-24
| * | | | Merge pull request #2205 from nicolasnoble/threadpools-need-to-cascade-kickGravatar Craig Tiller2015-06-24
| |\ \ \ \
| * \ \ \ \ Merge pull request #2206 from nicolasnoble/windows-needs-to-kick-its-pollset-...Gravatar Craig Tiller2015-06-24
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | 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
| |/ / /
| * | | Merge pull request #2189 from nicolasnoble/vs2013-is-sadGravatar Craig Tiller2015-06-24
| |\ \ \
| * \ \ \ Merge pull request #2185 from ctiller/it-hides-themGravatar Nicolas Noble2015-06-24
| |\ \ \ \
| * \ \ \ \ Merge pull request #2167 from ctiller/everyone-is-specialGravatar David G. Quintas2015-06-24
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #2188 from ctiller/so-freaking-sick-of-irrelevant-merge-co...Gravatar Michael Lumish2015-06-24
| |\ \ \ \ \ \
| | | | | | * | Let's inform the system of the lock to unlock...Gravatar Nicolas "Pixel" Noble2015-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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #2195 from jcanizales/rewrite-grpcclient-includesGravatar Michael Lumish2015-06-24
| |\ \ \ \ \ \ \
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Added commentsGravatar Craig Tiller2015-06-24
| | | | * | | | | | Add BUILD target for Objective-C's RxLibraryGravatar Jorge Canizales2015-06-23
| | |_|/ / / / / / | |/| | | | | | |
| | | * | | | | | Have Cocoapods rename includes in the core wrapperGravatar Jorge Canizales2015-06-23
| | |/ / / / / / | |/| | | | | |
| | * | | | | | Import headers based on path in the generated codeGravatar Jorge Canizales2015-06-23
| | * | | | | | Import headers based on path in sample appGravatar Jorge Canizales2015-06-23
| | * | | | | | Import headers based on path in the tests projectGravatar Jorge Canizales2015-06-23
| | * | | | | | Import headers based on path in the runtime librariesGravatar Jorge Canizales2015-06-23
| | * | | | | | Move header_mappings_dir one dir up so imports are like <RxLibrary/...>Gravatar Jorge Canizales2015-06-23
| |/ / / / / /
| | * | | | | Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflictsGravatar Craig Tiller2015-06-23
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | | | | * | 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
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #2187 from tbetbetbe/grpc-ruby-bump-version-for-release-br...Gravatar Michael Lumish2015-06-23
| |\ \ \ \ \ \
| | | | * | | | 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
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #2183 from yang-g/nilGravatar Nicolas Noble2015-06-23
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | release memory even if the status is falseGravatar yang-g2015-06-23
| | | | | * | Move some code out of src/ into tools/Gravatar Craig Tiller2015-06-23
| | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #2180 from yang-g/constnessGravatar Craig Tiller2015-06-23
| |\ \ \ \ \
| | | * | | | Only copy stuff when status is okGravatar yang-g2015-06-23
| | |/ / / /
| * | | | | Merge pull request #2143 from murgatroid99/core_security_conversion_warningsGravatar jboeuf2015-06-23
| |\ \ \ \ \
| | | * | | | Fix doxyfile for realGravatar yang-g2015-06-23
| | | * | | | clang-format messed up Doxyfile.c++, restoredGravatar yang-g2015-06-23
| | | * | | | Add missing headers to build.jsonGravatar yang-g2015-06-23
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #2171 from ctiller/fix-pollingGravatar Nicolas Noble2015-06-23
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufsGravatar Yang Gao2015-06-23
| |\ \ \ \ \ \
| | | | | | | * Rename Status -> EchoStatus to avoid conflictGravatar Abhishek Kumar2015-06-23
* | | | | | | | Merge github.com:grpc/grpc into oops-i-split-it-againGravatar Craig Tiller2015-06-23
|\| | | | | | |
| * | | | | | | Merge pull request #2141 from murgatroid99/core_support_conversion_warningsGravatar Craig Tiller2015-06-23
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #2165 from nicolasnoble/backup-poller-broke-meGravatar Craig Tiller2015-06-23
| |\ \ \ \ \ \ \ \