cdbe6b3963
Merge branch 'v1.0.x' into upmerge-from-v1.0.x
2016-08-24 00:08:49 +02:00
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
d7ff4ff400
Merge pull request #7817 from stanley-cheung/php-update-composer-v1_0
...
PHP: bump version
2016-08-23 08:37:07 -07:00
6888c251a3
change hint paths for protobuf to use net45 dir in csproj files
2016-08-22 22:27:11 -07:00
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
557aa4e695
php: bump version
2016-08-22 08:51:47 -07:00
8749c96595
php: bump version
2016-08-22 08:45:12 -07:00
6c09b3b29e
Truncate Python example READMEs to grpc.io links
2016-08-20 15:26:20 +00:00
e3e17d3f6b
Merge branch 'v1.0.x' of https://github.com/grpc/grpc
2016-08-20 01:45:32 +02:00
4a18c67b77
Move Podspecs to v1
2016-08-18 13:26:25 -07:00
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
e1ee20bde6
Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge
2016-08-16 01:54:33 +02:00
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
5fa0731803
Merge pull request #7700 from apolcyn/update_helloworld_readme
...
update original helloworld README
2016-08-15 10:53:53 -07:00
567f14c121
update dependencies in C# examples to GA versions
2016-08-12 11:15:11 -07:00
c61b1d3cd0
s/makefile/Makefile
2016-08-11 16:15:41 -07:00
5804745aed
Merge pull request #7688 from dgquintas/cpp_readme
...
fix c++ readme and tutorial
2016-08-11 16:02:15 -07:00
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
93b599c8b0
Merge pull request #7688 from dgquintas/cpp_readme
...
fix c++ readme and tutorial
2016-08-11 15:40:56 -07:00
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
a6f6b6f4c9
Merge pull request #7674 from stanley-cheung/php7-ubuntu-fix
...
PHP7: fix ubuntu compile error
2016-08-11 12:02:31 -07:00
7f074e0e20
Merge branch 'v1.0.x' into manual-upmerge
2016-08-11 21:00:08 +02:00
feef8081c1
update original helloworld README
2016-08-10 15:51:35 -07:00
5312815ff2
add netcore portability package dependency
2016-08-09 22:52:35 -07:00
f789facafd
minor text change
2016-08-09 22:01:17 -07:00
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
260a0025d2
fix c++ readme and tutorial
2016-08-09 16:57:32 -07:00
13fa379693
Update README.md
2016-08-09 16:00:59 +07:00
8ac55f8a8c
Solve merge conflict at gRPC-ProtoRPC.podspec
2016-08-08 18:39:56 -07:00
a9b1c5cbe1
Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-archive-fix
2016-08-07 18:46:38 -07:00
d4230bbf02
Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-advance-protobuf-version
2016-08-05 17:17:45 -07:00
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
5b4d3625eb
Update ruby examples to use new _pb protobuf format
2016-08-04 10:31:15 -07:00
c6446bf3d8
add csharp hello world that uses dotnet cli
2016-08-03 20:42:39 -07:00
2507fef737
Merge pull request #7553 from podsvirov/topic-cmake-template
...
CMake Project Improvements
2016-07-29 15:49:54 -07:00
7a2bc14fc0
Merge commit '5e623b8d8d8d106bd4ab9a6d77ef43b1a134d8ec' into p0-advance-protobuf-version
2016-07-29 15:45:02 -07:00
72dce2dfbc
Update podspecs to use Protobuf 3.0.0
...
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.
2016-07-29 15:42:00 -07:00
4343c904e2
Update Protobuf submodule to v3.0.0 (GA)
2016-07-29 15:39:45 -07:00
8302b123de
Merge branch 'v1.0.x' into manual-upmerge
...
Conflicts:
src/ruby/pb/test/client.rb
src/ruby/pb/test/server.rb
tools/dockerfile/test/php7_jessie_x64/Dockerfile
2016-07-29 22:48:16 +02:00
fcb5271105
Update node protobuf dependency to 3.0.0 where applicable. Also update example dependency to grpc 1.0.0
2016-07-29 10:44:01 -07:00
13016cc40b
CMake: project for HelloWorld cpp example
2016-07-28 00:46:11 +03:00
846768c12f
Merge pull request #7535 from muxi/fix-no-as-needed
...
Removed --no-as-needed options from Makefile of HelloWorld and RouteGuide
2016-07-27 11:29:39 -07:00
c5755ad5a9
php: fix composer.json
2016-07-26 17:44:55 -07:00
b95870d85b
php: fix composer.json
2016-07-26 17:44:43 -07:00
cd0d8aed65
Identify system and remove --no-as-need if it is Mac OS
2016-07-26 14:13:46 -07:00
4e3df00f00
Removed --no-as-needed options from Makefile of HelloWorld and RouteGuide
2016-07-26 13:28:54 -07:00
c1ed2193f2
Merge pull request #7473 from jcanizales/p0-fix-auth-sample
...
Fix AuthSample crash on startup
2016-07-25 11:14:08 -07:00
74543125b5
moved Grpc.Tools dependency from solution level to project level
2016-07-23 01:26:46 -07:00
7645fdc4f0
Merge pull request #7393 from y-zeng/example_makefile
...
Enable server reflection in c++ examples
2016-07-21 14:28:55 -07:00
70ded7eecc
Update sample and test versions to -pre1.1
...
To use the 3.0.0-beta-4 version of protoc, which has the fix for oneofs
when using dynamic frameworks.
2016-07-19 17:35:11 -07:00
9e6372380d
Update protobuf submodule to 3.0.0-beta-4
...
Which has the fix for oneofs when using dynamic frameworks in ObjectiveC
2016-07-19 17:35:06 -07:00
6e2832af29
Downloaded plist with new keys needed by Firebase SDK
2016-07-19 16:43:03 -07:00
91991a234f
Merge pull request #7417 from nathanielmanistaatgoogle/multiplex-v1.0.x
...
Client and server multiplex example
2016-07-19 09:23:19 -07:00
e73459554a
Merge pull request #7419 from nathanielmanistaatgoogle/examples-v1.0.x
...
Update examples to GA API
2016-07-18 23:23:38 -07:00
f8c4580939
Commit as 1.0.0-pre1 so we can release already.
2016-07-18 17:51:31 -07:00
e4704d3eda
“Allow non-modular includes in framework modules”
...
It’s the magic sentence that allows pods dependent on RxLibrary to be
archived correctly by XCode.
It’s less than ideal, and seems arbitrary (why RxLibrary specifically?),
so we’ll try to produce a minimal case and open an issue with it in the
Cocoapods repo.
2016-07-18 11:25:51 -07:00
46585e23f1
Update examples to GA API
2016-07-15 22:33:50 +00:00
e1466d6629
Client and server multiplex example
2016-07-15 21:43:02 +00:00
854b81a83b
Advance versions from 0.14 -> 1.0
...
Pending:
- Tag BoringSSL repo.
- Tag gRPC repo.
- Build the plugin, zip it, and add it to the release.
- Push Cocoapods to trunk.
2016-07-15 11:23:48 -07:00
febe79116c
php: fix interop tests breakage
2016-07-13 20:20:43 -07:00
85fa79d228
Merge pull request #7363 from stanley-cheung/php-prepare-for-ga-v1_0branch
...
php: prepare for GA release
2016-07-13 16:02:47 -07:00
9195ea0f2a
Merge pull request #7359 from jcanizales/p0-protoc-podspec
...
Distribute ProtoC and the plugin as pods
2016-07-13 11:35:32 -07:00
67bccfed99
php: prepare for GA release
2016-07-13 08:37:29 -07:00
1c41c29c26
Merge branch 'release-0_15' into upmerge-master
...
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
2016-07-12 04:30:57 +02:00
cfccf2a149
Merge master to resolve tests podspec conflict
2016-07-11 14:29:49 -07:00
8f525f9bc5
Fix: Cocoapods doesn’t like dirs that start with ./
...
I wasted a huge amount of time debugging this madness.
2016-07-11 14:24:48 -07:00
45bb7f36b4
Use the deployed protoc spec in samples and README
2016-07-11 11:09:59 -07:00
6eade6dcd7
Podspecs for Protoc and the gRPC plugin
...
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.
2016-07-11 00:34:14 -07:00
887737945b
Merge pull request #7177 from kpayson64/python_codegen
...
Updated example codegen to use grpcio-tools
2016-07-08 12:45:29 -07:00
2bece9e0e1
Merge pull request #7156 from stanley-cheung/php-add-comment-shutdown-warning
...
PHP: add warning about shutdown function
2016-07-08 10:13:27 -07:00
5a412cf891
Merge pull request #7219 from jcanizales/merge-0.14-into-master
...
Merge 0.14 into master
2016-07-08 09:40:22 -07:00
c28a6c1b3b
Merge pull request #6693 from thinkerou/phpt
...
Changed the README file of PHP example
2016-07-07 19:59:43 -07:00
692a38f7fa
php: update example composer.json
2016-07-07 17:03:16 -07:00
1c58bd221d
Enable server reflection in c++ examples
2016-07-07 14:19:04 -07:00
60fec9e547
Merge master into merge-0.14-into-master
...
The protobuf commit conflicted. Resolved to the latest one.
2016-07-01 16:52:08 -07:00
f29e364168
Bump protobuf version to beta-3.3
...
It’s just the merge of beta-3.1 and beta-3.2, both of which we need.
2016-07-01 15:56:57 -07:00
0f213c399c
Fix examples to work with local gRPC-Core
2016-07-01 11:54:35 -07:00
c09854b8fe
Fix example Podfiles, and document better
2016-07-01 10:24:17 -07:00
753b45dcf8
Merge remote-tracking branch 'upstream/master' into handler_http_response
2016-06-30 19:16:59 -07:00
27e4979ee5
Merge pull request #7161 from dgquintas/use_release
...
Updated git clone URL
2016-06-30 13:30:19 -07:00
5c88bc660c
Updated example codegen to use grpcio-tools
2016-06-30 11:54:50 -07:00
4281272389
Updated git clone URL
2016-06-29 17:39:07 -07:00
e4822e2f35
Merge pull request #7081 from y-zeng/build-example-travis
...
Build ObjC examples in travis
2016-06-29 12:17:15 -07:00
b4028f6675
Merge pull request #7046 from murgatroid99/master_merge_release-0_15
...
Merge release-0_15 into master
2016-06-27 11:49:46 -07:00
6dd25e52a6
Update gRPC in C# minutes readme.
2016-06-27 10:44:03 -07:00
b8431ae707
Add .xcscheme files for ObjC examples
2016-06-27 10:30:51 -07:00
09685d224e
regenerate files
2016-06-24 15:17:41 -07:00
d3b0dda9b8
update grpc nugets to 0.15
2016-06-24 15:17:39 -07:00
80dc760acc
Merge pull request #6934 from makdharma/route_guide_fixes
...
Modified route_guide sample app to show RPC log
2016-06-24 13:57:50 -07:00
5a3c6389ed
Added braces around _service
2016-06-23 14:02:33 -07:00
abd285aed8
Added missing todo and moved _service
...
To Implementation
2016-06-23 13:30:19 -07:00
d605b63383
Merge pull request #7008 from jtattermusch/csharp_no_new_client
...
Remove generated NewClient factory method for C#.
2016-06-23 11:19:18 -07:00
dde4fc66fb
changed service to _service, and added a TODO
...
TODO for removing boilerplate code
2016-06-23 10:35:19 -07:00
1bc42d9504
Merge pull request #6994 from y-zeng/update-example
...
Update examples with Cocoapods 1.0.0
2016-06-23 10:11:54 -07:00
f41ebc3968
remove occurences of NewClient factory method
2016-06-22 17:18:47 -07:00
db3ffe13cb
Update examples with Cocoapods 1.0.0
2016-06-22 01:14:25 -07:00
abc7427a4d
Update podfiles for objc examples
2016-06-20 14:40:57 -07:00
9790e97704
Merge remote-tracking branch 'upstream/master' into handler_http_response
2016-06-17 16:01:57 -07:00
955a364e34
Add bad_server_response_test
2016-06-17 13:55:50 -07:00
814b80e8e9
change README for node dir changed
2016-06-17 23:17:28 +08:00
Nicolas "Pixel" Noble