Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into oops-i-split-it-again | Craig Tiller | 2015-06-25 |
|\ | |||
| * | Merge pull request #2209 from murgatroid99/objective_c_const_conversion | Jorge Canizales | 2015-06-24 |
| |\ | | | | | | | Remove const cast warning in GRPCSecureChannel.m | ||
| | * | Remove const cast warning in GRPCSecureChannel.m | murgatroid99 | 2015-06-24 |
| | | | |||
| * | | Merge pull request #2148 from a11r/interops | Eric Anderson | 2015-06-24 |
| |\ \ | | | | | | | | | Expanded testing protocol | ||
| * \ \ | Merge pull request #2202 from nicolasnoble/don-t-recursive-lock-me | Craig Tiller | 2015-06-24 |
| |\ \ \ | | | | | | | | | | | Let's inform the system of the lock to unlock... | ||
| | | * | | Spelling fix: UnImplementedService -> UnimplementedService | Abhishek Kumar | 2015-06-24 |
| | | | | | |||
| * | | | | Merge pull request #2205 from nicolasnoble/threadpools-need-to-cascade-kick | Craig Tiller | 2015-06-24 |
| |\ \ \ \ | | | | | | | | | | | | | Cascade-kick pollsets when shutting down. | ||
| * \ \ \ \ | Merge pull request #2206 from ↵ | Craig Tiller | 2015-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. | Nicolas "Pixel" Noble | 2015-06-24 |
| |/ / / / | |||
| | * / / | Cascade-kick pollsets when shutting down. | Nicolas "Pixel" Noble | 2015-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-sad | Craig Tiller | 2015-06-24 |
| |\ \ \ | | | | | | | | | | | Fixing Visual Studio 2013 build of grpc++. | ||
| * \ \ \ | Merge pull request #2185 from ctiller/it-hides-them | Nicolas Noble | 2015-06-24 |
| |\ \ \ \ | | | | | | | | | | | | | Move some code out of src/ into tools/ | ||
| * \ \ \ \ | Merge pull request #2167 from ctiller/everyone-is-special | David G. Quintas | 2015-06-24 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Return dummy data for empty histograms | ||
| * \ \ \ \ \ | Merge pull request #2188 from ↵ | Michael Lumish | 2015-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... | Nicolas "Pixel" Noble | 2015-06-24 |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | Fixes #2190. In grpc_pollset_work we need to pass down which lock to unlock before actually doing something. | ||
| | * | | | | | Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflicts | Craig Tiller | 2015-06-24 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #2196 from jcanizales/bazel-grx | Michael Lumish | 2015-06-24 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add BUILD target for Objective-C's RxLibrary | ||
| * \ \ \ \ \ \ | Merge pull request #2195 from jcanizales/rewrite-grpcclient-includes | Michael Lumish | 2015-06-24 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Have Cocoapods rename includes in the core wrapper | ||
* | | | | | | | | | Merge github.com:grpc/grpc into oops-i-split-it-again | Craig Tiller | 2015-06-24 |
|\| | | | | | | | | |||
| * | | | | | | | | Merge pull request #2193 from jcanizales/import-based-on-path | Michael Lumish | 2015-06-24 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Don't import using directories created by Cocoapods | ||
* | | | | | | | | | | Added comments | Craig Tiller | 2015-06-24 |
| | | | | | | | | | | |||
| | | | * | | | | | | Add BUILD target for Objective-C's RxLibrary | Jorge Canizales | 2015-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 wrapper | Jorge Canizales | 2015-06-23 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/grpc/grpc/issues/2194 . | ||
| | * | | | | | | Import headers based on path in the generated code | Jorge Canizales | 2015-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192 | ||
| | * | | | | | | Import headers based on path in sample app | Jorge Canizales | 2015-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192 | ||
| | * | | | | | | Import headers based on path in the tests project | Jorge Canizales | 2015-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192 | ||
| | * | | | | | | Import headers based on path in the runtime libraries | Jorge Canizales | 2015-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192 | ||
| | * | | | | | | Move header_mappings_dir one dir up so imports are like <RxLibrary/...> | Jorge Canizales | 2015-06-23 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192 | ||
| | * | | | | | Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflicts | Craig Tiller | 2015-06-23 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec templates/gRPC.podspec.template | ||
| | | | | * | | std::function is no longer implicitly included. Fixing this. | Nicolas "Pixel" Noble | 2015-06-24 |
| | | | | | | | |||
| * | | | | | | Merge pull request #2172 from murgatroid99/podspec_remove_include_paths | Jorge Canizales | 2015-06-23 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | Move /include/... up on pod install, to put it on a search path Cocoapods supports | ||
| * | | | | | | Merge pull request #2187 from ↵ | Michael Lumish | 2015-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 conflict | Craig Tiller | 2015-06-23 |
| | | | | | | | | |||
| | | * | | | | | Made podspec move include/grpc up a level | murgatroid99 | 2015-06-23 |
| | | | | | | | | |||
| | * | | | | | | Bump version of grpc ruby for release on the release branch | Tim Emiola | 2015-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 | ||
| * | | | | | | Merge pull request #2183 from yang-g/nil | Nicolas Noble | 2015-06-23 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Only copy call details when the status is ok. | ||
| | * | | | | | release memory even if the status is false | yang-g | 2015-06-23 |
| | | | | | | | |||
| | | | | * | | Move some code out of src/ into tools/ | Craig Tiller | 2015-06-23 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | It shouldn't count towards coverage | ||
| * | | | | | Merge pull request #2180 from yang-g/constness | Craig Tiller | 2015-06-23 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add missing headers to build.json | ||
| | | * | | | | Only copy stuff when status is ok | yang-g | 2015-06-23 |
| | |/ / / / | |||
| * | | | | | Merge pull request #2143 from murgatroid99/core_security_conversion_warnings | jboeuf | 2015-06-23 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fixed integer conversion warnings in src/core/security | ||
| | | * | | | | Fix doxyfile for real | yang-g | 2015-06-23 |
| | | | | | | | |||
| | | * | | | | clang-format messed up Doxyfile.c++, restored | yang-g | 2015-06-23 |
| | | | | | | | |||
| | | * | | | | Add missing headers to build.json | yang-g | 2015-06-23 |
| | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #2171 from ctiller/fix-polling | Nicolas Noble | 2015-06-23 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Remove return status from maybe_work. | ||
| * \ \ \ \ \ | Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs | Yang Gao | 2015-06-23 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove Protobuf dependency for C++ | ||
| | | | | | | * | Rename Status -> EchoStatus to avoid conflict | Abhishek Kumar | 2015-06-23 |
| | | | | | | | | |||
* | | | | | | | | Merge github.com:grpc/grpc into oops-i-split-it-again | Craig Tiller | 2015-06-23 |
|\| | | | | | | | |||
| * | | | | | | | Merge pull request #2141 from murgatroid99/core_support_conversion_warnings | Craig Tiller | 2015-06-23 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix integer conversion warnings in src/core/support | ||
| * \ \ \ \ \ \ \ | Merge pull request #2165 from nicolasnoble/backup-poller-broke-me | Craig Tiller | 2015-06-23 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixing Windows port after the removal of the backup poller. |