Commit Graph

511 Commits

Author SHA1 Message Date
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
David Garcia Quintas 8bec6f6a55 Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation 2016-05-31 13:59:37 -07:00
Craig Tiller 69f3e2bf2e Revert "Remove legacy poller"
This reverts commit d88e15cee7.
2016-05-31 13:45:24 -07:00
Alistair Veitch d69354e488 Merge branch 'master' into add_proto 2016-05-24 09:03:47 -07:00
Craig Tiller 48abdde197 Merge github.com:grpc/grpc into error 2016-05-24 06:55:28 -07:00
Craig Tiller c4c6ecf8e9 Merge github.com:grpc/grpc into test_affine 2016-05-23 12:48:55 -07:00
Alistair Veitch 30fe63243a end-to-end compilation 2016-05-23 10:11:28 -07:00
Craig Tiller d88e15cee7 Remove legacy poller 2016-05-20 12:22:37 -07:00
David Garcia Quintas 772f485334 Merge branch 'master' of github.com:grpc/grpc into lr_hook 2016-05-19 14:56:03 -07:00
Julien Boeuf a4880374f9 Merge branch 'master' of github.com:grpc/grpc into credentials_refactoring 2016-05-18 22:12:43 -07:00
David Garcia Quintas ac0944701a Merge branch 'compression_incoming_checks' into compression_md_level_bis 2016-05-18 20:25:57 -07:00
Craig Tiller 8517886c6a Move load_file into iomgr 2016-05-18 16:09:16 -07:00
David Garcia Quintas d013e9b985 Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation 2016-05-18 11:00:31 -07:00
Craig Tiller d6a5b803f4 Merge github.com:grpc/grpc into error 2016-05-13 20:17:38 -07:00
Jan Tattermusch effd74c3cc Merge pull request #5456 from ctiller/cleaner-posix3
Splitting out a pure poll() based event engine
2016-05-13 11:37:12 -07:00
Yuchen Zeng d982bba41d Add base64 decoder 2016-05-12 18:53:52 -07:00
David Garcia Quintas 6d0b4d20c0 Merge branch 'master' of github.com:grpc/grpc into merge 2016-05-12 14:28:36 -07:00
Makarand Dharmapurikar d46efd7812 replaced header list with filegroup in build.yaml. 2016-05-11 16:56:39 -07:00
makdharma c2ec95bad4 Revert "Revert "cronet wrapper code"" 2016-05-11 16:26:15 -07:00
Craig Tiller a58ed7cfab Merge github.com:grpc/grpc into error 2016-05-11 10:55:18 -07:00
Craig Tiller fe01b58223 Merge github.com:grpc/grpc into cleaner-posix3 2016-05-11 08:05:59 -07:00
Julien Boeuf bae6a4cb43 Merge branch 'master' of https://github.com/grpc/grpc into credentials_refactoring 2016-05-10 15:26:17 -07:00
Jan Tattermusch fffd296bc5 Merge pull request #6279 from dgquintas/lb_proto_v1
Updated load balancer proto to v1
2016-05-10 10:15:42 -07:00
Nicolas Noble b98e24b32b Merge pull request #6480 from jcanizales/update-version-master
Update podspec versions in master branch
2016-05-09 23:13:44 -07:00
Craig Tiller 42342cbebb Revert "cronet wrapper code" 2016-05-09 08:12:35 -07:00
Jorge Canizales f4639d4858 Move podspec to version 0.14 2016-05-06 16:41:36 -07:00
Jorge Canizales 4c20566834 Depend on latest BoringSSL 2016-05-06 16:40:25 -07:00
Jorge Canizales f58b4f41ff Have Cocoapods read from submodules too, for nanopb 2016-05-06 16:40:21 -07:00
Jorge Canizales 111c95df79 Move podspec to version 0.13 2016-05-06 16:40:14 -07:00
Craig Tiller ddad978996 API fuzzer compiles with new error handling 2016-05-05 17:11:31 -07:00
Nicolas Noble 48d833a9d8 Merge pull request #6214 from makdharma/master
cronet wrapper code
2016-05-05 14:09:17 -07:00
Craig Tiller 4ba6a646cd Merge branch 'credentials_refactoring' of github.com:jboeuf/grpc into error 2016-05-05 13:01:39 -07:00
Craig Tiller 81be250ee7 Merge github.com:grpc/grpc into error 2016-05-05 08:44:51 -07:00
Julien Boeuf 8ca294e417 Refactoring the core security code.
As opposed to a flat directory, we now have the following structure:

