Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-11 |
|\ | |||
| * | Upgrade one forgotten example code site to GA API | Nathaniel Manista | 2016-08-10 |
| | | | | | | | | This should have been included in 46585e23f14b0463c4b7a0d04d72d712. | ||
* | | Update README.md | Stanislav | 2016-08-09 |
| | | |||
| * | 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 | ||
* | | \ | 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 | ||
| | * | | | 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 | ||
* | | | | Commit as 1.0.0-pre1 so we can release already. | Jorge Canizales | 2016-07-18 |
| | | | | |||
| * | | | Update examples to GA API | Nathaniel Manista | 2016-07-15 |
| | | | | |||
| | * | | Client and server multiplex example | Nathaniel Manista | 2016-07-15 |
| |/ / | |||
* / / | Advance versions from 0.14 -> 1.0 | Jorge Canizales | 2016-07-15 |
|/ / | | | | | | | | | | | | | | | Pending: - Tag BoringSSL repo. - Tag gRPC repo. - Build the plugin, zip it, and add it to the release. - Push Cocoapods to trunk. | ||
* | | php: fix interop tests breakage | Stanley Cheung | 2016-07-13 |
| | | |||
* | | Merge pull request #7363 from stanley-cheung/php-prepare-for-ga-v1_0branch | kpayson64 | 2016-07-13 |
|\ \ | | | | | | | php: prepare for GA release | ||
* \ \ | Merge pull request #7359 from jcanizales/p0-protoc-podspec | makdharma | 2016-07-13 |
|\ \ \ | | | | | | | | | Distribute ProtoC and the plugin as pods | ||
| | * | | php: prepare for GA release | Stanley Cheung | 2016-07-13 |
| |/ / |/| | | |||
* | | | Merge branch 'release-0_15' into upmerge-master | Nicolas "Pixel" Noble | 2016-07-12 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||
| | * \ | Merge master to resolve tests podspec conflict | Jorge Canizales | 2016-07-11 |
| | |\ \ | |_|/ / |/| | | | |||
| | * | | Fix: Cocoapods doesn’t like dirs that start with ./ | Jorge Canizales | 2016-07-11 |
| | | | | | | | | | | | | I wasted a huge amount of time debugging this madness. | ||
| | * | | Use the deployed protoc spec in samples and README | Jorge Canizales | 2016-07-11 |
| | | | | |||
| | * | | Podspecs for Protoc and the gRPC plugin | Jorge Canizales | 2016-07-11 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||
* | | | | Merge pull request #7177 from kpayson64/python_codegen | kpayson64 | 2016-07-08 |
|\ \ \ \ | | | | | | | | | | | Updated example codegen to use grpcio-tools | ||
* \ \ \ \ | Merge pull request #7156 from stanley-cheung/php-add-comment-shutdown-warning | kpayson64 | 2016-07-08 |
|\ \ \ \ \ | | | | | | | | | | | | | PHP: add warning about shutdown function | ||
* \ \ \ \ \ | Merge pull request #7219 from jcanizales/merge-0.14-into-master | makdharma | 2016-07-08 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | Merge 0.14 into master | ||
* | | | | | | Merge pull request #6693 from thinkerou/phpt | Stanley Cheung | 2016-07-07 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Changed the README file of PHP example | ||
| | | * | | | | php: update example composer.json | Stanley Cheung | 2016-07-07 |
| |_|/ / / / |/| | | | | | |||
| | | | | * | Enable server reflection in c++ examples | Yuchen Zeng | 2016-07-07 |
| |_|_|_|/ |/| | | | | |||
| | * | | | Merge master into merge-0.14-into-master | Jorge Canizales | 2016-07-01 |
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | The protobuf commit conflicted. Resolved to the latest one. | ||
| | * | | | Bump protobuf version to beta-3.3 | Jorge Canizales | 2016-07-01 |
| | | | | | | | | | | | | | | | It’s just the merge of beta-3.1 and beta-3.2, both of which we need. | ||
| | * | | | Fix examples to work with local gRPC-Core | Jorge Canizales | 2016-07-01 |
| | | | | | |||
| | * | | | Fix example Podfiles, and document better | Jorge Canizales | 2016-07-01 |
| | | | | | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into handler_http_response | Yuchen Zeng | 2016-06-30 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #7161 from dgquintas/use_release | Jan Tattermusch | 2016-06-30 |
| |\ \ \ \ | | | | | | | | | | | | | Updated git clone URL | ||
| | | | * | | Updated example codegen to use grpcio-tools | Ken Payson | 2016-06-30 |
| | |_|/ / | |/| | | |