Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2015-12-24 | ||
| | |\ | |_|/ |/| | | ||||
* | | | BoringSSL integration: non-vsprojects changes | 2015-12-22 | ||
|/ / | ||||
| * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2015-12-16 | ||
| |\ | |/ |/| | ||||
* | | Merge branch 'connected-subchannel' into ↵ | 2015-12-10 | ||
|\ \ | | | | | | | | | | ping-ping-ping-ping-ping-ping-ping-ping-ping | |||
| * | | Kill noop_filter.c | 2015-12-09 | ||
| | | | ||||
| * | | Nuke unused files | 2015-12-09 | ||
| | | | ||||
* | | | Merge branch 'connected-subchannel' into ↵ | 2015-12-08 | ||
|\| | | | | | | | | | | | ping-ping-ping-ping-ping-ping-ping-ping-ping | |||
* | | | Start of ping sketch | 2015-12-07 | ||
| | | | ||||
| * | | Merge release-0.12 into master | 2015-12-07 | ||
|/| | | ||||
| | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2015-12-03 | ||
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # BUILD # Makefile # binding.gyp # build.yaml # gRPC.podspec # tools/doxygen/Doxyfile.core.internal # tools/run_tests/sources_and_headers.json # vsprojects/vcxproj/grpc/grpc.vcxproj # vsprojects/vcxproj/grpc/grpc.vcxproj.filters # vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj # vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters | |||
* | | | Merge pull request #4188 from ctiller/no-transport-metadata | 2015-12-02 | ||
|\ \ \ | | | | | | | | | Remove metadata contexts | |||
| | * | | Point gRPC.podspec to pushed BoringSSL version | 2015-12-01 | ||
| | | | | | | | | | | | | | | | | (1.0) | |||
| | * | | Point spec to BoringSSL | 2015-12-01 | ||
| | | | | ||||
* | | | | Merge branch 'release-0_12' | 2015-12-01 | ||
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: src/core/security/credentials.c test/core/security/credentials_test.c | |||
| * | | | Adjust version requirements through samples and tests. | 2015-11-25 | ||
| | | | | ||||
| * | | | Move podspec version to 0.12 | 2015-11-25 | ||
| | | | | ||||
| | * | | Merge github.com:grpc/grpc into no-transport-metadata | 2015-11-25 | ||
| | |\ \ | |_|/ / |/| | | | ||||
* | | | | merge with head | 2015-11-24 | ||
|\ \ \ \ | ||||
| * | | | | AVL: creation, destroy, add | 2015-11-23 | ||
| | | | | | ||||
| | | * | | Remove metadata context from the channel stack | 2015-11-19 | ||
| | | | | | ||||
| | | * | | Static metadata declarations | 2015-11-18 | ||
| | |/ / | |/| | | ||||
* | | | | merge with head | 2015-11-18 | ||
|\| | | | ||||
| | | * | Moved nanopb to 3rd party | 2015-11-12 | ||
| | | | | ||||
* | | | | first part, secure channel only | 2015-11-05 | ||
| |/ / |/| | | ||||
| | * | Proto API for LB request/responses | 2015-11-03 | ||
| |/ |/| | ||||
| * | stream_op cleanup: build system changes | 2015-11-02 | ||
|/ | ||||
* | Prevent XCode 7 from showing spurious warnings | 2015-10-28 | ||
| | | | This will hopefully make xctool work on Travis too (cross fingers!) | |||
* | Merge branch 'master' of github.com:grpc/grpc into microchannels | 2015-10-19 | ||
|\ | ||||
| * | Merge pull request #3726 from dgquintas/iomgr_executor | 2015-10-19 | ||
| |\ | | | | | | | Introducing grpc_executor, for all your threading needs | |||
| * | | Refer to https://github.com/CocoaPods/CocoaPods/issues/4386 regarding hack. | 2015-10-15 | ||
| | | | ||||
| * | | Undo moving include/ one dir up, to ease testing workflow. | 2015-10-15 | ||
| | | | ||||
| * | | Undo Cocoapods’ bug workaround | 2015-10-15 | ||
| | | | ||||
| * | | fixed faulty merge | 2015-10-14 | ||
| | | | ||||
* | | | Merge branch 'master' of github.com:grpc/grpc into microchannels | 2015-10-13 | ||
|\| | | ||||
| | * | Merge branch 'master' of github.com:grpc/grpc into iomgr_executor | 2015-10-12 | ||
| | |\ | ||||
| * | \ | Merge github.com:grpc/grpc into latent-see | 2015-10-09 | ||
| |\ \ \ | | | |/ | | |/| | ||||
| * | | | Move profiling system to gpr | 2015-10-09 | ||
| | | | | ||||
| | * | | Hid test-only functions from surface/call.h | 2015-10-08 | ||
| | | | | ||||
| * | | | Get basic profiler working again | 2015-10-08 | ||
| |/ / | ||||
| | * | Introducing grpc_executor, for all your threading needs | 2015-10-07 | ||
| |/ | ||||
* / | μChannels implementation. | 2015-10-05 | ||
|/ | ||||
* | Merge pull request #3006 from soltanmm/sketchbook | 2015-10-05 | ||
|\ | | | | | Add API tracing, coalesce surface+batch tracing | |||
* | | Making template agree with clang-format. | 2015-10-03 | ||
| | | ||||
| * | Update build files | 2015-10-02 | ||
| | | ||||
| * | Update build tools | 2015-10-02 | ||
|/ | ||||
* | Merge pull request #3602 from grpc/release-0_11 | 2015-10-02 | ||
|\ | | | | | Upmerge from beta to master. | |||
| * | Update versions in Podspec to 0.11.1 | 2015-09-28 | ||
| | | ||||
* | | Merge pull request #3476 from vjpai/block_annotate | 2015-09-25 | ||
|\ \ | | | | | | | Annotate blocking points | |||
| * | | Move block_annotate from iomgr to support since it's used in other | 2015-09-24 | ||
| | | | | | | | | | | | | core places besides iomgr | |||
| * | | Rebuild all project files with new header included | 2015-09-24 | ||
| | | |