- security
  -context
  - credentials
    - composite
    - fake
    - google_default
    - iam
    - jwt
    - oauth2
    - plugin
    - ssl
  - transport
  - util

We have not refactored the test code yet but this PR is already large
enough...
2016-05-04 15:51:28 -07:00
Makarand Dharmapurikar d5d8f8fbf9 Added all transitive header dependencies in build.yaml to fix the failing check. 2016-05-04 13:22:26 -07:00
David Garcia Quintas f72eb97b36 Introduced grpc_pops (pollset or pollset_set) 2016-05-03 18:28:09 -07:00
Makarand Dharmapurikar 274bcc8f0b Added dummy cronet api implementation so we can build on Jenkins. 2016-05-03 17:34:54 -07:00
Craig Tiller 7c6ba9bae4 Merge github.com:grpc/grpc into error 2016-05-03 12:56:40 -07:00
David Garcia Quintas 80721b20ca Merge branch 'master' of github.com:grpc/grpc into codegen_remove_proto 2016-05-02 10:56:54 -07:00
David Garcia Quintas 580987abf0 Merge branch 'master' of github.com:grpc/grpc into lr_hook 2016-04-29 17:26:33 -07:00
David Garcia Quintas b41363e88e all good! missing end2end test for new lr filter 2016-04-29 00:41:21 -07:00
Craig Tiller 27f59afecb Unifying error handling within core 2016-04-28 14:19:48 -07:00
David Garcia Quintas 12e111c692 Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation 2016-04-27 19:15:12 -07:00
David Garcia Quintas d312a0b866 Smarter pollset/pollset_set propagation
For some definition of "smart"... client_channel simply passes along
pollset/pollset_set, removing the need to instantiate a pollset_set in
the subchannel_call_holder: it's now up to the LB policies to handle the
pollset/pollset_set.
2016-04-27 18:40:50 -07:00
Jan Tattermusch 165c62ff75 Merge pull request #6183 from nicolasnoble/msys-support
Adding support for msys.
2016-04-27 16:31:59 -07:00
David Garcia Quintas 1b2db6333d Moved protos out of core_codegen interface 2016-04-27 15:09:11 -07:00
David Garcia Quintas 396f4450fd Merge branch 'master' of github.com:grpc/grpc into lr_hook 2016-04-27 14:23:24 -07:00
Yuchen Zeng 12dfdc3c27 Change win32 file suffix 2016-04-26 22:05:41 -07:00
David Garcia Quintas 7f0793ad62 Updated load balancer proto to v1 2016-04-25 16:48:26 -07:00
Craig Tiller 7beea147e5 Merge github.com:grpc/grpc into strong-includes 2016-04-21 17:07:36 -07:00
Deepak Lukose dba4c5fd01 Add various options to verify ssl/tls client cert including letting the
application handle the authentication.
2016-04-19 15:02:06 -07:00
Nicolas "Pixel" Noble c4b18a50de Adding support for msys. 2016-04-15 07:39:26 +02:00
Craig Tiller 3ab2fe0094 Rollup of changes from the latest import 2016-04-11 20:11:18 -07:00
David Garcia Quintas 9885bff5fb Factored out parse functions from sockaddr_resolver 2016-04-08 17:08:57 -07:00
David Garcia Quintas 7d4f252c0f Merge branch 'master' of github.com:grpc/grpc into lr_hook 2016-04-07 10:19:47 -07:00
Craig Tiller 03915e5de6 Sort out codegen dependencies 2016-04-07 09:15:10 -07:00
David Garcia Quintas 862c8e9e50 Load Reporting hook and filter skeleton 2016-04-06 16:30:51 -07:00
Craig Tiller f9d53bbdd6 Merge github.com:grpc/grpc into cleaner-posix3 2016-04-06 10:39:00 -07:00
Craig Tiller 0ea9fceb24 Merge github.com:grpc/grpc into cleaner-posix3 2016-04-06 10:02:26 -07:00
Craig Tiller 0b54163019 Fixing client_config init 2016-04-05 17:21:05 -07:00
Craig Tiller f82ddc4c78 Nailing down dependencies better 2016-04-05 17:15:07 -07:00
Craig Tiller d1697d99d7 Getting dependencies fixed up 2016-04-05 16:05:46 -07:00
Craig Tiller b112f3989f Move subchannel_call_holder 2016-04-05 12:44:04 -07:00
Craig Tiller 0d2a0ae7c5 Merge github.com:grpc/grpc into cleaner-posix3 2016-04-04 13:52:26 -07:00
Craig Tiller 74071cdab0 Merge branch 'subchannel_factory_create_lb_channel' of github.com:dgquintas/grpc into ccmerge 2016-04-01 16:36:27 -07:00
David Garcia Quintas 414ee3208f Merge branch 'master' of github.com:grpc/grpc into subchannel_factory_create_lb_channel 2016-04-01 16:17:22 -07:00
Nicolas Noble 1895835ecd Merge pull request #6042 from ctiller/optionalize_resolvers
Optionalize resolvers
2016-04-01 16:06:29 -07:00
Craig Tiller 895459efc0 Merge github.com:grpc/grpc into optionalize_client_config 2016-04-01 15:46:00 -07:00
David G. Quintas b48dda2591 Merge branch 'master' into subchannel_factory_create_lb_channel 2016-04-01 15:33:59 -07:00
Nicolas Noble abcebb0798 Merge pull request #5419 from ctiller/cleaner-posix2
Move all event handling code behind one grand unified interface
2016-04-01 15:20:50 -07:00
Craig Tiller 3e94de19cd Merge branch 'optionalize_resolvers' into optionalize_client_config 2016-04-01 12:57:28 -07:00
Craig Tiller f05779664d Merge branch 'optionalize_census' into optionalize_resolvers 2016-04-01 07:08:54 -07:00
David Garcia Quintas 86fcfcc7b3 Merge branch 'master' of github.com:grpc/grpc into subchannel_factory_create_lb_channel 2016-03-31 23:22:28 -07:00
Craig Tiller fe2ef9b366 Remove removed file from build.yaml 2016-03-31 13:57:48 -07:00
Craig Tiller d4c9833187 Reposition files to optionalize client_config system 2016-03-31 13:45:47 -07:00
Craig Tiller 65938df105 Optionalize name resolvers 2016-03-31 13:08:49 -07:00
Craig Tiller f8a519e629 Merge branch 'cleaner-posix2' into cleaner-posix3 2016-03-31 10:37:37 -07:00
Craig Tiller 8479c972e4 Merge github.com:grpc/grpc into cleaner-posix2 2016-03-31 10:26:53 -07:00
Craig Tiller 60aa840e90 Remove removed files from build.yaml 2016-03-30 17:00:26 -07:00
David Garcia Quintas fcf7ad692c Renamed subchannel_factory to client_channel_factory.
Added the ability to create channels from client_channel_factory. This
will be used by the grpclb code to create the channels to communicate
with the LB servers.
2016-03-29 21:55:34 -07:00
Craig Tiller 9557869e15 Merge branch 'optionalize_roundrobin' into optionalize_census 2016-03-29 13:53:50 -07:00
Craig Tiller 943cdf99e9 Swap header/src into the right order 2016-03-29 13:27:56 -07:00
Craig Tiller ad46ecfeba Merge branch 'optionalize_roundrobin' into optionalize_census 2016-03-29 09:45:16 -07:00
Craig Tiller 796474c792 Move proto code under ext/.../grpclb 2016-03-29 09:43:28 -07:00
Craig Tiller 8f8e9f9b53 Build Census as a grpc plugin 2016-03-29 09:41:28 -07:00
Craig Tiller fb43385204 Make plugin registries work 2016-03-29 08:51:07 -07:00
Craig Tiller 023caf1846 Refactor build to have lb policies as extensions 2016-03-29 08:00:30 -07:00
Craig Tiller c73c4d8d90 Merge branch 'cleaner-posix2' into cleaner-posix3 2016-03-29 07:47:02 -07:00
Craig Tiller d335945b76 Merge github.com:grpc/grpc into cleaner-posix2 2016-03-29 07:46:45 -07:00
Craig Tiller d9a60bbd26 Merge branch 'cleaner-posix2' into cleaner-posix3 2016-03-28 23:13:19 -07:00
Craig Tiller 14e0d9862f Begin optionalizing lb policies: initial code movement 2016-03-28 17:11:26 -07:00
Craig Tiller 8a03448a8c Merge github.com:grpc/grpc into cleaner-posix2 2016-03-28 16:09:04 -07:00
Craig Tiller 44cc10b02e Add uses clauses to filegroups to ease dependency management 2016-03-28 10:45:29 -07:00
Craig Tiller f0555b3e1c Declare filegroups for chttp2 2016-03-28 10:19:24 -07:00
Craig Tiller c7762a8c24 Move chttp2 related files under ext/ 2016-03-28 10:13:08 -07:00
Craig Tiller f23078cbd3 Stage #1 of core breakup: move everything under lib 2016-03-25 17:07:29 -07:00
Jan Tattermusch 8ce3b1ad89 Merge pull request #5383 from miselin/add_request_parsing
Add HTTP request parsing
2016-03-23 14:47:40 -07:00
Jan Tattermusch f1050f6f4a Merge pull request #5755 from ahedberg/unix_sockets_optional
Make unix sockets optional
2016-03-23 08:47:12 -07:00
Matthew Iselin 1824f0519f Add HTTP request parsing.
This extends the existing http parser to support requests as well as responses.

