Commit Graph

397 Commits

Author SHA1 Message Date
Jan Tattermusch 4d5c3102a1 fix remaining license notices 2017-06-08 11:22:41 +02:00
David Garcia Quintas aebcdbd732 master bumped to 1.5.x 2017-05-30 14:14:27 -07:00
David Garcia Quintas 9e1acc0796 master to 1.4.0-dev 2017-04-13 16:30:15 -07:00
Nicolas "Pixel" Noble e44a50ffd7 Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0 2017-03-24 00:54:47 +01:00
Alexander Polcyn 3e30832cca bump v1.2.x branch to 1.2.1-pre1 2017-03-20 17:00:45 -07:00
David Garcia Quintas 69e5a28635 Going for 1.2.0 2017-03-20 12:51:17 -07:00
Muxi Yan 021fa52582 Merge pull request #10157 from muxi/advance-protoc-version
Advance ProtoCompiler version and fix podspecs
2017-03-17 01:03:54 -07:00
Muxi Yan 37d3fba391 Relieve ios deployment version to 7.0 2017-03-16 19:33:53 -07:00
Ken Payson 12ca7d319c Bump 1.2.x version to pre-2 2017-03-16 11:01:06 -07:00
David Garcia Quintas 904e7f53ae Introducing 1.2.0-pre1 2017-03-09 15:02:19 -08:00
David Garcia Quintas 74cec10619 Bumped version to 1.3.0-dev 2017-03-09 15:00:26 -08:00
Muxi Yan ed20a69939 Resolve generate_project failure 2017-02-06 13:42:58 -08:00
Muxi Yan 27e9db4393 Add modification warning to templated files 2017-01-30 09:22:30 -08:00
Muxi Yan 690aee6d30 Automatedly advance ObjC version numbers 2017-01-27 04:18:26 +00:00
Muxi Yan de30b0ae36 missing file 2016-11-28 12:03:07 -08:00
Muxi Yan a7f03f6423 Advance objective c version to v1.0.2 2016-11-28 11:29:19 -08:00
Muxi Yan 447d0a22e6 Advance versions of gRPC from v1.0.1-pre1 to v1.0.1 2016-10-25 14:14:12 -07:00
Muxi Yan 6758caae31 Advance versions from 1.0.0 to 1.0.1-pre1 2016-10-17 17:10:26 -07:00
Jorge Canizales 4a18c67b77 Move Podspecs to v1 2016-08-18 13:26:25 -07:00
Jorge Canizales 8ac55f8a8c Solve merge conflict at gRPC-ProtoRPC.podspec 2016-08-08 18:39:56 -07:00
Jorge Canizales a9b1c5cbe1 Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-archive-fix 2016-08-07 18:46:38 -07:00
Jorge Canizales e8f088e522 Remove obsolete template notices in podspecs 2016-08-03 15:37:56 -07:00
Jorge Canizales f8c4580939 Commit as 1.0.0-pre1 so we can release already. 2016-07-18 17:51:31 -07:00
Jorge Canizales 854c167069 We’re done with the underscore tags for good!
Yay compatibility and predictability!
2016-07-18 12:30:01 -07:00
Jorge Canizales e4704d3eda “Allow non-modular includes in framework modules”
It’s the magic sentence that allows pods dependent on RxLibrary to be
archived correctly by XCode.

It’s less than ideal, and seems arbitrary (why RxLibrary specifically?),
so we’ll try to produce a minimal case and open an issue with it in the
Cocoapods repo.
2016-07-18 11:25:51 -07:00
Jorge Canizales 854b81a83b Advance versions from 0.14 -> 1.0
Pending:

- Tag BoringSSL repo.
- Tag gRPC repo.
- Build the plugin, zip it, and add it to the release.
- Push Cocoapods to trunk.
2016-07-15 11:23:48 -07:00
Nicolas "Pixel" Noble 4150e9e2f5 gRPC.podspec shouldn't be a template anymore. 2016-07-12 19:18:56 +02:00
Craig Tiller 13c0940f66 Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout 2016-06-15 09:41:33 -07:00
Yuchen Zeng d7a15b86b7 Merge remote-tracking branch 'upstream/master' into base64_decode 2016-06-09 11:02:10 -07:00
Craig Tiller 0ca68b7cb1 Merge github.com:grpc/grpc into error 2016-06-09 07:50:50 -07:00
Jan Tattermusch 1bc2976a0f Merge pull request #6481 from dgquintas/compression_md_level_bis
Allow servers to select compression level via initial MD & overall compression cleanup
2016-06-08 19:17:20 -07:00
Yuchen Zeng 0a0c1b0d59 Merge remote-tracking branch 'upstream/master' into base64_decode 2016-06-08 17:52:05 -07:00
David Garcia Quintas 533add5a87 Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis 2016-06-07 21:21:27 -07:00
Adam Michalik bf10c82bf8 implement support for adding external fd to server 2016-06-07 15:09:19 -07:00
Adam Michalik 321b1fb1c2 separate posix functionality to grpc_posix.h 2016-06-07 15:09:19 -07:00
Craig Tiller c97065da86 Merge github.com:grpc/grpc into error 2016-06-07 13:00:14 -07:00
Craig Tiller 2888bd58b0 Merge github.com:grpc/grpc into error 2016-06-07 11:00:42 -07:00
David Garcia Quintas a0d7491e62 Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation 2016-06-06 16:25:48 -07:00
Jan Tattermusch 87ec3b77b5 Merge pull request #6750 from makdharma/cronet
cronet build related changes to build.yaml, and added ifdef guard around objective_c cronet code.
2016-06-06 12:44:12 -07:00
Craig Tiller d925c93047 Merge github.com:grpc/grpc into error 2016-06-06 08:38:50 -07:00
David Garcia Quintas 55c08f81cf Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis 2016-06-03 14:18:01 -07:00
Jan Tattermusch 6c81c25653 Merge pull request #6306 from y-zeng/win32_suffix
Change win32 file suffix
2016-06-03 16:13:51 -04:00
David Garcia Quintas e7518461c2 Merge branch 'master' of github.com:grpc/grpc into lr_hook 2016-06-02 10:24:51 -07:00
Makarand Dharmapurikar 2a2599b5ca incremental fix - removed cronet dependency from grpc_secure 2016-06-01 15:19:06 -07:00
Makarand Dharmapurikar 38d8055306 cronet build related changes 2016-06-01 15:02:04 -07:00
Craig Tiller 4b5e757147 Merge github.com:grpc/grpc into error 2016-06-01 14:55:33 -07:00
Jan Tattermusch 6eb2380a8f Merge pull request #6702 from a-veitch/add_proto
Add census protos.
2016-06-01 14:38:06 -04:00
Craig Tiller 4c751ebd50 Merge github.com:grpc/grpc into error 2016-06-01 09:34:42 -07:00
David Garcia Quintas 2a50dfefdc s/grpc_pops/grpc_polling_entity 2016-05-31 15:10:58 -07:00
Yuchen Zeng 4594bd9d1b Merge remote-tracking branch 'upstream/master' into base 2016-05-31 14:19:57 -07:00