44a127c80f
Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about
...
Conflicts:
vsprojects/Grpc.mak
vsprojects/grpc.sln
vsprojects/grpc/grpc.vcxproj
vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj
vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj
vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj
vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj
vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj
vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj
vsprojects/grpc_unsecure/grpc_unsecure.vcxproj
2015-07-31 07:45:59 -07:00
6796805897
Merge branch 'master' into issue_2709
2015-07-30 14:35:22 -07:00
ff32faf3c9
Move grpc_census_call_*_context calls into public header
2015-07-30 09:54:15 -07:00
83f4d4e218
Add a subchannel factory decorator library
2015-07-29 18:14:41 -07:00
b256faa353
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
2015-07-23 11:28:16 -07:00
5126bb6d82
Merge pull request #2493 from a-veitch/record_stat
...
Census record stats API
2015-07-23 09:57:58 -07:00
b46f3f400e
fix build
2015-07-20 13:34:10 -07:00
698d00c60e
Add ipv4:, ipv6: schemes
2015-07-20 12:32:58 -07:00
9d25e94682
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
2015-07-20 10:31:12 -07:00
8584cb108d
Merge pull request #2497 from jcanizales/update-head-v-to-0.7
...
Move head podspec to v0.7.
2015-07-20 08:57:01 -07:00
63c3efb6fa
Move head podspec to v0.7.
...
Readd the commented-out config to suppress warnings, to have it handy
for submissions.
2015-07-17 18:53:20 -07:00
635899d062
rebuild makefile
2015-07-17 16:02:24 -07:00
48cb07c909
Client connectivity API
...
Initial plumbing work; needs tests and more client_channel
implementation.
2015-07-15 16:16:15 -07:00
e0d581b6ad
Merge branch 'master' of github.com:grpc/grpc into decompression
...
# Conflicts:
# Makefile
# include/grpc++/client_context.h
# include/grpc++/server_context.h
# src/cpp/client/client_context.cc
# src/cpp/server/server_context.cc
# vsprojects/Grpc.mak
2015-07-15 14:07:18 -07:00
a882299984
Merge branch 'master' into lockfree-stack
2015-07-10 19:48:17 -07:00
005e305c22
Initial checkin commit for lockfree stack.
...
Tests not yet included.
2015-07-10 15:18:45 -07:00
2e622bc16a
Add a version string and a function to retrieve it
2015-07-10 07:46:03 -07:00
14ce90ff82
Merge branch 'master' of github.com:grpc/grpc into decompression
2015-07-09 16:18:14 -07:00
ea94e46b0d
Merge branch 'master' of github.com:grpc/grpc into jwt_verifier
2015-07-08 16:24:31 -07:00
17bb64981a
Merge branch 'master' of github.com:grpc/grpc into decompression
2015-07-08 15:17:10 -07:00
377881204f
Merge branch 'reset-thy-counts-or-fear-my-wrath' into tis-but-thy-name
2015-07-06 10:26:03 -07:00
9506819c50
Fix build breakage of moving include/grpc/ into grpc/
2015-07-02 20:18:43 -07:00
8a187099ec
Merge branch 'master' of github.com:grpc/grpc into decompression
...
# Conflicts:
# Makefile
# gRPC.podspec
# src/core/surface/call.c
# src/core/transport/chttp2/frame_data.c
# tools/doxygen/Doxyfile.core.internal
# vsprojects/Grpc.mak
2015-07-01 14:52:44 -07:00
feca1bf06c
Adding JWT verifier.
...
Still missing:
- Caching of the already checked JWTs (although it could be done at an
upper layer).
- Caching of the jwks_uri to avoid 2 roundtrips for each verification.
2015-06-30 11:36:03 +02:00
cb22184aef
Merge github.com:grpc/grpc into tis-but-thy-name
2015-06-29 10:56:18 -07:00
08a1cf8f4f
Use connectivity state tracking code in chttp2 transport
2015-06-29 09:37:52 -07:00
acf0f07dfc
Unix resolver, bug fixes
2015-06-29 08:24:16 -07:00
bb54ae8073
Add roots.pem bundle to the Bazel target, and use a better bundle name.
2015-06-28 10:25:05 -07:00
c7b5f7605e
Factor out channel state watching
2015-06-27 11:48:42 -07:00
916246625b
Introduce connector, to help subchannel connect
2015-06-25 16:31:02 -07:00
e039f03383
Plumbing transport_op changes through
2015-06-25 12:54:23 -07:00
3b1847c528
Merge branch 'oops-i-split-it-again' into tis-but-thy-name
2015-06-25 09:00:34 -07:00
4b62811032
Merge github.com:grpc/grpc into tis-but-thy-name
2015-06-25 08:58:23 -07:00
6e8c7e87ef
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-25 08:52:40 -07:00
f5f1712e1f
Refactoring progress towards integrating client configs
2015-06-25 08:47:26 -07:00
3bc8ebd48e
Implementation work for client_config
...
- uri parsing
- dns resolution
2015-06-24 15:41:15 -07:00
7df28a7bd2
Merge github.com:grpc/grpc into that-which-we-call-a-rose
...
Introduce resolver_factory
2015-06-24 09:23:52 -07:00
9f903dad14
Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflicts
2015-06-24 08:59:27 -07:00
269575ac0e
Merge pull request #2195 from jcanizales/rewrite-grpcclient-includes
...
Have Cocoapods rename includes in the core wrapper
2015-06-24 08:52:52 -07:00
d13794332c
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-24 08:48:14 -07:00
59bb9d7d56
Have Cocoapods rename includes in the core wrapper
...
Fixes https://github.com/grpc/grpc/issues/2194 .
2015-06-23 21:13:29 -07:00
ea9b4fdd27
Move header_mappings_dir one dir up so imports are like <RxLibrary/...>
...
Part of fixing https://github.com/grpc/grpc/issues/2192
2015-06-23 20:40:12 -07:00
e2288fcd8d
Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflicts
...
Conflicts:
gRPC.podspec
templates/gRPC.podspec.template
2015-06-23 18:32:26 -07:00
eb327fba7c
Make it less likely a build.json change triggers a merge conflict
2015-06-23 16:51:38 -07:00
df3557738c
Made podspec move include/grpc up a level
2015-06-23 16:39:29 -07:00
009886cf79
Merge github.com:grpc/grpc into that-which-we-call-a-rose
...
Conflicts:
gRPC.podspec
tools/doxygen/Doxyfile.core.internal
2015-06-23 16:26:18 -07:00
af69180478
Flesh out things and make them compile
2015-06-23 14:57:07 -07:00
e75d4c8531
Merge branch 'master' of github.com:grpc/grpc into decompression
2015-06-23 10:37:58 -07:00
949b6ee796
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-23 09:26:21 -07:00
5676cd1b5a
Undid removal of podspec header comments
2015-06-22 16:27:56 -07:00
Craig Tiller