Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #7553 from podsvirov/topic-cmake-template | 2016-07-29 | |
|\ | | | | | CMake Project Improvements | ||
* \ | Merge branch 'v1.0.x' into manual-upmerge | 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 | 2016-07-28 | |
| |/ |/| | |||
* | | Merge pull request #7535 from muxi/fix-no-as-needed | 2016-07-27 | |
|\ \ | | | | | | | Removed --no-as-needed options from Makefile of HelloWorld and RouteGuide | ||
* | | | php: fix composer.json | 2016-07-26 | |
| | | | |||
| | * | php: fix composer.json | 2016-07-26 | |
| | | | |||
| * | | Identify system and remove --no-as-need if it is Mac OS | 2016-07-26 | |
| | | | |||
| * | | Removed --no-as-needed options from Makefile of HelloWorld and RouteGuide | 2016-07-26 | |
|/ / | |||
| * | Merge pull request #7473 from jcanizales/p0-fix-auth-sample | 2016-07-25 | |
|/| | | | | | Fix AuthSample crash on startup | ||
* | | Merge pull request #7393 from y-zeng/example_makefile | 2016-07-21 | |
|\ \ | | | | | | | Enable server reflection in c++ examples | ||
| | * | Downloaded plist with new keys needed by Firebase SDK | 2016-07-19 | |
| |/ |/| | |||
* | | Merge pull request #7417 from nathanielmanistaatgoogle/multiplex-v1.0.x | 2016-07-19 | |
|\ \ | | | | | | | Client and server multiplex example | ||
* \ \ | Merge pull request #7419 from nathanielmanistaatgoogle/examples-v1.0.x | 2016-07-18 | |
|\ \ \ | | | | | | | | | Update examples to GA API | ||
* | | | | Commit as 1.0.0-pre1 so we can release already. | 2016-07-18 | |
| | | | | |||
| * | | | Update examples to GA API | 2016-07-15 | |
| | | | | |||
| | * | | Client and server multiplex example | 2016-07-15 | |
| |/ / | |||
* / / | Advance versions from 0.14 -> 1.0 | 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 | 2016-07-13 | |
| | | |||
* | | Merge pull request #7363 from stanley-cheung/php-prepare-for-ga-v1_0branch | 2016-07-13 | |
|\ \ | | | | | | | php: prepare for GA release | ||
* \ \ | Merge pull request #7359 from jcanizales/p0-protoc-podspec | 2016-07-13 | |
|\ \ \ | | | | | | | | | Distribute ProtoC and the plugin as pods | ||
| | * | | php: prepare for GA release | 2016-07-13 | |
| |/ / |/| | | |||
* | | | Merge branch 'release-0_15' into upmerge-master | 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 | 2016-07-11 | |
| | |\ \ | |_|/ / |/| | | | |||
| | * | | Fix: Cocoapods doesn’t like dirs that start with ./ | 2016-07-11 | |
| | | | | | | | | | | | | I wasted a huge amount of time debugging this madness. | ||
| | * | | Use the deployed protoc spec in samples and README | 2016-07-11 | |
| | | | | |||
| | * | | Podspecs for Protoc and the gRPC plugin | 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 | 2016-07-08 | |
|\ \ \ \ | | | | | | | | | | | Updated example codegen to use grpcio-tools | ||
* \ \ \ \ | Merge pull request #7156 from stanley-cheung/php-add-comment-shutdown-warning | 2016-07-08 | |
|\ \ \ \ \ | | | | | | | | | | | | | PHP: add warning about shutdown function | ||
* \ \ \ \ \ | Merge pull request #7219 from jcanizales/merge-0.14-into-master | 2016-07-08 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | Merge 0.14 into master | ||
* | | | | | | Merge pull request #6693 from thinkerou/phpt | 2016-07-07 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Changed the README file of PHP example | ||
| | | * | | | | php: update example composer.json | 2016-07-07 | |
| |_|/ / / / |/| | | | | | |||
| | | | | * | Enable server reflection in c++ examples | 2016-07-07 | |
| |_|_|_|/ |/| | | | | |||
| | * | | | Merge master into merge-0.14-into-master | 2016-07-01 | |
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | The protobuf commit conflicted. Resolved to the latest one. | ||
| | * | | | Bump protobuf version to beta-3.3 | 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 | 2016-07-01 | |
| | | | | | |||
| | * | | | Fix example Podfiles, and document better | 2016-07-01 | |
| | | | | | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into handler_http_response | 2016-06-30 | |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #7161 from dgquintas/use_release | 2016-06-30 | |
| |\ \ \ \ | | | | | | | | | | | | | Updated git clone URL | ||
| | | | * | | Updated example codegen to use grpcio-tools | 2016-06-30 | |
| | |_|/ / | |/| | | | |||
| | * | | | Updated git clone URL | 2016-06-29 | |
| | | | | | |||
| * | | | | Merge pull request #7081 from y-zeng/build-example-travis | 2016-06-29 | |
| |\ \ \ \ | | |/ / / | |/| | | | Build ObjC examples in travis | ||
| * | | | | Merge pull request #7046 from murgatroid99/master_merge_release-0_15 | 2016-06-27 | |
| |\ \ \ \ | | | | | | | | | | | | | Merge release-0_15 into master | ||
| | | | | * | Update gRPC in C# minutes readme. | 2016-06-27 | |
| | | |_|/ | | |/| | | |||
| | | * | | Add .xcscheme files for ObjC examples | 2016-06-27 | |
| | |/ / | |/| | | |||
| | * | | regenerate files | 2016-06-24 | |
| | | | | |||
| | * | | update grpc nugets to 0.15 | 2016-06-24 | |
| | | | | |||
| * | | | Merge pull request #6934 from makdharma/route_guide_fixes | 2016-06-24 | |
| |\ \ \ | | |/ / | |/| | | Modified route_guide sample app to show RPC log | ||
| | * | | Added braces around _service | 2016-06-23 | |
| | | | | |||
| | * | | Added missing todo and moved _service | 2016-06-23 | |
| | | | | | | | | | | | | | | | | To Implementation | ||
| * | | | Merge pull request #7008 from jtattermusch/csharp_no_new_client | 2016-06-23 | |
| |\ \ \ | | | | | | | | | | | Remove generated NewClient factory method for C#. |