2fbf6fd3d8
Merge remote-tracking branch 'upstream/master' into cares_csharp
2016-08-11 01:09:14 -07:00
13fa379693
Update README.md
2016-08-09 16:00:59 +07:00
43b4bfd02b
Revert unnecessary changes
2016-08-05 10:47:10 -07:00
bb36cebc1d
Merge remote-tracking branch 'upstream/master' into cares
2016-08-05 10:40:25 -07:00
d4bbfc7dcf
Implement c-ares based dns resolver
2016-08-05 10:33:16 -07:00
2507fef737
Merge pull request #7553 from podsvirov/topic-cmake-template
...
CMake Project Improvements
2016-07-29 15:49:54 -07:00
8302b123de
Merge branch 'v1.0.x' into manual-upmerge
...
Conflicts:
src/ruby/pb/test/client.rb
src/ruby/pb/test/server.rb
tools/dockerfile/test/php7_jessie_x64/Dockerfile
2016-07-29 22:48:16 +02:00
13016cc40b
CMake: project for HelloWorld cpp example
2016-07-28 00:46:11 +03:00
846768c12f
Merge pull request #7535 from muxi/fix-no-as-needed
...
Removed --no-as-needed options from Makefile of HelloWorld and RouteGuide
2016-07-27 11:29:39 -07:00
c5755ad5a9
php: fix composer.json
2016-07-26 17:44:55 -07:00
b95870d85b
php: fix composer.json
2016-07-26 17:44:43 -07:00
cd0d8aed65
Identify system and remove --no-as-need if it is Mac OS
2016-07-26 14:13:46 -07:00
4e3df00f00
Removed --no-as-needed options from Makefile of HelloWorld and RouteGuide
2016-07-26 13:28:54 -07:00
c1ed2193f2
Merge pull request #7473 from jcanizales/p0-fix-auth-sample
...
Fix AuthSample crash on startup
2016-07-25 11:14:08 -07:00
7645fdc4f0
Merge pull request #7393 from y-zeng/example_makefile
...
Enable server reflection in c++ examples
2016-07-21 14:28:55 -07:00
6e2832af29
Downloaded plist with new keys needed by Firebase SDK
2016-07-19 16:43:03 -07:00
91991a234f
Merge pull request #7417 from nathanielmanistaatgoogle/multiplex-v1.0.x
...
Client and server multiplex example
2016-07-19 09:23:19 -07:00
e73459554a
Merge pull request #7419 from nathanielmanistaatgoogle/examples-v1.0.x
...
Update examples to GA API
2016-07-18 23:23:38 -07:00
f8c4580939
Commit as 1.0.0-pre1 so we can release already.
2016-07-18 17:51:31 -07:00
46585e23f1
Update examples to GA API
2016-07-15 22:33:50 +00:00
e1466d6629
Client and server multiplex example
2016-07-15 21:43:02 +00: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
febe79116c
php: fix interop tests breakage
2016-07-13 20:20:43 -07:00
85fa79d228
Merge pull request #7363 from stanley-cheung/php-prepare-for-ga-v1_0branch
...
php: prepare for GA release
2016-07-13 16:02:47 -07:00
9195ea0f2a
Merge pull request #7359 from jcanizales/p0-protoc-podspec
...
Distribute ProtoC and the plugin as pods
2016-07-13 11:35:32 -07:00
67bccfed99
php: prepare for GA release
2016-07-13 08:37:29 -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
cfccf2a149
Merge master to resolve tests podspec conflict
2016-07-11 14:29:49 -07:00
8f525f9bc5
Fix: Cocoapods doesn’t like dirs that start with ./
...
I wasted a huge amount of time debugging this madness.
2016-07-11 14:24:48 -07:00
45bb7f36b4
Use the deployed protoc spec in samples and README
2016-07-11 11:09:59 -07:00
6eade6dcd7
Podspecs for Protoc and the gRPC plugin
...
The examples under <repo_root>/examples now rely on the released
versions. Those under src/objective-c/examples, as well as the tests,
rely on protoc and the plugin as compiled from head.
2016-07-11 00:34:14 -07:00
887737945b
Merge pull request #7177 from kpayson64/python_codegen
...
Updated example codegen to use grpcio-tools
2016-07-08 12:45:29 -07:00
2bece9e0e1
Merge pull request #7156 from stanley-cheung/php-add-comment-shutdown-warning
...
PHP: add warning about shutdown function
2016-07-08 10:13:27 -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
c28a6c1b3b
Merge pull request #6693 from thinkerou/phpt
...
Changed the README file of PHP example
2016-07-07 19:59:43 -07:00
692a38f7fa
php: update example composer.json
2016-07-07 17:03:16 -07:00
1c58bd221d
Enable server reflection in c++ examples
2016-07-07 14:19:04 -07:00
60fec9e547
Merge master into merge-0.14-into-master
...
The protobuf commit conflicted. Resolved to the latest one.
2016-07-01 16:52:08 -07:00
f29e364168
Bump protobuf version to beta-3.3
...
It’s just the merge of beta-3.1 and beta-3.2, both of which we need.
2016-07-01 15:56:57 -07:00
0f213c399c
Fix examples to work with local gRPC-Core
2016-07-01 11:54:35 -07:00
c09854b8fe
Fix example Podfiles, and document better
2016-07-01 10:24:17 -07:00
753b45dcf8
Merge remote-tracking branch 'upstream/master' into handler_http_response
2016-06-30 19:16:59 -07:00
27e4979ee5
Merge pull request #7161 from dgquintas/use_release
...
Updated git clone URL
2016-06-30 13:30:19 -07:00
5c88bc660c
Updated example codegen to use grpcio-tools
2016-06-30 11:54:50 -07:00
4281272389
Updated git clone URL
2016-06-29 17:39:07 -07:00
e4822e2f35
Merge pull request #7081 from y-zeng/build-example-travis
...
Build ObjC examples in travis
2016-06-29 12:17:15 -07:00
b4028f6675
Merge pull request #7046 from murgatroid99/master_merge_release-0_15
...
Merge release-0_15 into master
2016-06-27 11:49:46 -07:00
6dd25e52a6
Update gRPC in C# minutes readme.
2016-06-27 10:44:03 -07:00
b8431ae707
Add .xcscheme files for ObjC examples
2016-06-27 10:30:51 -07:00
09685d224e
regenerate files
2016-06-24 15:17:41 -07:00
Yuchen Zeng