635899d062
rebuild makefile
2015-07-17 16:02:24 -07:00
5c3eea3307
Merge pull request #2380 from ctiller/slartiwhatfast
...
Make naming a little more consistent
2015-07-10 16:37:41 -07:00
2c3a35e5cf
Make naming a little more consistent
2015-07-10 14:06:00 -07:00
2e622bc16a
Add a version string and a function to retrieve it
2015-07-10 07:46:03 -07: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
8068f86974
Add a unit test
2015-07-06 15:05:48 -07:00
5ea46ab248
merge with upstream and resolve conflicts
2015-07-06 14:05:54 -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
f8857de339
Merge branch 'master' of https://github.com/grpc/grpc
2015-06-30 20:26:58 -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
b713546e4d
Resolving dependency error in Jenkins
2015-06-29 14:14:37 -07:00
25481f72c1
Resolving merge conflict
2015-06-29 13:27:23 -07: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
ee98d84a02
Add an fd conservation test to verify that fds actually close
2015-06-29 08:45:55 -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
d35f93d1b3
Merges broke the build - regenerating.
2015-06-27 00:57:29 +02:00
ebaa860e08
Update this file
2015-06-26 13:12:58 -07:00
224b04f6ef
Make this more robust against merges
2015-06-25 07:11:18 -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
Alistair Veitch