Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #7920 from tuoxiansp/patch-1 | Michael Lumish | 2016-09-09 |
|\ | |||
* \ | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-09-08 |
|\ \ | |||
| * \ | Merge pull request #7837 from apolcyn/update_csharp_examples | apolcyn | 2016-09-06 |
| |\ \ | |||
* | \ \ | Merge pull request #7848 from nicolasnoble/upmerge-from-v1.0.x | Nicolas Noble | 2016-09-06 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #7854 from pythias/patch-2 | Stanley Cheung | 2016-09-01 |
|\ \ \ \ \ | |||
| | | | | * | Update README.md | 陈雨童 | 2016-08-30 |
| |_|_|_|/ |/| | | | | |||
| | | * | | php: composer.json has extra comma | Stanley Cheung | 2016-08-26 |
| * | | | | Remove undefined env | pythias | 2016-08-24 |
* | | | | | Remove the extra comma | 安正超 | 2016-08-24 |
|/ / / / | |||
| * / / | Merge branch 'v1.0.x' into upmerge-from-v1.0.x | Nicolas "Pixel" Noble | 2016-08-24 |
|/| | | | |/ / | |||
* | | | Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x | Nicolas Noble | 2016-08-23 |
|\ \ \ | |||
| | * \ | Merge pull request #7817 from stanley-cheung/php-update-composer-v1_0 | Stanley Cheung | 2016-08-23 |
| | |\ \ | |||
| | | | * | change hint paths for protobuf to use net45 dir in csproj files | Alex Polcyn | 2016-08-22 |
| | | |/ | | |/| | |||
| | * | | Merge pull request #7720 from apolcyn/update_examples_grpc_version | kpayson64 | 2016-08-22 |
| | |\ \ | |||
* | | | | | php: bump version | Stanley Cheung | 2016-08-22 |
| | | | * | php: bump version | Stanley Cheung | 2016-08-22 |
| | * | | | Truncate Python example READMEs to grpc.io links | Nathaniel Manista | 2016-08-20 |
| | | |/ | | |/| | |||
| * / | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
|/| | | | |/ / | |||
| * | | Move Podspecs to v1 | Jorge Canizales | 2016-08-18 |
| * | | Merge pull request #7448 from jcanizales/p0-archive-fix | makdharma | 2016-08-16 |
| |\ \ | |||
* | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-16 |
|\| | | | |||
| * | | | Merge pull request #7630 from kpayson64/ruby_example_pb | kpayson64 | 2016-08-15 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #7700 from apolcyn/update_helloworld_readme | kpayson64 | 2016-08-15 |
| |\ \ \ \ | |||
| | | | | * | update dependencies in C# examples to GA versions | Alex Polcyn | 2016-08-12 |
| | |_|_|/ | |/| | | | |||
| * | | | | s/makefile/Makefile | David Garcia Quintas | 2016-08-11 |
| * | | | | Merge pull request #7688 from dgquintas/cpp_readme | David G. Quintas | 2016-08-11 |
| * | | | | Merge pull request #7634 from apolcyn/use_dotnet_on_examples | apolcyn | 2016-08-11 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge pull request #7688 from dgquintas/cpp_readme | David G. Quintas | 2016-08-11 |
|\ \ \ \ \ \ | |||
| | * \ \ \ \ | Merge pull request #7577 from murgatroid99/node_dependency_update | Nicolas Noble | 2016-08-11 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge pull request #7674 from stanley-cheung/php7-ubuntu-fix | Stanley Cheung | 2016-08-11 |
| | |\ \ \ \ \ \ | |||
* | | \ \ \ \ \ \ | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-11 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | | | | | * | | | update original helloworld README | Alexander Polcyn | 2016-08-10 |
| | | | | * | | | | add netcore portability package dependency | Alexander Polcyn | 2016-08-09 |
| | | * | | | | | | minor text change | Stanley Cheung | 2016-08-09 |
| | | | |_|/ / / | | | |/| | | | | |||
| * | / | | | | | Upgrade one forgotten example code site to GA API | Nathaniel Manista | 2016-08-10 |
| | |/ / / / / | |/| | | | | | |||
| | * | | | | | fix c++ readme and tutorial | David Garcia Quintas | 2016-08-09 |
| |/ / / / / |/| | | | | | |||
* | | | | | | Update README.md | Stanislav | 2016-08-09 |
| | | | | * | Solve merge conflict at gRPC-ProtoRPC.podspec | Jorge Canizales | 2016-08-08 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | | | * | Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-archive-fix | Jorge Canizales | 2016-08-07 |
| | | | | |\ | |||
| * | | | | \ | Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-advance-proto... | Jorge Canizales | 2016-08-05 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||
| | * | | | | | Merge pull request #7514 from apolcyn/move_tools_dep_to_project | kpayson64 | 2016-08-05 |
| | |\ \ \ \ \ | |||
| | | | | | * | | Update ruby examples to use new _pb protobuf format | Ken Payson | 2016-08-04 |
| | | |_|_|/ / | | |/| | | | | |||
| | | | | * | | add csharp hello world that uses dotnet cli | Alex Polcyn | 2016-08-03 |
| | | |_|/ / | | |/| | | | |||
* | | | | | | Merge pull request #7553 from podsvirov/topic-cmake-template | Nicolas Noble | 2016-07-29 |
|\ \ \ \ \ \ | |||
| | * | | | | | Merge commit '5e623b8d8d8d106bd4ab9a6d77ef43b1a134d8ec' into p0-advance-proto... | Jorge Canizales | 2016-07-29 |
| | |\| | | | | |||
| | * | | | | | Update podspecs to use Protobuf 3.0.0 | Jorge Canizales | 2016-07-29 |
| | * | | | | | Update Protobuf submodule to v3.0.0 (GA) | Jorge Canizales | 2016-07-29 |
* | | | | | | | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-07-29 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | | | * | | Update node protobuf dependency to 3.0.0 where applicable. Also update exampl... | murgatroid99 | 2016-07-29 |
| | |_|_|/ / | |/| | | | | |||
| | * | | | | CMake: project for HelloWorld cpp example | Konstantin Podsvirov | 2016-07-28 |
| |/ / / / |/| | | | |