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
316f73f6c1
Merge v1.0.x into master
2016-07-22 11:00:34 -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
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
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
e8355a2cb3
grpc_args doxygen
2016-07-18 18:56:56 -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
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
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
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
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
eda85c6765
Expunge all references to zookeeper
2016-07-01 12:45:19 -07:00
00d3f2789b
updated copyright
2016-06-30 18:14:40 -07:00
6721d4f0f1
Return success status of grpc_byte_buffer_reader
2016-06-30 17:30:08 -07:00
c93d6a66a1
Merge master into merge-0.14-into-master
...
Conflicts:
- gRPC.podspec
- Only had non-trivial changes in the core file list, which will need to be
regenerated (in gRPC-Core.podspec).
- src/objective-c/BoringSSL.podspec
- Had trivial conflicts in the version.
- src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
- Trivial conflicts in quoting.
- src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj and
src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj
- The master version is used, pending testing. The 0.14 version had emoji and
some unneeded entries.
- src/objective-c/tests/Podfile
- Added CronetFramework pod, and warning silencing from master.
- templates/gRPC.podspec.template
- Deleted.
- third_party/protobuf
- Using master commit, but need to verify if it works for frameworks.
2016-06-30 15:37:11 -07:00
314d3350d9
removed unused version of status_code_enum.h
2016-06-30 09:51:02 -07:00
f467846b1b
Merge github.com:grpc/grpc into reuse_port
2016-06-26 09:54:53 -07:00
ffc780d70e
Merge pull request #6803 from sreecha/epoll_changes
...
New epoll based polling implementation
2016-06-25 08:43:50 -07:00
a324c4fea6
Add API to get c slice from c++ Slice.
2016-06-24 11:59:35 -07:00
3901ceed6a
Merge pull request #6947 from vjpai/async_stream_doc
...
Doc Fixit: Ordering and thread-safety for C++ streaming (sync/async) APIs
2016-06-24 10:16:30 -07:00
13b2b7f5ea
Merge branch 'master' into epoll_changes
2016-06-23 15:54:19 -07:00
c072c927a8
Const correctness for ClientContext and ServerContext getters
2016-06-22 17:07:00 -07:00
bd28936c86
Properly handle reviewer comment re concurrent Read
2016-06-21 18:03:37 -07:00
ef01edf5b7
Fix review comments
2016-06-21 16:42:08 -07:00
1d9b1e9640
Merge branch 'master' into async_stream_doc
2016-06-21 16:32:13 -07:00
c3a9fae601
Merge branch 'master' into epoll_changes_merged
2016-06-21 16:31:35 -07:00
a4d2d0c798
Merge github.com:grpc/grpc into reuse_port
2016-06-20 08:09:52 -07:00
Nicolas Noble