diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-04-19 10:56:01 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-04-19 10:56:01 -0700 |
| commit | e264e3984f6a5d8b730760d59930191a3a7c31e8 (patch) | |
| tree | 7c3de6d924ae0e57cfcdab3bfee167e23ea8a546 /examples/node | |
| parent | 7d69ea63c8af9c7be43434993c82f93033343dce (diff) | |
| parent | 279681311f61b079a720b7aef424cbe9000d08e8 (diff) | |
Merged from master
Diffstat (limited to 'examples/node')
| -rw-r--r-- | examples/node/README.md | 7 | ||||
| -rw-r--r-- | examples/node/greeter_client.js | 2 | ||||
| -rw-r--r-- | examples/node/greeter_server.js | 2 | ||||
| -rw-r--r-- | examples/node/package.json | 5 | ||||
| -rw-r--r-- | examples/node/route_guide/route_guide_client.js | 2 | ||||
| -rw-r--r-- | examples/node/route_guide/route_guide_server.js | 2 |
6 files changed, 14 insertions, 6 deletions
diff --git a/examples/node/README.md b/examples/node/README.md index 7a2bc9794f..28878833ce 100644 --- a/examples/node/README.md +++ b/examples/node/README.md @@ -10,6 +10,11 @@ INSTALL ------- ```sh + $ # Get the gRPC repository + $ export REPO_ROOT=grpc # REPO root can be any directory of your choice + $ git clone https://github.com/grpc/grpc.git $REPO_ROOT + $ cd $REPO_ROOT + $ cd examples/node $ npm install ``` @@ -20,7 +25,7 @@ TRY IT! - Run the server ```sh - $ # from this directory (grpc_common/node). + $ # from this directory $ node ./greeter_server.js & ``` diff --git a/examples/node/greeter_client.js b/examples/node/greeter_client.js index 828ab51f49..7125c2fec5 100644 --- a/examples/node/greeter_client.js +++ b/examples/node/greeter_client.js @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/node/greeter_server.js b/examples/node/greeter_server.js index 08ca600fef..a4aebf6d09 100644 --- a/examples/node/greeter_server.js +++ b/examples/node/greeter_server.js @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/node/package.json b/examples/node/package.json index d1834585f5..49ab74d318 100644 --- a/examples/node/package.json +++ b/examples/node/package.json @@ -2,7 +2,10 @@ "name": "grpc-examples", "version": "0.1.0", "dependencies": { + "async": "^1.5.2", "grpc": "0.13.0", - "google-protobuf": "*" + "google-protobuf": "*", + "lodash": "^4.6.1", + "minimist": "^1.2.0" } } diff --git a/examples/node/route_guide/route_guide_client.js b/examples/node/route_guide/route_guide_client.js index 6ff0279184..fd05a59b63 100644 --- a/examples/node/route_guide/route_guide_client.js +++ b/examples/node/route_guide/route_guide_client.js @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/examples/node/route_guide/route_guide_server.js b/examples/node/route_guide/route_guide_server.js index 9fa9827991..6c01fac246 100644 --- a/examples/node/route_guide/route_guide_server.js +++ b/examples/node/route_guide/route_guide_server.js @@ -1,6 +1,6 @@ /* * - * Copyright 2015-2016, Google Inc. + * Copyright 2015, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |