a3f3442010
Merge branch 'hide-the-pollset-set' into cleaner-posix2
2016-02-25 07:16:24 -08:00
4ea4599a50
Merge github.com:grpc/grpc into naming-crisis
2016-02-23 17:13:38 -08:00
70ab4c5cef
Merge github.com:grpc/grpc into fix-proto-docker
2016-02-22 22:29:51 -08:00
c866f7281f
Merge github.com:grpc/grpc into naming-crisis
2016-02-22 22:23:43 -08:00
521423c8cf
Regenerate files, fix bugs
2016-02-22 22:22:22 -08:00
6895168e0a
Merge github.com:grpc/grpc into filter-selection
2016-02-22 21:41:31 -08:00
349bba9179
Merge pull request #5257 from ctiller/cleaner-posix
...
Separate timer checking from pollsets
2016-02-22 16:30:18 -08:00
7771544111
rename census log files to avoid build breakage on MacOS
2016-02-22 14:20:25 -08:00
1a969c86f4
Start migrating code into ev_XXX
2016-02-22 12:13:16 -08:00
9f79159590
Merge pull request #5302 from nicolasnoble/python-windows
...
Enabling python artifact building for Windows.
2016-02-22 11:37:22 -08:00
2e8fdbac77
Building the dlls.
2016-02-19 05:39:15 +01:00
2173eea18b
Merge branch 'master' of github.com:grpc/grpc into codegen_lib
2016-02-18 15:13:54 -08:00
a8bb0bfc3e
Split codegen target and made it libs
2016-02-18 15:09:02 -08:00
8d8246ecc6
Merge branch 'cleaner-posix' into cleaner-posix2
2016-02-18 07:40:26 -08:00
9dc184fd95
Merge github.com:grpc/grpc into cleaner-posix
2016-02-18 07:21:17 -08:00
16f6826ffd
Merge github.com:grpc/grpc into fix-proto-docker
2016-02-18 07:14:37 -08:00
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
c0ce00fd16
Merge github.com:grpc/grpc into sceq
2016-02-17 14:25:12 -08:00
5a6644602e
Moving fd code into ev code
2016-02-16 08:07:17 -08:00
ccdea1900f
Separate timer checking from pollsets
2016-02-16 08:06:46 -08:00
eb841e2010
Revert "Revert "Proto API for LB request/responses""
2016-02-11 15:49:16 -08:00
c35e2c582f
Revert "Proto API for LB request/responses"
2016-02-11 15:45:03 -08:00
749250f6a0
merge to HEAD
2016-02-11 09:23:20 -08:00
742a783c0d
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
2016-02-11 01:04:28 -08:00
f73429901a
Merge github.com:grpc/grpc into sceq
2016-02-09 16:32:51 -08:00
1298afd10e
Get compilation working again
2016-02-09 12:29:17 -08:00
da179ce598
Rollback gpr deletion
2016-02-09 12:01:53 -08:00
7e46618897
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
2016-02-08 20:07:19 -08:00
ba6065f016
merge
2016-02-05 13:27:42 -08:00
6f2b8993fd
merge
2016-02-03 09:02:46 -08:00
85afe71d4c
initial commit
2016-02-02 17:58:15 -08:00
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
75d5c0f024
post merge
2016-02-02 09:43:02 -08:00
841c726140
Merge github.com:grpc/grpc into sceq
2016-02-02 09:23:22 -08:00
4bef7cebe6
Use old memcpy for wrappers
2016-02-02 08:38:43 -08:00
f09fb7e4b0
Merge pull request #4979 from nicolasnoble/win32_subprocess
...
Adding windows support for gpr subprocesses.
2016-02-01 07:35:10 -08:00
cbc4629c52
Merge pull request #4978 from nicolasnoble/alarming
...
Fixing, using and testing alarm code.
2016-01-31 18:11:03 -08:00
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
fa132c2f56
Actually moving this to the proper place.
2016-01-31 09:31:15 +01:00
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
4fba286e4d
Adding windows support for gpr subprocesses.
2016-01-31 07:00:53 +01:00
bf192eff56
Merge branch 'alarming' into make-ruby-installable
...
Conflicts:
tools/run_tests/sources_and_headers.json
2016-01-31 06:25:39 +01:00
d5d83aa33f
Fixing, using and testing alarm code.
2016-01-31 06:21:49 +01:00
09121799b0
Removing gpr as a separated library.
2016-01-30 09:34:22 +01:00
dd18c4a4a3
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
2016-01-29 15:05:53 -08:00
5441c222e3
Merge pull request #4959 from grpc/release-0_12
...
Release 0.12 -> master
2016-01-29 09:26:42 -08:00
fb01883859
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
2016-01-28 14:39:54 -08:00
b523c732d1
async_stream.h done. Compiles
2016-01-25 18:22:28 -08:00
2425bbbc55
Further work. Compiles. WIP
2016-01-25 17:32:48 -08:00
83f746b4da
Upgrade BoringSSL podspec to v2.0
2016-01-25 15:47:26 -08:00
541db25d45
Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces
2016-01-25 12:53:50 -08:00
d8e6f8d4f5
Merge github.com:grpc/grpc into sceq
2016-01-22 19:24:23 -08:00
ddcb53a9de
made codegen targets in build.yaml
2016-01-21 17:48:34 -08:00
898588ba33
added missing codegen deps for grp
2016-01-21 11:14:49 -08:00
08a0a3306e
Made "codedgen" directories closed over #includes
2016-01-21 01:04:36 -08:00
b22aeae462
Merge github.com:grpc/grpc into sceq
2016-01-15 21:13:52 -08:00
694cf8b0d2
Shared subchannel sketch
2016-01-15 21:13:25 -08:00
0923126cf8
Merge branch 'master' into tag_set
2016-01-15 17:57:56 -08:00
aa9b01c7c0
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
2016-01-15 14:19:17 -08:00
0f690721bd
Move encode/decode API into census.h
2016-01-13 09:08:38 -08:00
bb30d2591f
initial commit
2016-01-12 17:36:05 -08:00
756a36cdac
Srcs and hdrs sanity checks skip third_party
2016-01-11 11:31:19 -08:00
8b791a4a7f
Merged from master and resolved merge conflicts
2016-01-08 12:33:22 -08:00
c3910cadb4
Expose core metadata validation functions in public headers
2016-01-06 13:14:23 -08:00
8974a6681c
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
2015-12-24 19:36:38 +01:00
0fe5ee7be3
BoringSSL integration: non-vsprojects changes
2015-12-22 12:50:36 -08:00
7052ac25e6
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
2015-12-16 17:36:04 -08:00
d5bd3b6abe
Merge branch 'connected-subchannel' into ping-ping-ping-ping-ping-ping-ping-ping-ping
2015-12-10 07:19:54 -08:00
95eeed7590
Kill noop_filter.c
2015-12-09 09:45:59 -08:00
bbb73b66fb
Nuke unused files
2015-12-09 06:58:28 -08:00
6c1aa8add6
Merge branch 'connected-subchannel' into ping-ping-ping-ping-ping-ping-ping-ping-ping
2015-12-08 08:15:24 -08:00
26dab31f6e
Start of ping sketch
2015-12-07 14:43:47 -08:00
944c0743cc
Merge release-0.12 into master
2015-12-07 11:01:39 -08:00
011e79a271
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
...
# Conflicts:
# BUILD
# Makefile
# binding.gyp
# build.yaml
# gRPC.podspec
# tools/doxygen/Doxyfile.core.internal
# tools/run_tests/sources_and_headers.json
# vsprojects/vcxproj/grpc/grpc.vcxproj
# vsprojects/vcxproj/grpc/grpc.vcxproj.filters
# vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
# vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
2015-12-03 13:09:54 -08:00
6fce197b3f
Merge pull request #4188 from ctiller/no-transport-metadata
...
Remove metadata contexts
2015-12-02 09:23:14 -08:00
0d718cd0f4
Point gRPC.podspec to pushed BoringSSL version
...
(1.0)
2015-12-01 18:01:01 -08:00
2285186216
Point spec to BoringSSL
2015-12-01 17:56:48 -08:00
f9c58f3bf7
Merge branch 'release-0_12'
...
Conflicts:
src/core/security/credentials.c
test/core/security/credentials_test.c
2015-12-01 22:40:44 +01:00
e3d9db2667
Adjust version requirements through samples and tests.
2015-11-25 22:16:38 -08:00
d1908b10dd
Move podspec version to 0.12
2015-11-25 18:19:37 -08:00
de83121308
Merge github.com:grpc/grpc into no-transport-metadata
2015-11-25 15:32:59 -08:00
d9f6101967
merge with head
2015-11-24 10:39:23 -08:00
fba79f213f
AVL: creation, destroy, add
2015-11-23 11:06:55 -08:00
ebdef9d674
Remove metadata context from the channel stack
2015-11-19 17:09:49 -08:00
2e7687c5ef
Static metadata declarations
2015-11-18 14:56:46 -08:00
71b962634e
merge with head
2015-11-18 11:41:30 -08:00
ff03847182
Moved nanopb to 3rd party
2015-11-12 09:27:13 +00:00
a6124120ae
first part, secure channel only
2015-11-05 22:36:20 -08:00
49433744ee
Proto API for LB request/responses
2015-11-03 23:53:42 -08:00
ca1593a955
stream_op cleanup: build system changes
2015-11-02 14:08:33 -08:00
10622a8d9b
Prevent XCode 7 from showing spurious warnings
...
This will hopefully make xctool work on Travis too (cross fingers!)
2015-10-28 07:10:47 -07:00
b5ab8a29f5
Merge branch 'master' of github.com:grpc/grpc into microchannels
2015-10-19 15:41:42 -07:00
e2a1bf46f9
Merge pull request #3726 from dgquintas/iomgr_executor
...
Introducing grpc_executor, for all your threading needs
2015-10-19 15:18:24 -07:00
951875ffe0
Refer to https://github.com/CocoaPods/CocoaPods/issues/4386 regarding hack.
2015-10-15 18:30:07 -07:00
0c8a3d804e
Undo moving include/ one dir up, to ease testing workflow.
2015-10-15 18:26:18 -07:00
aff5664a86
Undo Cocoapods’ bug workaround
2015-10-15 18:02:48 -07:00
b65e4213a3
fixed faulty merge
2015-10-14 12:00:21 -07:00
0fe72429a0
Merge branch 'master' of github.com:grpc/grpc into microchannels
2015-10-13 16:17:26 -07:00
e945cd8064
Merge branch 'master' of github.com:grpc/grpc into iomgr_executor
2015-10-12 21:18:42 -07:00
2b15f1e25a
Merge github.com:grpc/grpc into latent-see
2015-10-09 17:07:56 -07:00
Craig Tiller