Commit Graph

373 Commits

Author SHA1 Message Date
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
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
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