httpcli continues to exist and work as it has previously, though in the new
directory src/core/http (to reflect the fact the directory now contains code
relevant to parsing requests, which httpcli would not generally involve itself
in).
2016-03-23 13:22:32 +11:00
David Garcia Quintas fb349b9f71 removed uchannels 2016-03-21 15:37:20 -07:00
Craig Tiller c22781525c Merge branch 'cleaner-posix2' into cleaner-posix3 2016-03-21 08:59:54 -07:00
Craig Tiller 59743d6971 Merge github.com:grpc/grpc into cleaner-posix2 2016-03-21 08:56:25 -07:00
ahedberg 43df295528 add unix_sockets_posix module to build system and fix compilation errors 2016-03-18 10:46:38 -04:00
Craig Tiller 6c59e16826 Merge github.com:grpc/grpc into filter-selection 2016-03-17 11:20:58 -07:00
Craig Tiller ec8eef42b8 Merge branch 'cleaner-posix2' into cleaner-posix3 2016-03-17 08:13:39 -07:00
Craig Tiller 40d34bf477 Merge github.com:grpc/grpc into filter-selection 2016-03-17 07:50:54 -07:00
Craig Tiller 0239ba8ebf Merge github.com:grpc/grpc into cleaner-posix2 2016-03-17 07:49:27 -07:00
Craig Tiller 36bf4d55e1 Merge github.com:grpc/grpc into backoff_lib 2016-03-17 07:43:22 -07:00
Nicolas "Pixel" Noble e8fb852a73 Massaging that pull request. 2016-03-17 00:31:43 +01:00
Craig Tiller c72cc42238 Build out backoff as a library 2016-03-11 10:54:36 -08:00
David Garcia Quintas a9d0629677 Merge branch 'codegen_proto_utils_fix' into codegen_lib 2016-03-06 19:10:15 -08:00
Craig Tiller 5a9d7d2dcc Merge github.com:grpc/grpc into filter-selection 2016-02-25 16:03:11 -08:00
Craig Tiller 7ac6bf07a9 Finish porting rough implementation of poll() event strategy 2016-02-25 12:54:59 -08:00
Craig Tiller a75d18addd Make out private bits private 2016-02-25 08:45:00 -08:00
Craig Tiller 07eb5b0ccd Remove pollset_set_posix.c 2016-02-25 07:18:34 -08:00
Craig Tiller cf999dd336 Merge github.com:grpc/grpc into cleaner-posix2 2016-02-25 07:16:40 -08:00
Craig Tiller a3f3442010 Merge branch 'hide-the-pollset-set' into cleaner-posix2 2016-02-25 07:16:24 -08:00
Craig Tiller 4ea4599a50 Merge github.com:grpc/grpc into naming-crisis 2016-02-23 17:13:38 -08:00
Craig Tiller 70ab4c5cef Merge github.com:grpc/grpc into fix-proto-docker 2016-02-22 22:29:51 -08:00
Craig Tiller c866f7281f Merge github.com:grpc/grpc into naming-crisis 2016-02-22 22:23:43 -08:00
Craig Tiller 521423c8cf Regenerate files, fix bugs 2016-02-22 22:22:22 -08:00
Craig Tiller 6895168e0a Merge github.com:grpc/grpc into filter-selection 2016-02-22 21:41:31 -08:00
Vijay Pai 349bba9179 Merge pull request #5257 from ctiller/cleaner-posix
Separate timer checking from pollsets
2016-02-22 16:30:18 -08:00
Alistair Veitch 7771544111 rename census log files to avoid build breakage on MacOS 2016-02-22 14:20:25 -08:00
Craig Tiller 1a969c86f4 Start migrating code into ev_XXX 2016-02-22 12:13:16 -08:00
Masood Malekghassemi 9f79159590 Merge pull request #5302 from nicolasnoble/python-windows
Enabling python artifact building for Windows.
2016-02-22 11:37:22 -08:00
Nicolas "Pixel" Noble 2e8fdbac77 Building the dlls. 2016-02-19 05:39:15 +01:00
David Garcia Quintas 2173eea18b Merge branch 'master' of github.com:grpc/grpc into codegen_lib 2016-02-18 15:13:54 -08:00
David Garcia Quintas a8bb0bfc3e Split codegen target and made it libs 2016-02-18 15:09:02 -08:00
Craig Tiller 8d8246ecc6 Merge branch 'cleaner-posix' into cleaner-posix2 2016-02-18 07:40:26 -08:00
Craig Tiller 9dc184fd95 Merge github.com:grpc/grpc into cleaner-posix 2016-02-18 07:21:17 -08:00
Craig Tiller 16f6826ffd Merge github.com:grpc/grpc into fix-proto-docker 2016-02-18 07:14:37 -08:00
Craig Tiller 178edfae2b Decouple filter selection from channel construction
Allow plugins to extend the set of filters used by gRPC core:
- plugins at construction time can register against the 'channel_init' system to be allowed to mutate a new channel_stack_builder type
- channel_stack_builder provides a central and rather dynamic place to construct the list of filters required by a channel stack
- ultimately we construct the channel stack in the fashion we always have

