106df11093
Merge github.com:grpc/grpc into grand-unified-closures
2016-08-04 09:22:34 -07:00
6a4397eb33
Merge pull request #7600 from dgquintas/fix_includes
...
fixed include guard script and faulty .h
2016-08-02 14:04:49 -07:00
329d6473db
Merge pull request #6774 from a-veitch/add_resource
...
Add Census resource API and implementation.
2016-08-02 12:46:43 -07:00
ffd207fe4c
fixed include guard script and faulty .h
2016-08-01 16:20:52 -07:00
e51b9d2e39
Merge pull request #7502 from dgquintas/cpp_compression_level
...
C++ Compression Level set properly
2016-07-28 18:28:17 -07:00
01da196879
Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master
...
V1.0.x merge into master
2016-07-25 14:45:41 -07:00
b5fa72c89e
Merge pull request #7451 from y-zeng/seperate_generated_files
...
Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf
2016-07-25 14:32:51 -07:00
3e426718f0
Merge github.com:grpc/grpc into grand-unified-closures
2016-07-24 13:00:57 -07:00
d8084aa4ed
Merge branch 'master' of github.com:grpc/grpc into cpp_compression_level
2016-07-22 12:17:17 -07:00
316f73f6c1
Merge v1.0.x into master
2016-07-22 11:00:34 -07:00
440558a7ec
C++ Compression Level set properly
2016-07-21 19:31:38 -07:00
f77b9bf2fe
Removed unused version of async_stream.h
2016-07-21 19:24:51 -07:00
d4087084f0
Merge pull request #7488 from ghemawat/slice_user_data
...
Add gpr_slice_new_with_user_data.
2016-07-21 17:53:29 -07:00
3abd27e531
merge to upstream/master
2016-07-21 17:29:04 -07:00
2edf5e904b
Merge remote-tracking branch 'upstream/master' into seperate_generated_files
2016-07-21 16:15:12 -07:00
b8e26c0217
Merge pull request #7486 from dgquintas/alive_typo
...
fixed typo
2016-07-21 15:15:47 -07:00
f6aefa3ea6
Merge pull request #7400 from yang-g/ga_branch2
...
Cherrypick #7319 into v1.0.x
2016-07-21 11:28:44 -07:00
98f47f6169
Merge pull request #7469 from yang-g/proto_lite
...
Add a macro to support protobuf lite
2016-07-21 11:13:53 -07:00
fca59fb2aa
Add gpr_slice_new_with_user_data.
...
gpr_slice_new_with_user_data is like gpr_slice_new, but allows the
caller to specify a distinct pointer to pass to the destroy function.
This is useful when the data is part of a larger data structure that
should be destroyed when the data is no longer needed.
2016-07-21 09:32:06 -07:00
21059e23c5
Merge pull request #7470 from dgquintas/v1.0.x
...
grpc_args doxygen docstrings
2016-07-20 17:48:21 -07:00
b91cddb2fa
fixed typo
2016-07-20 17:40:01 -07:00
543c5886ee
Merge remote-tracking branch 'upstream/master' into seperate_generated_files
2016-07-19 19:15:55 -07:00
7195a490ac
Merge pull request #7425 from jcanizales/p0-dynamic-frameworks-build-tests
...
Automatic test that the library builds correctly with frameworks
2016-07-19 17:49:40 -07:00
7c519b9243
Merge pull request #7444 from y-zeng/fix_typo
...
Fix typos in config_protobuf.h
2016-07-19 17:34:59 -07:00
476e9875ea
Merge github.com:grpc/grpc into grand-unified-closures
2016-07-19 16:54:15 -07:00
8c2fab05f7
Merge pull request #7399 from sreecha/poll_alloc_fix
...
Reduce the number of unnecessary allocations
2016-07-19 16:04:06 -07:00
fb709049b4
grpc_args doxygen
2016-07-19 14:48:17 -07:00
e6c04aa612
Add a macro to support protobuf lite
2016-07-19 14:46:50 -07:00
df3bfae8d1
Fix gcc4.4 error
2016-07-19 08:04:37 -07:00
e8355a2cb3
grpc_args doxygen
2016-07-18 18:56:56 -07:00
15e0f230a2
Fix merge error
2016-07-18 16:41:00 -07:00
1318479011
Separate generated file and protobuf dependency
2016-07-18 13:07:42 -07:00
dd24c1ece4
Polish grpcio_health_checking package
...
-Rename namespace to grpc_health->grpc to match spec
-Proper use of NOT_FOUND status code
-Improve testing
-Add source distribution to artifact build
2016-07-18 12:50:13 -07:00
3046557a02
fix typo
2016-07-18 12:08:17 -07:00
24987dbf77
fix typo
2016-07-18 10:35:44 -07:00
93bd780a9c
Solve warnings by adding headers not included by grpc.h
...
The two log.h can’t be listed, though, as they include the nefarious
<inttypes.h> (See discussing at BoringSSL.podspec). Not listing them
seems to be alright, though.
2016-07-15 23:08:42 -07:00
64d8024a11
Merge github.com:grpc/grpc into grand-unified-closures
2016-07-15 07:53:33 -07:00
807387641f
prevent spurious wake up and unstarted/already shutdown server
2016-07-14 22:59:39 -07:00
69b74784fe
Reduce the number of unnecessary allocations
2016-07-14 21:24:07 -07:00
27a02b5d9d
Merge pull request #7319 from yang-g/wait_async
...
Make Server::Wait work for async only server.
2016-07-14 18:26:25 -07:00
6ec11f2acd
prevent spurious wake up and unstarted/already shutdown server
2016-07-14 14:53:35 -07:00
05573f1692
Make Server::Wait work for async only server.
2016-07-13 22:23:19 -07:00
22ac0d17c1
Merge branch 'delayed-write' into grand-unified-closures
2016-07-13 15:40:24 -07:00
3e63b4ee7e
Merge remote-tracking branch 'upstream/master' into slice
2016-07-12 08:36:26 -07:00
e89dc6ceb6
Make Server::Wait work for async only server.
2016-07-11 15:48:01 -07:00
919175b619
Merge github.com:grpc/grpc into grand-unified-closures
2016-07-08 14:01:39 -07:00
5a412cf891
Merge pull request #7219 from jcanizales/merge-0.14-into-master
...
Merge 0.14 into master
2016-07-08 09:40:22 -07:00
b1793a6780
Merge github.com:grpc/grpc into atm2
2016-07-07 21:02:08 -07:00
f2e20c2d8c
Merge branch 'master' of github.com:grpc/grpc into bb_reader_error
2016-07-06 15:34:42 -07:00
2a16a028e0
Merge pull request #7174 from dgquintas/remove_unused_status_code_enum_file
...
removed unused version of status_code_enum.h
2016-07-06 11:19:39 -07:00
Craig Tiller