106df11093
Merge github.com:grpc/grpc into grand-unified-closures
2016-08-04 09:22:34 -07:00
f8c4580939
Commit as 1.0.0-pre1 so we can release already.
2016-07-18 17:51:31 -07:00
854c167069
We’re done with the underscore tags for good!
...
Yay compatibility and predictability!
2016-07-18 12:30:01 -07:00
854b81a83b
Advance versions from 0.14 -> 1.0
...
Pending:
- Tag BoringSSL repo.
- Tag gRPC repo.
- Build the plugin, zip it, and add it to the release.
- Push Cocoapods to trunk.
2016-07-15 11:23:48 -07:00
22ac0d17c1
Merge branch 'delayed-write' into grand-unified-closures
2016-07-13 15:40:24 -07:00
4150e9e2f5
gRPC.podspec shouldn't be a template anymore.
2016-07-12 19:18:56 +02:00
e305fdb885
Merge branch 'delayed-write' into grand-unified-closures
2016-07-12 09:37:22 -07:00
1c41c29c26
Merge branch 'release-0_15' into upmerge-master
...
Conflicts:
Makefile
build.yaml
gRPC-Core.podspec
gRPC.podspec
package.json
package.xml
src/core/lib/surface/version.c
src/csharp/Grpc.Auth/project.json
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/Grpc.Core/project.json
src/csharp/Grpc.HealthCheck/project.json
src/csharp/build_packages.bat
src/node/tools/package.json
src/python/grpcio/grpc/__init__.py
src/python/grpcio/grpc_version.py
src/python/grpcio_tests/tests/unit/_rpc_test.py
src/ruby/lib/grpc/version.rb
src/ruby/tools/version.rb
templates/gRPC.podspec.template
tools/distrib/python/grpcio_tools/grpc_version.py
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal
tools/run_tests/port_server.py
2016-07-12 04:30:57 +02:00
919175b619
Merge github.com:grpc/grpc into grand-unified-closures
2016-07-08 14:01:39 -07:00
f7cade1b4f
Rename async_execution_lock --> combiner, make it use closures, unroll previous changes for idleness
2016-07-07 21:41:10 -07:00
b1793a6780
Merge github.com:grpc/grpc into atm2
2016-07-07 21:02:08 -07:00
bb16025840
Merge fixup: version, deployment target & spec name
2016-07-01 10:09:16 -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
b2edc6c99a
Resolved merge conflicts with master
2016-06-27 14:24:18 -07:00
fb39f1d6dc
Merge pull request #6973 from makdharma/network_status_change
...
Network status tracking
2016-06-27 10:02:11 -07:00
c3a9fae601
Merge branch 'master' into epoll_changes_merged
2016-06-21 16:31:35 -07:00
0579cfc334
more files after running build.yaml changes through
2016-06-20 15:45:24 -07:00
e16907e5a1
Resolved merge conflicts with master
2016-06-20 10:54:14 -07:00
812c66ba1b
Merge branch 'master' into epoll_changes
2016-06-16 10:05:13 -07:00
9f6a805977
Allow disabling traces, add trace variables for pluck and timeout events
2016-06-15 17:39:03 -07:00
13c0940f66
Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout
2016-06-15 09:41:33 -07:00
d7a15b86b7
Merge remote-tracking branch 'upstream/master' into base64_decode
2016-06-09 11:02:10 -07:00
877dc0cc49
Merge branch 'master' into epoll_changes
2016-06-09 10:02:58 -07:00
0ca68b7cb1
Merge github.com:grpc/grpc into error
2016-06-09 07:50:50 -07:00
e487a7271d
Separate Core, ProtoRuntime, and RxLibrary subspecs
2016-06-08 19:21:50 -07:00
1bc2976a0f
Merge pull request #6481 from dgquintas/compression_md_level_bis
...
Allow servers to select compression level via initial MD & overall compression cleanup
2016-06-08 19:17:20 -07:00
0a0c1b0d59
Merge remote-tracking branch 'upstream/master' into base64_decode
2016-06-08 17:52:05 -07:00
5dbbbb1912
Merge branch 'master' into epoll_changes
2016-06-08 09:07:50 -07:00
533add5a87
Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis
2016-06-07 21:21:27 -07:00
bf10c82bf8
implement support for adding external fd to server
2016-06-07 15:09:19 -07:00
321b1fb1c2
separate posix functionality to grpc_posix.h
2016-06-07 15:09:19 -07:00
c97065da86
Merge github.com:grpc/grpc into error
2016-06-07 13:00:14 -07:00
2888bd58b0
Merge github.com:grpc/grpc into error
2016-06-07 11:00:42 -07:00
a0d7491e62
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
2016-06-06 16:25:48 -07:00
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
1fd6235791
Merge branch 'master' into epoll_changes
2016-06-06 10:31:45 -07:00
4c11a20bf0
Remove unused files
2016-06-06 09:30:30 -07:00
d925c93047
Merge github.com:grpc/grpc into error
2016-06-06 08:38:50 -07:00
55c08f81cf
Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis
2016-06-03 14:18:01 -07:00
6c81c25653
Merge pull request #6306 from y-zeng/win32_suffix
...
Change win32 file suffix
2016-06-03 16:13:51 -04:00
e7518461c2
Merge branch 'master' of github.com:grpc/grpc into lr_hook
2016-06-02 10:24:51 -07:00
2a2599b5ca
incremental fix - removed cronet dependency from grpc_secure
2016-06-01 15:19:06 -07:00
38d8055306
cronet build related changes
2016-06-01 15:02:04 -07:00
4b5e757147
Merge github.com:grpc/grpc into error
2016-06-01 14:55:33 -07:00
6eb2380a8f
Merge pull request #6702 from a-veitch/add_proto
...
Add census protos.
2016-06-01 14:38:06 -04:00
4c751ebd50
Merge github.com:grpc/grpc into error
2016-06-01 09:34:42 -07:00
2a50dfefdc
s/grpc_pops/grpc_polling_entity
2016-05-31 15:10:58 -07:00
4594bd9d1b
Merge remote-tracking branch 'upstream/master' into base
2016-05-31 14:19:57 -07:00
8bec6f6a55
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
2016-05-31 13:59:37 -07:00
69f3e2bf2e
Revert "Remove legacy poller"
...
This reverts commit d88e15cee7
2016-05-31 13:45:24 -07:00
Craig Tiller