This is also a prerequisite step to allowing filters to be implemented from wrapped languages.
2016-02-17 20:54:46 -08:00
Craig Tiller c0ce00fd16 Merge github.com:grpc/grpc into sceq 2016-02-17 14:25:12 -08:00
Craig Tiller 5a6644602e Moving fd code into ev code 2016-02-16 08:07:17 -08:00
Craig Tiller ccdea1900f Separate timer checking from pollsets 2016-02-16 08:06:46 -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
Alistair Veitch 749250f6a0 merge to HEAD 2016-02-11 09:23:20 -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
Craig Tiller f73429901a Merge github.com:grpc/grpc into sceq 2016-02-09 16:32:51 -08:00
Craig Tiller 1298afd10e Get compilation working again 2016-02-09 12:29:17 -08:00
Craig Tiller da179ce598 Rollback gpr deletion 2016-02-09 12:01:53 -08:00
David Garcia Quintas 7e46618897 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-02-08 20:07:19 -08:00
Alistair Veitch ba6065f016 merge 2016-02-05 13:27:42 -08:00
Alistair Veitch 6f2b8993fd merge 2016-02-03 09:02:46 -08:00
Alistair Veitch 85afe71d4c initial commit 2016-02-02 17:58:15 -08:00
Nicolas "Pixel" Noble 89d8ed1b91 Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable
Conflicts:
	BUILD
	Makefile
	binding.gyp
	build.yaml
	gRPC.podspec
	grpc.gemspec
	package.json
	src/python/grpcio/grpc_core_dependencies.py
	templates/Makefile.template
	tools/doxygen/Doxyfile.core.internal
	tools/run_tests/sources_and_headers.json
	vsprojects/vcxproj/gpr/gpr.vcxproj
	vsprojects/vcxproj/gpr/gpr.vcxproj.filters
