Julien Boeuf
ea94e46b0d
Merge branch 'master' of github.com:grpc/grpc into jwt_verifier
2015-07-08 16:24:31 -07:00
David Garcia Quintas
17bb64981a
Merge branch 'master' of github.com:grpc/grpc into decompression
2015-07-08 15:17:10 -07:00
Craig Tiller
377881204f
Merge branch 'reset-thy-counts-or-fear-my-wrath' into tis-but-thy-name
2015-07-06 10:26:03 -07:00
Jorge Canizales
9506819c50
Fix build breakage of moving include/grpc/ into grpc/
2015-07-02 20:18:43 -07:00
David Garcia Quintas
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
Julien Boeuf
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
Craig Tiller
cb22184aef
Merge github.com:grpc/grpc into tis-but-thy-name
2015-06-29 10:56:18 -07:00
Craig Tiller
08a1cf8f4f
Use connectivity state tracking code in chttp2 transport
2015-06-29 09:37:52 -07:00
Craig Tiller
acf0f07dfc
Unix resolver, bug fixes
2015-06-29 08:24:16 -07:00
Jorge Canizales
bb54ae8073
Add roots.pem bundle to the Bazel target, and use a better bundle name.
2015-06-28 10:25:05 -07:00
Craig Tiller
c7b5f7605e
Factor out channel state watching
2015-06-27 11:48:42 -07:00
Craig Tiller
916246625b
Introduce connector, to help subchannel connect
2015-06-25 16:31:02 -07:00
Craig Tiller
e039f03383
Plumbing transport_op changes through
2015-06-25 12:54:23 -07:00
Craig Tiller
3b1847c528
Merge branch 'oops-i-split-it-again' into tis-but-thy-name
2015-06-25 09:00:34 -07:00
Craig Tiller
4b62811032
Merge github.com:grpc/grpc into tis-but-thy-name
2015-06-25 08:58:23 -07:00
Craig Tiller
6e8c7e87ef
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-25 08:52:40 -07:00
Craig Tiller
f5f1712e1f
Refactoring progress towards integrating client configs
2015-06-25 08:47:26 -07:00
Craig Tiller
3bc8ebd48e
Implementation work for client_config
...
- uri parsing
- dns resolution
2015-06-24 15:41:15 -07:00
Craig Tiller
7df28a7bd2
Merge github.com:grpc/grpc into that-which-we-call-a-rose
...
Introduce resolver_factory
2015-06-24 09:23:52 -07:00
Craig Tiller
9f903dad14
Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflicts
2015-06-24 08:59:27 -07:00
Michael Lumish
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
Craig Tiller
d13794332c
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-24 08:48:14 -07:00
Jorge Canizales
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
Jorge Canizales
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
Craig Tiller
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
Craig Tiller
eb327fba7c
Make it less likely a build.json change triggers a merge conflict
2015-06-23 16:51:38 -07:00
murgatroid99
df3557738c
Made podspec move include/grpc up a level
2015-06-23 16:39:29 -07:00
Craig Tiller
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
Craig Tiller
af69180478
Flesh out things and make them compile
2015-06-23 14:57:07 -07:00
David Garcia Quintas
e75d4c8531
Merge branch 'master' of github.com:grpc/grpc into decompression
2015-06-23 10:37:58 -07:00
Craig Tiller
949b6ee796
Merge github.com:grpc/grpc into oops-i-split-it-again
2015-06-23 09:26:21 -07:00
murgatroid99
5676cd1b5a
Undid removal of podspec header comments
2015-06-22 16:27:56 -07:00
murgatroid99
33863680df
Removed redundant include paths from podspec
2015-06-22 16:25:42 -07:00
Nicolas Noble
10dfcc0d9c
Merge pull request #2158 from murgatroid99/generated_files_info_message
...
Generated files info message
2015-06-22 15:16:58 -07:00
murgatroid99
f680af055e
Regenerated files
2015-06-22 11:20:24 -07:00
Jorge Canizales
fe8ad73ab7
Add pollset_set.h to build.json
2015-06-20 20:22:51 -07:00
David Garcia Quintas
5927aec9b7
Added generated configs
2015-06-19 13:01:52 -07:00
Craig Tiller
f20ad6eaad
Merge branch 'we-dont-need-no-backup' into oops-i-split-it-again
...
Conflicts:
tools/doxygen/Doxyfile.core.internal
2015-06-18 13:25:10 -07:00
Craig Tiller
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
murgatroid99
9fb72cd7b5
Re-enabled warnings in the gRPC podspec
2015-06-18 12:52:47 -07:00
murgatroid99
7da8b1a651
Added missing but included headers to build.json
2015-06-17 12:37:34 -07:00
Craig Tiller
7cce60af96
podspec
2015-06-17 11:17:20 -07:00
murgatroid99
f398d5c9d3
Fixed file renaming in podspec template
2015-06-16 14:07:36 -07:00
Nicolas "Pixel" Noble
52a2322135
Explicitely selecting gpr and grpc instead of trying our best.
2015-06-15 22:48:06 +02:00
Nicolas "Pixel" Noble
b4f35c0344
Transforming gRPC.podspec to use build.json instead of globbing.
2015-06-15 22:32:00 +02:00
Jorge Canizales
cbf50c8bf2
Advance version to 0.6, per the metadata breaking change
2015-06-13 01:34:44 -07:00
Jorge Canizales
461b094cc8
Fix gRPC.podspec to pass pod spec lint
...
- Relax protobuf requirement to alpha version
- Suppress warnings for GRPCClient
- Fix headers search path
- Document hacks.
2015-06-04 12:24:28 -07:00
Jorge Canizales
043dc72f64
Fix version number of gRPC.podspec
...
And solves a few linter issues that prevent it from being submitted to Cocoapods' repo.
2015-06-02 15:15:07 -07:00
Jorge Canizales
44fb295d9f
Move our runtime to proto3 and make the dependency explicit
2015-05-17 16:21:20 -07:00
Vince Gatto
167b9728bf
Allowing OSX platforms to be targeted
2015-05-12 15:33:49 -07:00
murgatroid99
27c0bf4d30
Fixed typo
2015-05-04 09:31:12 -07:00
murgatroid99
4925063b8b
Resolved some comments
2015-05-01 12:35:58 -07:00
Jorge Canizales
146f177fb1
Fixes build by moving the prepare_command back up to the top level
2015-04-28 01:13:15 -07:00
Jorge Canizales
8957cae707
Moves ProtoRPC.podspec into gRPC.podspec
...
So the root of the repository doesn’t have 2 podspecs.
All four libraries are subspecs now.
Adjusts the generated code to account for that.
2015-04-22 23:40:18 -07:00
Jorge Canizales
ba37a3e525
Fixes scheme detection logic and NPE
2015-04-21 17:56:08 -07:00
Jorge Canizales
045fabb290
Moves RxLibrary.podspec into gRPC.podspec
2015-04-21 11:39:37 -07:00
Jorge Canizales
c2d7ecb699
Working podspecs for gRPC core & wrapper
...
- Moves them to the root of the repo.
- Makes them pass lint (except for the release tag warning).
- Includes the script to rename time.h and string.h in the spec.
- Fixes the #includes in the wrapper files.
2015-04-21 09:49:53 -07:00