Commit Graph

618 Commits

Author SHA1 Message Date
Eric Gribkoff 5a03bdb622
Merge pull request #14885 from ericgribkoff/android_cleanup
simplify CMake build
2018-04-03 15:09:59 -07:00
Eric Gribkoff 10ad26f917 refer to libprotobuf directly 2018-04-03 13:32:20 -07:00
Eric Gribkoff ffa10caf94 simplify CMake build 2018-03-30 11:10:44 -07:00
Jan Tattermusch 4a510960c6 add distribtest for grpc being added with cmake add_subdirectory 2018-03-29 14:12:10 +02:00
Jan Tattermusch 2286c633c2 cmake "superbuild" example using externalprojects 2018-03-28 19:30:44 +02:00
Eric Gribkoff 2d3d918db5 Fix Android build 2018-03-27 12:01:35 -07:00
Eric Gribkoff f54e4a35fa build protoc and grpc_cpp_plugin for android kokoro job 2018-03-23 17:04:25 -07:00
Jan Tattermusch a26aecc03b reimplement distance calculation in routeguide 2018-03-23 07:44:30 +01:00
Vijay Pai c90a85649b Change grpc++ references in names to grpcpp 2018-03-08 22:04:59 -08:00
Eric Gribkoff a32a4c51f8 C++ on Android example client and server 2018-03-02 08:42:46 -08:00
Muxi Yan 6ef0159e8e Make C++ cocoapods example work 2018-02-21 18:10:49 -08:00
Mehrdad Afshari 6d13712d07 Fix Python example unary/stream conflict 2018-02-05 15:06:26 -08:00
Muxi Yan bc4b7891c8 Merge remote-tracking branch 'upstream/master' into create-grpc-c++-podspec 2018-01-19 17:35:33 -08:00
Muxi Yan 61bb29f141 Clean up C++ tests and example 2018-01-19 17:32:27 -08:00
Muxi Yan 277e2e4f07 Clean up tests, examples, and podspecs 2018-01-18 17:01:08 -08:00
Jan Tattermusch dec076c4ab fix protobuf usage in the example 2018-01-18 19:34:20 +01:00
Muxi Yan 1164fd6fca Fix copyright information 2018-01-05 17:22:13 -08:00
Muxi Yan de9d44d339 Add example to use gRPC-C++ pod in an iOS application 2018-01-05 16:03:41 -08:00
Mehrdad Afshari 87cd994b04 Upgrade yapf to 0.20.0
Upgrade yapf version to 0.20.0 and reformat Python files.
2018-01-02 14:40:00 -08:00
Jan Tattermusch 63110654a1 regenerate routeguide protos 2017-12-13 23:56:59 +01:00
Jan Tattermusch 4dec552614 regenerate helloworld protos 2017-12-13 23:56:57 +01:00
Jan Tattermusch 990299b48d upgrade Grpc and Protobuf nugets in routeguide 2017-12-13 23:56:56 +01:00
Jan Tattermusch 2df1c24f1d upgrade Grpc and Protobuf nugets in helloworld 2017-12-13 23:56:52 +01:00
Jan Tattermusch a54c12d6cd regenerate helloworld-from-cli protos 2017-12-13 23:56:49 +01:00
Jan Tattermusch b12b8d0ddf cleanup helloworld for dotnet CLI 2017-12-13 23:56:46 +01:00
Mehrdad Afshari c5ba665b22 Merge remote-tracking branch 'origin/v1.8.x' 2017-12-11 11:32:11 -08:00
Mehrdad Afshari 6146151a4f Examples for gRPC Python interceptor facility 2017-12-12 12:01:07 -08:00
ncteisen 848a749f7a yapf examples/python 2017-12-12 10:59:01 -08:00
Jan Tattermusch f0620a37a5 fix linux distrib tests 2017-12-01 10:07:43 +01:00
Jan Tattermusch 06251f8cd6 make helloworld CMakeLists compile on windows 2017-12-01 10:07:43 +01:00
Vijay Pai dd0f006416 Fix examples build file 2017-11-28 11:53:55 -08:00
Mehrdad Afshari 36f60a9cc1 Kill off unnecessary sleep in route_guide example 2017-11-22 09:46:38 -08:00
Zhouyihai Ding 28783b9178
Merge pull request #13268 from ZhouyihaiDing/php_example
PHP: update helloworld and routeguide example
2017-11-06 16:06:19 -08:00
ZhouyihaiDing 5253720853 php example 2017-11-06 21:07:47 +00:00
Nathaniel Manista 4f22c919e1
Merge pull request #12498 from nathanielmanistaatgoogle/example_generated_code
Regenerate example Python generated code.
2017-11-06 11:30:23 -08:00
Florian Nagel a36b429ae8 Fix deprecation warning Server#addProtoService and use Server#addService instead 2017-10-03 15:21:14 +02:00
Vijay Pai 4b047a3bff Construction of streams shouldn't require triggering async ops 2017-09-14 17:55:13 -07:00
Nathaniel Manista 61efbcd27a Regenerate example Python generated code 2017-09-11 23:48:47 +00:00
Jan Tattermusch 4caadb9205 fix helloworld cmake build 2017-09-11 11:03:05 +02:00
Jan Tattermusch e9956df33d add global.json files for C# 2017-08-11 18:17:18 +02:00
Craig Tiller d996379030 Reset OWNERS state 2017-07-17 10:54:07 -07:00
Muxi Yan 75cb3c25d9 Add @muxi and @makdharma as owners of ObjC related files 2017-07-14 12:02:27 -07:00
Mehrdad Afshari 76a316cb1f Add `set noparent` to Python OWNER files 2017-07-13 16:19:17 -07:00
Mehrdad Afshari e6fb12fd96 Add additional OWNERS files for Python projects 2017-07-13 16:10:39 -07:00
murgatroid99 b5984601b8 Add myself as owner of files in several directories 2017-07-13 14:00:19 -07:00
Nicolas Noble 9877189e45 Merge pull request #11310 from nicolasnoble/import
Import mutations.
2017-07-13 13:39:58 -07:00
Mehrdad Afshari bb3d95b643 Use https://grpc.io consistently as the canonical URL 2017-07-10 22:24:28 +00:00
Mehrdad Afshari 976eb7c4b4 Fetch grpc.io/release over https 2017-07-10 15:07:33 -07:00
Nicolas "Pixel" Noble 5d80dc4985 Merge branch 'master' of https://github.com/grpc/grpc into import 2017-06-26 22:01:11 +02:00
Toshihito Kikuchi 351506688d Update compiler/linker options to use pkg-config in C++ examples 2017-06-13 16:15:04 -07:00
Jan Tattermusch 4d5c3102a1 fix remaining license notices 2017-06-08 11:22:41 +02:00
Jan Tattermusch 7897ae9308 auto-fix most of licenses 2017-06-08 11:22:41 +02:00
Nicolas "Pixel" Noble 7bc55fdaa3 Merge remote-tracking branch 'ctiller/build-wtf' into import 2017-05-26 00:32:47 +02:00
Stanley Cheung 6e589c6a15 PHP: stop requiring google/protobuf PHP implementation 2017-05-16 18:09:36 -07:00
Craig Tiller a753371f05 Rework well_known_protos attr, and some other fixes 2017-05-16 13:09:33 -07:00
Nicolas "Pixel" Noble d2ac59f1aa Merge failure: mangled the examples BUILD file. 2017-05-12 17:19:46 +02:00
Nicolas "Pixel" Noble eb36b8ac77 Merge branch 'master' of https://github.com/grpc/grpc into import 2017-05-11 23:24:37 +02:00
Makarand Dharmapurikar 2807951be5 Merge branch 'master' of https://github.com/grpc/grpc into fixbazel 2017-04-25 09:39:33 -07:00
Makarand Dharmapurikar be0fb725f6 fixed target name so bazel basic build passes 2017-04-24 16:22:49 -07:00
Jan Tattermusch f769150982 regenerate routeguide protos 2017-04-20 15:33:41 +02:00
Jan Tattermusch 808eb713f8 upgrade routeguide to Grpc 1.2.2 2017-04-20 15:33:40 +02:00
Jan Tattermusch 622d7d6d2d regenerate greeter protos 2017-04-20 15:33:40 +02:00
Jan Tattermusch 769df6fa45 upgrade net45 helloworld to Grpc 1.2.2 2017-04-20 15:33:39 +02:00
Jan Tattermusch 1ba7e5d898 regenerate 2017-04-20 15:33:38 +02:00
Jan Tattermusch 4842904408 add generate_protos file 2017-04-20 15:33:38 +02:00
Jan Tattermusch 923b1317d5 update .NET core example to .csproj projects 2017-04-20 15:33:31 +02:00
Makarand Dharmapurikar 4c0620b7df consolidated BUILD files from example into one
it is also a way to test that this change works as expected.
2017-04-18 09:48:08 -07:00
Jan Tattermusch a22a19fd64 fix markdown 2017-04-18 12:31:49 +02:00
Nicolas "Pixel" Noble 7c26eed838 Buildifier and wrapping test/cpp/* rules with our build system. 2017-04-13 02:03:22 +02:00
Jan Tattermusch 43713e6ae1 Merge remote-tracking branch 'upstream/v1.2.x' into HEAD 2017-04-12 09:20:29 +02:00
Jan Tattermusch 87b2112443 also fix global.json in helloworld 2017-04-07 10:18:12 +02:00
Jan Tattermusch d3a5635546 Add global.json file to pick dotnet core SDK version 2017-04-07 10:10:13 +02:00
Alexander Polcyn b98b3c260e add examples for ruby error throwing and handling 2017-03-28 13:49:58 -07:00
Michael Lumish bbc962230f Merge pull request #9864 from michielbdejong/patch-1
Use grpc-tools npm package in readme
2017-03-22 09:00:32 -07:00
Jan Tattermusch f5ac0b95f2 Add global.json file to pick dotnet core SDK version 2017-03-09 18:08:24 +01:00
Stanley Cheung 82c6d8d4fd PHP: prepare for 1.2 release 2017-03-01 12:43:25 -08:00
Michiel de Jong 10cea4b121 Use grpc-tools npm package in readme
* Make it clearer which directory to `cd` to
* Take advantage of the work done https://github.com/grpc/grpc/issues/5982
2017-02-24 10:21:14 +01:00
Nicolas "Pixel" Noble e00d63f3ea Merge remote-tracking branch 'google/v1.1.x' 2017-02-13 23:37:17 +01:00
Alexander Polcyn ccaec44d65 add ruby example that doesn't use protobuf 2017-02-08 11:38:30 -08:00
Jan Tattermusch 086fddd873 Merge pull request #9482 from gazialankus/patch-1
Corrected version number of Grpc.Tools in the bat file for the C# example
2017-02-02 08:23:19 -08:00
Stanley Cheung c290c115fa PHP: update examples 2017-01-31 20:29:17 -08:00
Gazihan Alankus 5c261b82e5 Corrected version number of Grpc.Tools in the bat file
As per the following line, it is 1.0.1 now: 6ff81e91c9/examples/csharp/helloworld/Greeter/packages.config (L7)
2017-01-27 13:51:18 +03:00
Nicolas "Pixel" Noble 24263c3f7a Fixing a few items with the new Bazel BUILD system:
-) Fixing Bazel 0.4.x breakage
-) Adding helloworld BUILD examples
-) Fixing grpc++ missing files.
-) Adding helloworld example as a test for Bazel basic.
2017-01-13 02:55:13 +01:00
Nathaniel Manista c15ee83882 Update Python examples with fresh generated code 2016-12-21 21:05:19 +00:00
David G. Quintas 7b1b2cc2aa Merge pull request #8831 from ryanvo/examples-typo-patch
Fix typo
2016-12-13 13:05:08 -08:00
Masood Malekghassemi fb261bf748 Un-namespace Python packages
Setuptools was updated and our hacky namespace-package-chickens came
back to roost. This removes the unsupported namespace package hacks.
2016-12-12 15:04:30 -08:00
Jan Tattermusch 8613e474cb Merge remote-tracking branch 'upstream/v1.0.x' into HEAD 2016-11-22 11:15:53 +01:00
Ryan 3fec5259f6 Fix typo 2016-11-21 21:37:39 -05:00
Alexander Polcyn 0350471b2e example changes to smoke test with 1.0.1 2016-11-03 13:15:40 -07:00
Michael Lumish 13905ee9bb Merge pull request #7967 from p16/node-example-add-return-after-callback-witih-error
Nodejs examples: add return after calling callback(err)
2016-10-20 16:40:59 -07:00
Mark Mandel 9929e6c85c Remove `run_codegen.py` from python helloworld example
Since we no longer reference `run_codegen.py` in the Quick Start for
Python, remove it from the repository to avoid confusion.
2016-10-17 17:53:15 -07:00
Stanley Cheung 619c034fef php: require grpc extension to be installed before composer package 2016-10-06 12:22:02 -07:00
Michael Lumish b9c77471f9 Merge pull request #8036 from tania-m/patch-1
Update greeter_client.js
2016-10-03 16:42:46 -07:00
Nicolas "Pixel" Noble 87a1081211 Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under 2016-09-29 01:31:54 +02:00
Jan Tattermusch f6caaa76a6 add copyrights for AssemblyInfo.cs files 2016-09-21 22:40:11 +02:00
Alexander Polcyn b06d534121 make clear independence of bidi streams in route guide client 2016-09-20 12:30:55 -07:00
Alexander Polcyn 689e89c2e6 dont create extra thread on bidi call in benchmark, and change suggested
code for ruby bidi calls
2016-09-20 11:00:36 -07:00
thinkerou 88671a8ae8 update route_guide_db path in php example 2016-09-18 15:31:34 +08:00
Stanley Cheung c9b401e3fc cpp examples missing gpr asserts 2016-09-15 21:19:53 -07:00
Michael Lumish 1c8bbc4106 Merge pull request #7920 from tuoxiansp/patch-1
Update README.md
2016-09-09 10:58:25 -07:00
tania-m cb78540024 Update greeter_client.js
Switched declaration order
2016-09-08 20:28:26 +02:00
Nicolas "Pixel" Noble 5928bff0c7 Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge 2016-09-08 01:58:49 +02:00
apolcyn 4bb13b3574 Merge pull request #7837 from apolcyn/update_csharp_examples
change hint paths for protobuf to use net45 dir in csproj files
2016-09-06 17:41:28 -07:00
Nicolas Noble 74c92f62d9 Merge pull request #7848 from nicolasnoble/upmerge-from-v1.0.x
Manual upmerge from v1.0.x
2016-09-06 11:41:26 -07:00
Filippo De Santis 1647097d40 Add return after calling callback(err) 2016-09-02 12:28:45 +02:00
Stanley Cheung 463ff57440 Merge pull request #7854 from pythias/patch-2
Remove undefined env
2016-09-01 09:05:23 -07:00
陈雨童 fb33fd385b Update README.md 2016-08-30 14:30:57 +08:00
Stanley Cheung 676e479ee5 php: composer.json has extra comma 2016-08-26 20:07:53 -07:00
pythias ed7ee3df9a Remove undefined env 2016-08-24 18:22:47 +08:00
安正超 1f07aa56cb Remove the extra comma 2016-08-24 13:03:02 +08:00
Nicolas "Pixel" Noble cdbe6b3963 Merge branch 'v1.0.x' into upmerge-from-v1.0.x 2016-08-24 00:08:49 +02:00
Nicolas Noble 668bf881a9 Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x
Upmerge from v1.0.x
2016-08-23 14:59:39 -07:00
Stanley Cheung d7ff4ff400 Merge pull request #7817 from stanley-cheung/php-update-composer-v1_0
PHP: bump version
2016-08-23 08:37:07 -07:00
Alex Polcyn 6888c251a3 change hint paths for protobuf to use net45 dir in csproj files 2016-08-22 22:27:11 -07:00
kpayson64 67920ca2e6 Merge pull request #7720 from apolcyn/update_examples_grpc_version
update dependencies in C# examples to GA versions
2016-08-22 19:50:33 -07:00
Stanley Cheung 557aa4e695 php: bump version 2016-08-22 08:51:47 -07:00
Stanley Cheung 8749c96595 php: bump version 2016-08-22 08:45:12 -07:00
Nathaniel Manista 6c09b3b29e Truncate Python example READMEs to grpc.io links 2016-08-20 15:26:20 +00:00
Nicolas "Pixel" Noble e3e17d3f6b Merge branch 'v1.0.x' of https://github.com/grpc/grpc 2016-08-20 01:45:32 +02:00
Jorge Canizales 4a18c67b77 Move Podspecs to v1 2016-08-18 13:26:25 -07:00
makdharma 3bc78cd0b5 Merge pull request #7448 from jcanizales/p0-archive-fix
Work around Cocoapods dynamic frameworks incompatibility with XCode archive
2016-08-16 09:17:29 -07:00
Nicolas "Pixel" Noble e1ee20bde6 Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge 2016-08-16 01:54:33 +02:00
kpayson64 37f6ffa125 Merge pull request #7630 from kpayson64/ruby_example_pb
Update ruby examples to use new _pb protobuf format
2016-08-15 11:21:17 -07:00
kpayson64 5fa0731803 Merge pull request #7700 from apolcyn/update_helloworld_readme
update original helloworld README
2016-08-15 10:53:53 -07:00
Alex Polcyn 567f14c121 update dependencies in C# examples to GA versions 2016-08-12 11:15:11 -07:00
David Garcia Quintas c61b1d3cd0 s/makefile/Makefile 2016-08-11 16:15:41 -07:00
David G. Quintas 5804745aed Merge pull request #7688 from dgquintas/cpp_readme
fix c++ readme and tutorial
2016-08-11 16:02:15 -07:00
apolcyn f2d8c60845 Merge pull request #7634 from apolcyn/use_dotnet_on_examples
add csharp hello world that uses dotnet cli
2016-08-11 23:01:30 +00:00
David G. Quintas 93b599c8b0 Merge pull request #7688 from dgquintas/cpp_readme
fix c++ readme and tutorial
2016-08-11 15:40:56 -07:00
Nicolas Noble 54d834784d Merge pull request #7577 from murgatroid99/node_dependency_update
Update node protobuf dependency to 3.0.0 where applicable. Also update example dependency to grpc 1.0.0
2016-08-11 14:23:26 -07:00
Stanley Cheung a6f6b6f4c9 Merge pull request #7674 from stanley-cheung/php7-ubuntu-fix
PHP7: fix ubuntu compile error
2016-08-11 12:02:31 -07:00
Nicolas "Pixel" Noble 7f074e0e20 Merge branch 'v1.0.x' into manual-upmerge 2016-08-11 21:00:08 +02:00
Alexander Polcyn feef8081c1 update original helloworld README 2016-08-10 15:51:35 -07:00
Alexander Polcyn 5312815ff2 add netcore portability package dependency 2016-08-09 22:52:35 -07:00
Stanley Cheung f789facafd minor text change 2016-08-09 22:01:17 -07:00
Nathaniel Manista 2fd19a6f4d Upgrade one forgotten example code site to GA API
This should have been included in 46585e23f1.
2016-08-10 02:03:07 +00:00
David Garcia Quintas 260a0025d2 fix c++ readme and tutorial 2016-08-09 16:57:32 -07:00
Stanislav 13fa379693 Update README.md 2016-08-09 16:00:59 +07:00
Jorge Canizales 8ac55f8a8c Solve merge conflict at gRPC-ProtoRPC.podspec 2016-08-08 18:39:56 -07:00
Jorge Canizales a9b1c5cbe1 Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-archive-fix 2016-08-07 18:46:38 -07:00
Jorge Canizales d4230bbf02 Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-advance-protobuf-version 2016-08-05 17:17:45 -07:00
kpayson64 4e57e8be39 Merge pull request #7514 from apolcyn/move_tools_dep_to_project
moved Grpc.Tools dependency from solution level to project level
2016-08-05 15:15:29 -07:00
Ken Payson 5b4d3625eb Update ruby examples to use new _pb protobuf format 2016-08-04 10:31:15 -07:00
Alex Polcyn c6446bf3d8 add csharp hello world that uses dotnet cli 2016-08-03 20:42:39 -07:00
Nicolas Noble 2507fef737 Merge pull request #7553 from podsvirov/topic-cmake-template
CMake Project Improvements
2016-07-29 15:49:54 -07:00
Jorge Canizales 7a2bc14fc0 Merge commit '5e623b8d8d8d106bd4ab9a6d77ef43b1a134d8ec' into p0-advance-protobuf-version 2016-07-29 15:45:02 -07:00
Jorge Canizales 72dce2dfbc Update podspecs to use Protobuf 3.0.0
The SwiftSample doesn’t build in this commit, but I need to sync with
head anyway so I’ll first merge v1.0.x into this branch and then debug.
2016-07-29 15:42:00 -07:00
Jorge Canizales 4343c904e2 Update Protobuf submodule to v3.0.0 (GA) 2016-07-29 15:39:45 -07:00
Nicolas "Pixel" Noble 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
murgatroid99 fcb5271105 Update node protobuf dependency to 3.0.0 where applicable. Also update example dependency to grpc 1.0.0 2016-07-29 10:44:01 -07:00
Konstantin Podsvirov 13016cc40b CMake: project for HelloWorld cpp example 2016-07-28 00:46:11 +03:00
Nicolas Noble 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
Stanley Cheung c5755ad5a9 php: fix composer.json 2016-07-26 17:44:55 -07:00
Stanley Cheung b95870d85b php: fix composer.json 2016-07-26 17:44:43 -07:00
Muxi Yan cd0d8aed65 Identify system and remove --no-as-need if it is Mac OS 2016-07-26 14:13:46 -07:00
Muxi Yan 4e3df00f00 Removed --no-as-needed options from Makefile of HelloWorld and RouteGuide 2016-07-26 13:28:54 -07:00
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
Alex Polcyn 74543125b5 moved Grpc.Tools dependency from solution level to project level 2016-07-23 01:26:46 -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 70ded7eecc Update sample and test versions to -pre1.1
To use the 3.0.0-beta-4 version of protoc, which has the fix for oneofs
when using dynamic frameworks.
2016-07-19 17:35:11 -07:00
Jorge Canizales 9e6372380d Update protobuf submodule to 3.0.0-beta-4
Which has the fix for oneofs when using dynamic frameworks in ObjectiveC
2016-07-19 17:35:06 -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
Jorge Canizales e4704d3eda “Allow non-modular includes in framework modules”
It’s the magic sentence that allows pods dependent on RxLibrary to be
archived correctly by XCode.

It’s less than ideal, and seems arbitrary (why RxLibrary specifically?),
so we’ll try to produce a minimal case and open an issue with it in the
Cocoapods repo.
2016-07-18 11:25:51 -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