Commit Graph

308 Commits

Author SHA1 Message Date
makdharma c1ed2193f2 Merge pull request #7473 from jcanizales/p0-fix-auth-sample
Fix AuthSample crash on startup
2016-07-25 11:14:08 -07:00
Nicolas Noble 7645fdc4f0 Merge pull request #7393 from y-zeng/example_makefile
Enable server reflection in c++ examples
2016-07-21 14:28:55 -07:00
Jorge Canizales 6e2832af29 Downloaded plist with new keys needed by Firebase SDK 2016-07-19 16:43:03 -07:00
Nicolas Noble 91991a234f Merge pull request #7417 from nathanielmanistaatgoogle/multiplex-v1.0.x
Client and server multiplex example
2016-07-19 09:23:19 -07:00
kpayson64 e73459554a Merge pull request #7419 from nathanielmanistaatgoogle/examples-v1.0.x
Update examples to GA API
2016-07-18 23:23:38 -07:00
Jorge Canizales f8c4580939 Commit as 1.0.0-pre1 so we can release already. 2016-07-18 17:51:31 -07:00
Nathaniel Manista 46585e23f1 Update examples to GA API 2016-07-15 22:33:50 +00:00
Nathaniel Manista e1466d6629 Client and server multiplex example 2016-07-15 21:43:02 +00:00
Jorge Canizales 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
Stanley Cheung febe79116c php: fix interop tests breakage 2016-07-13 20:20:43 -07:00
kpayson64 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
makdharma 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
Stanley Cheung 67bccfed99 php: prepare for GA release 2016-07-13 08:37:29 -07:00
Nicolas "Pixel" Noble 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
Jorge Canizales cfccf2a149 Merge master to resolve tests podspec conflict 2016-07-11 14:29:49 -07:00
Jorge Canizales 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
Jorge Canizales 45bb7f36b4 Use the deployed protoc spec in samples and README 2016-07-11 11:09:59 -07:00
Jorge Canizales 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
kpayson64 887737945b Merge pull request #7177 from kpayson64/python_codegen
Updated example codegen to use grpcio-tools
2016-07-08 12:45:29 -07:00
kpayson64 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
makdharma 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
Stanley Cheung c28a6c1b3b Merge pull request #6693 from thinkerou/phpt
Changed the README file of PHP example
2016-07-07 19:59:43 -07:00
Stanley Cheung 692a38f7fa php: update example composer.json 2016-07-07 17:03:16 -07:00
Yuchen Zeng 1c58bd221d Enable server reflection in c++ examples 2016-07-07 14:19:04 -07:00
Jorge Canizales 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
Jorge Canizales 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
Jorge Canizales 0f213c399c Fix examples to work with local gRPC-Core 2016-07-01 11:54:35 -07:00
Jorge Canizales c09854b8fe Fix example Podfiles, and document better 2016-07-01 10:24:17 -07:00
Yuchen Zeng 753b45dcf8 Merge remote-tracking branch 'upstream/master' into handler_http_response 2016-06-30 19:16:59 -07:00
Jan Tattermusch 27e4979ee5 Merge pull request #7161 from dgquintas/use_release
Updated git clone URL
2016-06-30 13:30:19 -07:00
Ken Payson 5c88bc660c Updated example codegen to use grpcio-tools 2016-06-30 11:54:50 -07:00
David Garcia Quintas 4281272389 Updated git clone URL 2016-06-29 17:39:07 -07:00
Jan Tattermusch e4822e2f35 Merge pull request #7081 from y-zeng/build-example-travis
Build ObjC examples in travis
2016-06-29 12:17:15 -07:00
Jan Tattermusch 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
Jan Tattermusch 6dd25e52a6 Update gRPC in C# minutes readme. 2016-06-27 10:44:03 -07:00
Yuchen Zeng b8431ae707 Add .xcscheme files for ObjC examples 2016-06-27 10:30:51 -07:00
Jan Tattermusch 09685d224e regenerate files 2016-06-24 15:17:41 -07:00
Jan Tattermusch d3b0dda9b8 update grpc nugets to 0.15 2016-06-24 15:17:39 -07:00
makdharma 80dc760acc Merge pull request #6934 from makdharma/route_guide_fixes
Modified route_guide sample app to show RPC log
2016-06-24 13:57:50 -07:00
Makarand Dharmapurikar 5a3c6389ed Added braces around _service 2016-06-23 14:02:33 -07:00
Makarand Dharmapurikar abd285aed8 Added missing todo and moved _service
To Implementation
2016-06-23 13:30:19 -07:00
Jan Tattermusch d605b63383 Merge pull request #7008 from jtattermusch/csharp_no_new_client
Remove generated NewClient factory method for C#.
2016-06-23 11:19:18 -07:00
Makarand Dharmapurikar dde4fc66fb changed service to _service, and added a TODO
TODO for removing boilerplate code
2016-06-23 10:35:19 -07:00
Jan Tattermusch 1bc42d9504 Merge pull request #6994 from y-zeng/update-example
Update examples with Cocoapods 1.0.0
2016-06-23 10:11:54 -07:00
Jan Tattermusch f41ebc3968 remove occurences of NewClient factory method 2016-06-22 17:18:47 -07:00
Yuchen Zeng db3ffe13cb Update examples with Cocoapods 1.0.0 2016-06-22 01:14:25 -07:00
Yuchen Zeng abc7427a4d Update podfiles for objc examples 2016-06-20 14:40:57 -07:00
Yuchen Zeng 9790e97704 Merge remote-tracking branch 'upstream/master' into handler_http_response 2016-06-17 16:01:57 -07:00
Yuchen Zeng 955a364e34 Add bad_server_response_test 2016-06-17 13:55:50 -07:00
thinkerou 814b80e8e9 change README for node dir changed 2016-06-17 23:17:28 +08:00