aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #2221 from yang-g/no_new_bbq_after_flushGravatar Craig Tiller2015-06-26
|\
* \ Merge pull request #2214 from ctiller/are-includes-saneGravatar Nicolas Noble2015-06-25
|\ \
* \ \ Merge pull request #2197 from jcanizales/bazel-grpc-unsecuredGravatar Nicolas Noble2015-06-25
|\ \ \
* \ \ \ Merge pull request #2224 from stanley-cheung/fix_php_extension_osx_configureGravatar Michael Lumish2015-06-25
|\ \ \ \
| * | | | revert wording of optional in php docGravatar Stanley Cheung2015-06-25
|/ / / /
* | | | Merge pull request #2222 from stanley-cheung/fix_php_extension_osx_configureGravatar Michael Lumish2015-06-25
|\ \ \ \
| * | | | php: update READMEGravatar Stanley Cheung2015-06-25
| * | | | php extension: do not link rt in osxGravatar Stanley Cheung2015-06-25
|/ / / /
| | | * Bug fix. Do not push to incoming_queue after it is flushed.Gravatar yang-g2015-06-25
* | | | Merge pull request #2219 from nicolasnoble/cascade-kick-should-happen-higherGravatar Craig Tiller2015-06-25
|\ \ \ \
| * | | | Reworking the cascade kick to be Windows-specific.Gravatar Nicolas "Pixel" Noble2015-06-25
|/ / / /
* | | | Merge pull request #2217 from murgatroid99/objective_c_plugin_name_changesGravatar Jorge Canizales2015-06-25
|\ \ \ \
* \ \ \ \ Merge pull request #2211 from murgatroid99/objective_c_retain_cycleGravatar Jorge Canizales2015-06-25
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| | * | | Changed argument names in Objective-C generated codeGravatar murgatroid992015-06-25
| |/ / / |/| | |
| * | | Fixed name in commentsGravatar murgatroid992015-06-25
* | | | Merge pull request #2203 from stanley-cheung/cleanup_php_scriptsGravatar Michael Lumish2015-06-25
|\ \ \ \
| | | | * Make this more robust against mergesGravatar Craig Tiller2015-06-25
| | | | * Merge github.com:grpc/grpc into are-includes-saneGravatar Craig Tiller2015-06-25
| | | | |\ | |_|_|_|/ |/| | | |
| | | | * Add a test that headers are properly in build.jsonGravatar Craig Tiller2015-06-25
* | | | | Merge pull request #2209 from murgatroid99/objective_c_const_conversionGravatar Jorge Canizales2015-06-24
|\ \ \ \ \
| | | * | | Fixed 'retain cycle' warnings in GRPCWrappedCall.mGravatar murgatroid992015-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
|/ / / / / /
| | | | * | Regenerate BUILD file (merge didn’t add whitespace)Gravatar Jorge Canizales2015-06-24
| | | | * | Merge master into bazel-grpc-unsecured to solve conflictGravatar Jorge Canizales2015-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
|\ \ \ \ \ \ \ \
| | | | | | * | | replace backticks with $()Gravatar Stanley Cheung2015-06-24
| | | | | | * | | php: refactor and cleanup some scriptsGravatar Stanley Cheung2015-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 pull request #2193 from jcanizales/import-based-on-pathGravatar Michael Lumish2015-06-24
|\ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | Add libz dependency to grpc_unsecure_objcGravatar Jorge Canizales2015-06-23
| | | | | | | | | * | Generate objc_library for grpc_unsecure & gprGravatar Jorge Canizales2015-06-23
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| | | * | | | | | | 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