diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-22 21:27:26 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-02-22 21:30:14 +0100 |
| commit | 1280fdb5741f459fbec6a8c73a92d1c4ada34849 (patch) | |
| tree | 2a37423f3c656fdfe76e97e9664c8567d75a3333 /examples | |
| parent | f37adb9451330aa82b689e0b3283f20de491a306 (diff) | |
| parent | 9f791595903b926e32b3d2ec5d959cfe1a3e1e78 (diff) | |
Merge branch 'master' into backport-merge
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/cpp/helloworld/Makefile | 2 | ||||
| -rw-r--r-- | examples/cpp/route_guide/Makefile | 2 | ||||
| -rw-r--r-- | examples/protos/helloworld.proto | 6 | ||||
| -rw-r--r-- | examples/protos/route_guide.proto | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/examples/cpp/helloworld/Makefile b/examples/cpp/helloworld/Makefile index ca2667f69d..b785612935 100644 --- a/examples/cpp/helloworld/Makefile +++ b/examples/cpp/helloworld/Makefile @@ -94,7 +94,7 @@ ifneq ($(HAS_VALID_PROTOC),true) @echo "Please install Google protocol buffers 3.0.0 and its compiler." @echo "You can find it here:" @echo - @echo " https://github.com/google/protobuf/releases/tag/v3.0.0-alpha-1" + @echo " https://github.com/google/protobuf/releases/tag/v3.0.0-beta-2" @echo @echo "Here is what I get when trying to evaluate your version of protoc:" @echo diff --git a/examples/cpp/route_guide/Makefile b/examples/cpp/route_guide/Makefile index 6ccaa01c23..3f8a5982b4 100644 --- a/examples/cpp/route_guide/Makefile +++ b/examples/cpp/route_guide/Makefile @@ -86,7 +86,7 @@ ifneq ($(HAS_VALID_PROTOC),true) @echo "Please install Google protocol buffers 3.0.0 and its compiler." @echo "You can find it here:" @echo - @echo " https://github.com/google/protobuf/releases/tag/v3.0.0-alpha-1" + @echo " https://github.com/google/protobuf/releases/tag/v3.0.0-beta-2" @echo @echo "Here is what I get when trying to evaluate your version of protoc:" @echo diff --git a/examples/protos/helloworld.proto b/examples/protos/helloworld.proto index 7d58870a70..e670503b09 100644 --- a/examples/protos/helloworld.proto +++ b/examples/protos/helloworld.proto @@ -1,4 +1,4 @@ -// Copyright 2015, Google Inc. +// Copyright 2015-2016, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -29,7 +29,9 @@ syntax = "proto3"; -option java_package = "io.grpc.examples"; +option java_multiple_files = true; +option java_package = "io.grpc.examples.helloworld"; +option java_outer_classname = "HelloWorldProto"; option objc_class_prefix = "HLW"; package helloworld; diff --git a/examples/protos/route_guide.proto b/examples/protos/route_guide.proto index 7a70040e1c..b3553ee536 100644 --- a/examples/protos/route_guide.proto +++ b/examples/protos/route_guide.proto @@ -1,4 +1,4 @@ -// Copyright 2015, Google Inc. +// Copyright 2015-2016, Google Inc. // All rights reserved. // // Redistribution and use in source and binary forms, with or without @@ -29,7 +29,9 @@ syntax = "proto3"; -option java_package = "ex.grpc"; +option java_multiple_files = true; +option java_package = "io.grpc.examples.routeguide"; +option java_outer_classname = "RouteGuideProto"; option objc_class_prefix = "RTG"; package routeguide; |