aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
| | | | | | | | | | * | | Add .xcscheme files for ObjC examplesGravatar Yuchen Zeng2016-06-27
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #6973 from makdharma/network_status_changeGravatar Jan Tattermusch2016-06-27
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Network status tracking
* | | \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6849 from jcanizales/support-dynamic-frameworksGravatar makdharma2016-06-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support dynamic frameworks
| | | | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/release-0_15' into ↵Gravatar murgatroid992016-06-27
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master_merge_release-0_15
| | | | | | * \ \ \ \ \ \ \ \ \ Merge pull request #7054 from jtattermusch/csharp_update_examples_to_0_15Gravatar Jan Tattermusch2016-06-27
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update C# examples to 0.15.0 packages.
| | | | | | | | | | | | | | | * \ Merge github.com:grpc/grpc into %sGravatar Craig Tiller2016-06-27
| | | | | | | | | | | | | | | |\ \
| | | * | | | | | | | | | | | | \ \ Merge pull request #7001 from kpayson64/python_cleanup_threadGravatar Jan Tattermusch2016-06-27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated several threads to use CleanupThread for clean exit
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6888 from yang-g/fixesGravatar Jan Tattermusch2016-06-27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | Minor fixes
| | | * | | | | | | | | | | | | | | | Merge pull request #7027 from ctiller/faster_runtestsGravatar Jan Tattermusch2016-06-27
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove caching of results by run_tests
| | | | * | | | | | | | | | | | | | | | \o/ PythonGravatar Craig Tiller2016-06-27
| | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | Updated several threads to use CleanupThread for clean exitGravatar Ken Payson2016-06-26
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | | | | | | Add a unit test for compression.Gravatar yang-g2016-06-26
| | | | |_|_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge pull request #7072 from ctiller/fix_perf_traceGravatar Craig Tiller2016-06-26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GPR_TIMER misbalancing
| | | | * | | | | | | | | | | | | | | | Fix GPR_TIMER misbalancingGravatar Craig Tiller2016-06-26
| | | |/ / / / / / / / / / / / / / / /
| | | | | | | | | | | * | | | | | | | Merge github.com:grpc/grpc into reuse_portGravatar Craig Tiller2016-06-26
| | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge pull request #7063 from dgquintas/python_compressionGravatar Jan Tattermusch2016-06-25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basic testing of client and sever side compression for Python
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6941 from kpayson64/python_grpc_shutdownGravatar Jan Tattermusch2016-06-25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved grpc_shutdown to end of Py_Finalize()
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge pull request #7049 from kpayson64/clang_format_0_15Gravatar Jan Tattermusch2016-06-25
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clang formatting
| | | * | | | | | | | | \ \ \ \ \ \ \ \ \ \ Merge pull request #6906 from makdharma/2646Gravatar Jan Tattermusch2016-06-25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass NULL in the host parameter of grpc_channel_create_call
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7043 from kpayson64/clang_formatGravatar Jan Tattermusch2016-06-25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clang formatting
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6803 from sreecha/epoll_changesGravatar Craig Tiller2016-06-25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | New epoll based polling implementation
| | | | | | | | | | | | | | | | | | | | | * | | Fix InteropTests.mGravatar Yuchen Zeng2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | | | | | | | | | Merge pull request #7064 from jtattermusch/fix_ruby_package_buildGravatar Jan Tattermusch2016-06-24
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix building ruby package
| | | | | | | | * | | | | | | | | | | | | | | | | Basic testing of client and sever side compressionGravatar David Garcia Quintas2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | * | | | | | | | | | fix building ruby packageGravatar Jan Tattermusch2016-06-24
| | | | | | | | | | | | | | |/ / / / / / / / / /
| | | | | | | | | * | | | | | | | | | | | | | | Fix sanityGravatar Craig Tiller2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Investigate C++ flake in the old 0.14 branchGravatar Jorge Canizales2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Jenkins for that branch, as a backwards-incompatible change was made in the script that runs the tests for all branches. The lines added are exactly the same as those now in master, so that the subsequent merge of 0.14 into master doesn’t conflict.
| | | * | | | | | | | | | | | | | | | | | | | | Merge pull request #6798 from jboeuf/fix_3803Gravatar Jan Tattermusch2016-06-24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #3803
| | | | | | | | | | | | | | | | | | | | | | | | * Remove Unicode from the tests projectGravatar Jorge Canizales2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cocoa pods 1.0.0 introduced it, and Jenkins might have a problem with it
| | | | | | | | | | | | | | | | | | | | | | | | * Ignore deprecation warning in the test of deprecated featureGravatar Jorge Canizales2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | | | Fix clang formattingGravatar Ken Payson2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | * | | | | | | | regenerate filesGravatar Jan Tattermusch2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | * | | | | | | | update grpc nugets to 0.15Gravatar Jan Tattermusch2016-06-24
| | | | | | | | | | | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | |/| | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge pull request #7014 from ctiller/fix_tracingGravatar Jan Tattermusch2016-06-24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable accidentally disabled traces
| | | | | | | | | | | | | | | | | | | | | | | * \ Merge branch 'faster_runtests' into %sGravatar Craig Tiller2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | | | | | | | |/| | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | | | | Fix bad indentationGravatar Craig Tiller2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #7029 from y-zeng/fix-swiftsampleGravatar makdharma2016-06-24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build error of SwiftSample project on Xcode 7.3 (Swift 2.2)
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6934 from makdharma/route_guide_fixesGravatar makdharma2016-06-24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | Modified route_guide sample app to show RPC log
| | | | | | | | | | | | | | | | | | * | | | | | | | Fix clang formattingGravatar Ken Payson2016-06-24
| | | | | | | | | | | | | | | | | |/ / / / / / / /
| | | | | | | | | | | | | | | | * / / / / / / / / Merge release-0_15 into masterGravatar murgatroid992016-06-24
| | | | |_|_|_|_|_|_|_|_|_|_|_|/| | | | | | | | | | | | |/| | | | | | | | | | | | |/ / / / / / / /
| | | | | | | | | | | | | | | | | | | | | | * | FixesGravatar Craig Tiller2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | | | | * Merge master into let-invalidate-channelsGravatar Jorge Canizales2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Had to manually resolve import conflicts in InteropTests.m To be fair, the merge algorithm should have been able to do it.
| | | | | | | | | | | | | | | | * | | | | | | | \ Merge pull request #7040 from murgatroid99/release_version_0.15.0Gravatar Jan Tattermusch2016-06-24
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update version to 0.15.0
| * | | | | | | | | | | | | | | | | | | | | | | | | Don’t checkout specific proto versions in Travis anymoreGravatar Jorge Canizales2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the submodule points to 3.0.0-beta-3.1, which is what we need.
| | * | | | | | | | | | | | | | | | | | | | | | | | Restore fix undid by https://github.com/grpc/grpc/pull/5893Gravatar Jorge Canizales2016-06-24
| |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That PR wasn’t tested nor reviewed adecuately.
| | | | | | | | | | | | | | | | * | | | | | | | | Update version to 0.15.0Gravatar murgatroid992016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * | | | | | | | | Fix Node Windows build errorGravatar murgatroid992016-06-24
| | | | | | | | | | | | | | | |/ / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #7037 from murgatroid99/master_update_0_16Gravatar Jan Tattermusch2016-06-24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | Update master branch to 0.16.0-dev
| | | | | | | | | | * | | | | | | | | | | | | | Moved grpc_shutdown to end of Py_Finalize()Gravatar Ken Payson2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently rely on the __del__ method of a module scope object to call grpc_shutdown(). __del__ methods are not guaranteed to be called, and furthermore there are no guarantees about ordering, leading to shutdown race conditions. This moves grpc_shutdown to Py_Finalize(), which gets called after the Python context is completely cleaned up.
| | | * | | | | | | | | | | | | | | | | | | | | Update master branch to 0.16.0-devGravatar murgatroid992016-06-24
| | |/ / / / / / / / / / / / / / / / / / / / /