2016-02-03 01:27:46 +01:00
Alistair Veitch 75d5c0f024 post merge 2016-02-02 09:43:02 -08:00
Craig Tiller 841c726140 Merge github.com:grpc/grpc into sceq 2016-02-02 09:23:22 -08:00
Craig Tiller 4bef7cebe6 Use old memcpy for wrappers 2016-02-02 08:38:43 -08:00
Craig Tiller f09fb7e4b0 Merge pull request #4979 from nicolasnoble/win32_subprocess
Adding windows support for gpr subprocesses.
2016-02-01 07:35:10 -08:00
Craig Tiller cbc4629c52 Merge pull request #4978 from nicolasnoble/alarming
Fixing, using and testing alarm code.
2016-01-31 18:11:03 -08:00
Nicolas "Pixel" Noble cf37cb9f9e Merge branch 'census-placeholders' into make-ruby-installable
Conflicts:
	package.json
	tools/doxygen/Doxyfile.core.internal
2016-01-31 09:34:46 +01:00
Nicolas "Pixel" Noble fa132c2f56 Actually moving this to the proper place. 2016-01-31 09:31:15 +01:00
Nicolas "Pixel" Noble 78825caeeb Merge branch 'win32_subprocess' into make-ruby-installable
Conflicts:
	BUILD
	Makefile
	binding.gyp
	build.yaml
	gRPC.podspec
	grpc.gemspec
	src/python/grpcio/grpc_core_dependencies.py
	tools/run_tests/sources_and_headers.json
	vsprojects/vcxproj/gpr/gpr.vcxproj
	vsprojects/vcxproj/gpr/gpr.vcxproj.filters
