Commit Graph

58 Commits

Author SHA1 Message Date
Nicolas "Pixel" Noble 39937f7376 Putting nanopb files into third_party without being a submodule. 2016-09-23 06:28:04 +02:00
Nicolas "Pixel" Noble fe456e5b48 Removing nanopb submodule. 2016-09-23 06:27:28 +02:00
Nicolas "Pixel" Noble 3f695277cf Upgrading protobuf submodule to 3.0.2. 2016-09-22 21:39:12 +02:00
Jorge Canizales 4343c904e2 Update Protobuf submodule to v3.0.0 (GA) 2016-07-29 15:39:45 -07:00
Jorge Canizales 9e6372380d Update protobuf submodule to 3.0.0-beta-4
Which has the fix for oneofs when using dynamic frameworks in ObjectiveC
2016-07-19 17:35:06 -07:00
Nicolas "Pixel" Noble b15af069da Pinning to protobuf submodule 3.0.0-beta-3.3. 2016-07-07 01:19:31 +02:00
Nicolas "Pixel" Noble b360c8acc7 Regenerating project files, and adding experimental disclaimer. 2016-07-02 00:54:28 +02:00
Jan Tattermusch 2c7caa10f4 update third_party/protobuf to v3.0.0-beta-3.2 2016-06-17 11:46:47 -07:00
Jan Tattermusch 166d48232d Merge remote-tracking branch 'upstream/release-0_14' into HEAD 2016-05-18 21:26:01 -07:00
Jan Tattermusch 4c1dd4bcf9 update third_party/protobuf to v3.0.0-beta3 2016-05-16 15:29:04 -07:00
makdharma c2ec95bad4 Revert "Revert "cronet wrapper code"" 2016-05-11 16:26:15 -07:00
Nicolas "Pixel" Noble c810a38170 Bumping protobuf submodule to beta-3-pre1. 2016-05-11 00:57:55 +02:00
Nicolas "Pixel" Noble 0545d7fa69 Revert "Merge pull request #6214 from makdharma/master"
This reverts commit 48d833a9d8, reversing
changes made to 66e9d8e8a7.
2016-05-09 19:28:17 +02:00
Makarand Dharmapurikar df66507304 moved cronet_c_for_grpc.h in third_party 2016-05-01 15:08:46 -07:00
itessier 2a52203af9 Update boringssl to latest chromium-stable.
This also fixes the x25519_NEON symbol error when importing the gRPC
Python modules on ARM.

Change-Id: Id98cf6b0f9a3a8f5b88204bd0a6ad2346182ba3d
2016-04-20 10:53:28 -07:00
Craig Tiller 3d62fc6834 Reference github boringssl, move to chromium-stable branch head 2016-03-15 09:57:26 -07:00
David Garcia Quintas 2173edfe19 redo the nanopb upgrade 2016-02-24 12:06:01 -08:00
Craig Tiller 7c0715af6c Properly initialize TLS var 2016-02-24 09:57:21 -08:00
David Garcia Quintas 07b4c1cb8d update nanopb version 2016-02-23 15:13:29 -08:00
Craig Tiller eb841e2010 Revert "Revert "Proto API for LB request/responses"" 2016-02-11 15:49:16 -08:00
Craig Tiller c35e2c582f Revert "Proto API for LB request/responses" 2016-02-11 15:45:03 -08:00
David Garcia Quintas 742a783c0d Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-02-11 01:04:28 -08:00
Nicolas "Pixel" Noble ca144fd1e8 Fixing Ruby binary build (again). 2016-02-10 09:28:18 +01:00
David Garcia Quintas 7e46618897 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-02-08 20:07:19 -08:00
Nicolas "Pixel" Noble da46a701c4 2.1.6 doesn't work on MacOS (wheee...) 2016-02-06 01:52:02 +01:00
Nicolas "Pixel" Noble 5219c6d8e8 Properly compiling distributable native gems. 2016-02-05 22:40:59 +01:00
Nicolas "Pixel" Noble 09ac0a46f4 Building the grpc DLLs. 2016-01-31 09:24:11 +01:00
Nicolas "Pixel" Noble 2283ff6638 Fixing dll hell. 2016-01-29 06:49:46 +01:00
Nicolas "Pixel" Noble cb287a11df Allowing for creation of pre-compiled gems, using rack-compiler-dock. 2016-01-28 09:35:41 +01:00
David Garcia Quintas 15f6dfce27 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-21 11:33:47 -08:00
Jan Tattermusch f4c74fa6cd update third_party/protobuf to 3.0.0beta2 2016-01-20 14:39:32 -08:00
David Garcia Quintas 8974a6681c Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2015-12-24 19:36:38 +01:00
Craig Tiller 2d2963e5e9 Actually remove OpenSSL 2015-12-22 12:53:49 -08:00
Craig Tiller 0fe5ee7be3 BoringSSL integration: non-vsprojects changes 2015-12-22 12:50:36 -08:00
David Garcia Quintas ff03847182 Moved nanopb to 3rd party 2015-11-12 09:27:13 +00:00
Jorge Canizales 1d5d4a5b35 Update protobuf submodule to v3.0.0-alpha-4.1 2015-09-09 11:11:59 -07:00
Jan Tattermusch d68ef4f9ae upgrade third_party/protobufs to 3.0.0-beta-1 2015-08-27 08:30:53 -07:00
Jan Tattermusch 0608a00b50 Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3
Conflicts:
	src/csharp/Grpc.IntegrationTesting/InteropClient.cs
2015-08-26 08:50:19 -07:00
Craig Tiller 8d8a52cd58 Update to v1.7 2015-08-24 17:18:32 -07:00
Craig Tiller 16f6dac8e8 Make googletest a submodule 2015-08-24 17:00:04 -07:00
Jan Tattermusch d37e5e865a upgrade protobuf to the latest version 2015-08-13 09:48:48 -07:00
Jan Tattermusch 429a12f98c upgrade to latest protobuf 2015-08-08 00:40:08 -07:00
Jan Tattermusch 59a7d9d74f upgrade protobuf to HEAD 2015-08-08 00:37:10 -07:00
Julien Boeuf b52a4bc4c9 Upgrading to OpenSSL 1.0.2d 2015-07-09 10:16:12 -07:00
Masood Malekghassemi 19b1478f14 Update protobuf to release v3.0.0-alpha-3
Fixes #1759.
2015-05-28 17:06:07 -07:00
Nicolas "Pixel" Noble d5066b725d Updating our protobuf submodule to alpha3 2015-05-27 00:12:04 +02:00
Jan Tattermusch 15514b557c upgrade protobuf latest version containing objectiveC and csharp 2015-05-19 12:28:56 -07:00
Nicolas "Pixel" Noble b98188e826 Upgrading third_party/protobuf to version v3.0.0-alpha-1-150-g7d5cf8d. 2015-05-19 11:30:14 -07:00
Nicolas "Pixel" Noble 8ca92d6ef1 Upgrading to OpenSSL 1.0.2a - https://www.openssl.org/news/secadv_20150319.txt
We'll have to be extra careful when reviewing future pull requests that people aren't reverting that one by accident. It's going to be a common issue.
2015-03-21 01:11:23 +01:00
Nicolas Noble fee065c1c7 Merge branch 'master' of github.com:google/grpc into json
Conflicts:
	src/core/security/credentials.c
2015-01-26 11:41:12 -08:00