Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #7854 from pythias/patch-2 | Stanley Cheung | 2016-09-01 |
|\ | | | | | Remove undefined env | ||
| * | Remove undefined env | pythias | 2016-08-24 |
| | | |||
* | | Remove the extra comma | 安正超 | 2016-08-24 |
|/ | |||
* | Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x | Nicolas Noble | 2016-08-23 |
|\ | | | | | Upmerge from v1.0.x | ||
* | | php: bump version | Stanley Cheung | 2016-08-22 |
| | | |||
| * | 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 |
| |\ | | | | | | | Work around Cocoapods dynamic frameworks incompatibility with XCode archive | ||
* | | | 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 |
| |\ \ | | | | | | | | | Update ruby examples to use new _pb protobuf format | ||
| * \ \ | Merge pull request #7700 from apolcyn/update_helloworld_readme | kpayson64 | 2016-08-15 |
| |\ \ \ | | | | | | | | | | | update original helloworld README | ||
| * | | | | s/makefile/Makefile | David Garcia Quintas | 2016-08-11 |
| | | | | | |||
| * | | | | Merge pull request #7688 from dgquintas/cpp_readme | David G. Quintas | 2016-08-11 |
| | | | | | | | | | | | | | | | fix c++ readme and tutorial | ||
| * | | | | Merge pull request #7634 from apolcyn/use_dotnet_on_examples | apolcyn | 2016-08-11 |
| |\ \ \ \ | | | | | | | | | | | | | add csharp hello world that uses dotnet cli | ||
* | \ \ \ \ | Merge pull request #7688 from dgquintas/cpp_readme | David G. Quintas | 2016-08-11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | fix c++ readme and tutorial | ||
| | * \ \ \ \ | Merge pull request #7577 from murgatroid99/node_dependency_update | Nicolas Noble | 2016-08-11 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Update node protobuf dependency to 3.0.0 where applicable. Also update example dependency to grpc 1.0.0 | ||
| | * \ \ \ \ \ | Merge pull request #7674 from stanley-cheung/php7-ubuntu-fix | Stanley Cheung | 2016-08-11 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | PHP7: fix ubuntu compile error | ||
* | | \ \ \ \ \ \ | 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 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | This should have been included in 46585e23f14b0463c4b7a0d04d72d712. | ||
| | * | | | | | 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 ↵ | Jorge Canizales | 2016-08-05 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | p0-advance-protobuf-version | ||
| | * | | | | | Merge pull request #7514 from apolcyn/move_tools_dep_to_project | kpayson64 | 2016-08-05 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | moved Grpc.Tools dependency from solution level to project level | ||
| | | | | | * | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | CMake Project Improvements | ||
| | * | | | | | Merge commit '5e623b8d8d8d106bd4ab9a6d77ef43b1a134d8ec' into ↵ | Jorge Canizales | 2016-07-29 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | p0-advance-protobuf-version | ||
| | * | | | | | Update podspecs to use Protobuf 3.0.0 | Jorge Canizales | 2016-07-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||
| | * | | | | | 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 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ruby/pb/test/client.rb src/ruby/pb/test/server.rb tools/dockerfile/test/php7_jessie_x64/Dockerfile | ||
| | | | | * | | Update node protobuf dependency to 3.0.0 where applicable. Also update ↵ | murgatroid99 | 2016-07-29 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | example dependency to grpc 1.0.0 | ||
| | * | | | | CMake: project for HelloWorld cpp example | Konstantin Podsvirov | 2016-07-28 |
| |/ / / / |/| | | | | |||
* | | | | | Merge pull request #7535 from muxi/fix-no-as-needed | Nicolas Noble | 2016-07-27 |
|\ \ \ \ \ | | | | | | | | | | | | | Removed --no-as-needed options from Makefile of HelloWorld and RouteGuide | ||
* | | | | | | php: fix composer.json | Stanley Cheung | 2016-07-26 |
| | | | | | | |||
| | * | | | | php: fix composer.json | Stanley Cheung | 2016-07-26 |
| | | | | | | |||
| * | | | | | Identify system and remove --no-as-need if it is Mac OS | Muxi Yan | 2016-07-26 |
| | | | | | | |||
| * | | | | | Removed --no-as-needed options from Makefile of HelloWorld and RouteGuide | Muxi Yan | 2016-07-26 |
|/ / / / / | |||
| * | | | | Merge pull request #7473 from jcanizales/p0-fix-auth-sample | makdharma | 2016-07-25 |
|/| | | | | | | | | | | | | | | Fix AuthSample crash on startup | ||
| | | * | | moved Grpc.Tools dependency from solution level to project level | Alex Polcyn | 2016-07-23 |
| |_|/ / |/| | | | |||
* | | | | Merge pull request #7393 from y-zeng/example_makefile | Nicolas Noble | 2016-07-21 |
|\ \ \ \ | | | | | | | | | | | Enable server reflection in c++ examples | ||
| | | * | | Update sample and test versions to -pre1.1 | Jorge Canizales | 2016-07-19 |
| | | | | | | | | | | | | | | | | | | | | To use the 3.0.0-beta-4 version of protoc, which has the fix for oneofs when using dynamic frameworks. | ||
| | | * | | Update protobuf submodule to 3.0.0-beta-4 | Jorge Canizales | 2016-07-19 |
| |_|/ / |/| | | | | | | | Which has the fix for oneofs when using dynamic frameworks in ObjectiveC | ||
| | * | | Downloaded plist with new keys needed by Firebase SDK | Jorge Canizales | 2016-07-19 |
| |/ / |/| | | |||
* | | | Merge pull request #7417 from nathanielmanistaatgoogle/multiplex-v1.0.x | Nicolas Noble | 2016-07-19 |
|\ \ \ | | | | | | | | | Client and server multiplex example | ||
* \ \ \ | Merge pull request #7419 from nathanielmanistaatgoogle/examples-v1.0.x | kpayson64 | 2016-07-18 |
|\ \ \ \ | | | | | | | | | | | Update examples to GA API |