2016-01-31 07:08:20 +01:00
Nicolas "Pixel" Noble 4fba286e4d Adding windows support for gpr subprocesses. 2016-01-31 07:00:53 +01:00
Nicolas "Pixel" Noble bf192eff56 Merge branch 'alarming' into make-ruby-installable
Conflicts:
	tools/run_tests/sources_and_headers.json
2016-01-31 06:25:39 +01:00
Nicolas "Pixel" Noble d5d83aa33f Fixing, using and testing alarm code. 2016-01-31 06:21:49 +01:00
Nicolas "Pixel" Noble 09121799b0 Removing gpr as a separated library. 2016-01-30 09:34:22 +01:00
David Garcia Quintas dd18c4a4a3 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-29 15:05:53 -08:00
Michael Lumish 5441c222e3 Merge pull request #4959 from grpc/release-0_12
Release 0.12 -> master
2016-01-29 09:26:42 -08:00
David Garcia Quintas fb01883859 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-28 14:39:54 -08:00
David Garcia Quintas b523c732d1 async_stream.h done. Compiles 2016-01-25 18:22:28 -08:00
David Garcia Quintas 2425bbbc55 Further work. Compiles. WIP 2016-01-25 17:32:48 -08:00
Jorge Canizales 83f746b4da Upgrade BoringSSL podspec to v2.0 2016-01-25 15:47:26 -08:00
David Garcia Quintas 541db25d45 Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces 2016-01-25 12:53:50 -08:00
Craig Tiller d8e6f8d4f5 Merge github.com:grpc/grpc into sceq 2016-01-22 19:24:23 -08:00
David Garcia Quintas ddcb53a9de made codegen targets in build.yaml 2016-01-21 17:48:34 -08:00
David Garcia Quintas 898588ba33 added missing codegen deps for grp 2016-01-21 11:14:49 -08:00
David Garcia Quintas 08a0a3306e Made "codedgen" directories closed over #includes 2016-01-21 01:04:36 -08:00
Craig Tiller b22aeae462 Merge github.com:grpc/grpc into sceq 2016-01-15 21:13:52 -08:00
Craig Tiller 694cf8b0d2 Shared subchannel sketch 2016-01-15 21:13:25 -08:00
Alistair Veitch 0923126cf8 Merge branch 'master' into tag_set 2016-01-15 17:57:56 -08:00
David Garcia Quintas aa9b01c7c0 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2016-01-15 14:19:17 -08:00
Alistair Veitch 0f690721bd Move encode/decode API into census.h 2016-01-13 09:08:38 -08:00
Alistair Veitch bb30d2591f initial commit 2016-01-12 17:36:05 -08:00
David Garcia Quintas 756a36cdac Srcs and hdrs sanity checks skip third_party 2016-01-11 11:31:19 -08:00
murgatroid99 8b791a4a7f Merged from master and resolved merge conflicts 2016-01-08 12:33:22 -08:00
murgatroid99 c3910cadb4 Expose core metadata validation functions in public headers 2016-01-06 13:14:23 -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 0fe5ee7be3 BoringSSL integration: non-vsprojects changes 2015-12-22 12:50:36 -08:00
David Garcia Quintas 7052ac25e6 Merge branch 'master' of github.com:grpc/grpc into grpclb_api 2015-12-16 17:36:04 -08:00
Craig Tiller d5bd3b6abe Merge branch 'connected-subchannel' into ping-ping-ping-ping-ping-ping-ping-ping-ping 2015-12-10 07:19:54 -08:00
Craig Tiller 95eeed7590 Kill noop_filter.c 2015-12-09 09:45:59 -08:00
Craig Tiller bbb73b66fb Nuke unused files 2015-12-09 06:58:28 -08:00
Craig Tiller 6c1aa8add6 Merge branch 'connected-subchannel' into ping-ping-ping-ping-ping-ping-ping-ping-ping 2015-12-08 08:15:24 -08:00