635899d062
rebuild makefile
2015-07-17 16:02:24 -07:00
e417f4164d
Merge pull request #2398 from nicolasnoble/we-have-many-solutions-now
...
Fixing VS's documentation.
2015-07-11 20:17:35 -07:00
ed152f8232
Fixing VS's documentation.
...
The nuget command line tool can't find which solution we want to restore packages on. The documentation needs some update.
2015-07-11 22:50:09 +02:00
64d81385f3
Faking tools target for win32.
...
With run_test.py, we need a tools target now. Let's fake it for Windows so we can at least build.
2015-07-11 22:46:08 +02:00
65153e92a8
Merge pull request #2368 from ctiller/they-gave-me-a-badge
...
Add a version string and a function to retrieve it
2015-07-10 16:16:17 -07:00
2e622bc16a
Add a version string and a function to retrieve it
2015-07-10 07:46:03 -07:00
cd9bb5c140
bumped version of C#
2015-07-09 21:27:04 -07:00
69cb6b41c8
Backport of pull request #2313 into release-0_10.
2015-07-10 02:24:50 +02:00
3315a845ef
Merge remote-tracking branch 'upstream/master' into security_context2
2015-07-09 12:32:48 -07:00
ea94e46b0d
Merge branch 'master' of github.com:grpc/grpc into jwt_verifier
2015-07-08 16:24:31 -07:00
85c04f938f
resolve comments
2015-07-07 17:47:31 -07:00
e114a01720
Merge remote-tracking branch 'upstream/master' into security_context2
2015-07-07 16:18:36 -07:00
5ea46ab248
merge with upstream and resolve conflicts
2015-07-06 14:05:54 -07:00
3abe60b9d0
compiles
2015-07-06 14:00:36 -07:00
49dc1146ec
Merge github.com:grpc/grpc into forever-is-a-long-time
2015-06-30 16:38:39 -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
08a1cf8f4f
Use connectivity state tracking code in chttp2 transport
2015-06-29 09:37:52 -07:00
4d74056b08
Merge branch 'forever-is-a-long-time' into tis-but-thy-name
...
Conflicts:
Makefile
vsprojects/Grpc.mak
2015-06-29 08:49:49 -07:00
acf0f07dfc
Unix resolver, bug fixes
2015-06-29 08:24:16 -07:00
c7b5f7605e
Factor out channel state watching
2015-06-27 11:48:42 -07:00
0c5cf25d4e
Merge github.com:grpc/grpc into tis-but-thy-name
2015-06-26 14:42:54 -07:00
8bcba9a08f
Merge pull request #2149 from ctiller/oops-i-split-it-again
...
Initial transport lock split up
2015-06-26 13:58:55 -07:00
ef2a3e22a1
Merge github.com:grpc/grpc into forever-is-a-long-time
2015-06-26 10:48:17 -07:00
052d27b891
Tidy up test to meet our standards
2015-06-26 08:11:34 -07:00
30ee10b785
Rename test into the right place
2015-06-26 08:09:01 -07:00
1aa041ab1a
BLARGHAFLARGHAAHAJHAKJHATJHKAYMNHZIYRN
2015-06-25 18:02:18 -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
fe8592ee99
Merge github.com:grpc/grpc into are-includes-sane
...
Conflicts:
tools/doxygen/Doxyfile.c++.internal
2015-06-25 07:00:18 -07:00
f75fc12e3a
Add a test that headers are properly in build.json
...
Clean up anything that failed
2015-06-25 06:58:00 -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
d13794332c
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-24 08:48:14 -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
31489e3aba
Move some code out of src/ into tools/
...
It shouldn't count towards coverage
2015-06-23 14:27:34 -07:00
adfed03146
Add missing headers to build.json
2015-06-23 13:01:22 -07:00
253aaa6b10
Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs
...
Remove Protobuf dependency for C++
2015-06-23 10:05:20 -07:00
949b6ee796
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-23 09:26:21 -07:00
1a256bd6d8
Merge pull request #2154 from jcanizales/fix-build-json
...
Add pollset_set.h to build.json
2015-06-22 14:51:47 -07:00
5b1fdc5c3d
Merge branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix
2015-06-22 16:47:01 +02:00
fe8ad73ab7
Add pollset_set.h to build.json
2015-06-20 20:22:51 -07:00
ab67485ff0
Merge github.com:grpc/grpc into one-shouldnt-depend-on-protobufs
2015-06-19 15:32:52 -07:00
3afa2dc1c1
Merge branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix
2015-06-19 13:59:25 +02:00
52c6142a30
Merge github.com:grpc/grpc into we-dont-need-no-backup
...
Conflicts:
gRPC.podspec
tools/doxygen/Doxyfile.core.internal
2015-06-18 13:24:15 -07:00
8c0c9744bf
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-18 11:52:29 -07:00
Alistair Veitch