1f07aa56cb
Remove the extra comma
2016-08-24 13:03:02 +08: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
557aa4e695
php: bump version
2016-08-22 08:51:47 -07: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
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
安正超