Skip to content

Commit b9507ef

Browse files
committed
Merge branch 'master' into speech
2 parents 34f69ff + 25eab56 commit b9507ef

23 files changed

Lines changed: 316 additions & 62 deletions

File tree

.appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ install:
3232
if (!$env:APPVEYOR_PULL_REQUEST_NUMBER) {
3333
nuget install secure-file -ExcludeVersion
3434
secure-file\tools\secure-file -decrypt key.appveyor.json.enc -secret $env:GCLOUD_TESTS_KEY_SECRET
35+
set GCLOUD_TESTS_KEY=%cd%\%GCLOUD_TESTS_KEY%
3536
}
3637
- npm install -g npm
3738
- set PATH=%APPDATA%\npm;%PATH%

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Thanks for stopping by to let us know something could be better!
33
Please run down the following list and make sure you've tried the usual "quick fixes":
44

55
- Search the issues already opened: https://github.com/GoogleCloudPlatform/google-cloud-node/issues
6-
- Search StackOverflow: https://stackoverflow.com/questions/tagged/gcloud-node
6+
- Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js
77
- Check our Troubleshooting guide: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/troubleshooting
88
- Check our FAQ: https://googlecloudplatform.github.io/google-cloud-node/#/docs/guides/faq
99

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ before_script:
3434
fi
3535
- if [ $IS_PUSH_TO_MASTER ]; then
3636
openssl aes-256-cbc -K $encrypted_b8aa0887832a_key -iv $encrypted_b8aa0887832a_iv -in key.json.enc -out key.json -d;
37+
export GCLOUD_TESTS_KEY="$(pwd)/key.json";
3738
fi
3839
script: "node ./scripts/build.js"
3940
after_success:

docs/home.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h4 class="latest-release subtle" ng-if="home.latestRelease">
3939
</a>
4040
</li>
4141
<li>
42-
<a href="http://stackoverflow.com/questions/tagged/google-cloud" title="google-cloud on StackOverflow" class="ext-link">
42+
<a href="http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js" title="google-cloud on StackOverflow" class="ext-link">
4343
<img src="src/images/icon-link-stackoverflow.svg" alt="StackOverflow icon" />
4444
StackOverflow
4545
</a>

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
"private": "true",
44
"devDependencies": {
55
"array-uniq": "^1.0.3",
6-
"async": "^1.4.2",
6+
"async": "^2.0.1",
77
"coveralls": "^2.11.2",
88
"create-error-class": "^3.0.2",
9+
"david": "^9.0.0",
910
"dox": "0.8.1",
1011
"extend": "^3.0.0",
1112
"glob": "^5.0.9",
1213
"globby": "^3.0.1",
14+
"is": "^3.1.0",
1315
"istanbul": "^0.3.5",
1416
"jscs": "^2.1.1",
1517
"jshint": "^2.9.1",
@@ -18,6 +20,7 @@
1820
"mitm": "^1.1.0",
1921
"mkdirp": "^0.5.1",
2022
"mocha": "^2.5.3",
23+
"package-json": "^2.4.0",
2124
"propprop": "^0.3.1",
2225
"proxyquire": "^1.7.10",
2326
"request": "^2.70.0",
@@ -28,6 +31,7 @@
2831
},
2932
"scripts": {
3033
"postinstall": "node ./scripts/install.js",
34+
"update-deps": "node ./scripts/update-deps.js",
3135
"docs": "node ./scripts/docs/packages.js",
3236
"bundle": "node ./scripts/docs/bundle.js",
3337
"lint": "jshint scripts/ packages/ system-test/ test/ && jscs packages/ system-test/ test/",

packages/bigtable/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"create-error-class": "^3.0.2",
5757
"dot-prop": "^3.0.0",
5858
"extend": "^3.0.0",
59-
"google-proto-files": "^0.7.0",
59+
"google-proto-files": "^0.8.0",
6060
"is": "^3.0.1",
6161
"lodash.flatten": "^4.2.0",
6262
"node-int64": "^0.4.0",

packages/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"ent": "^2.2.0",
4848
"extend": "^3.0.0",
4949
"google-auto-auth": "^0.2.4",
50-
"google-proto-files": "^0.7.0",
50+
"google-proto-files": "^0.8.0",
5151
"grpc": "^1.0.0",
5252
"is": "^3.0.1",
5353
"methmeth": "^1.0.0",

packages/common/src/util.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var googleAuth = require('google-auto-auth');
2929
var is = require('is');
3030
var request = require('request').defaults({
3131
timeout: 60000,
32+
gzip: true,
3233
pool: {
3334
maxSockets: Infinity
3435
}

packages/common/test/util.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ describe('common/util', function() {
9595
it('should have set correct defaults on Request', function() {
9696
assert.deepEqual(REQUEST_DEFAULT_CONF, {
9797
timeout: 60000,
98+
gzip: true,
9899
pool: {
99100
maxSockets: Infinity
100101
}

packages/compute/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"dependencies": {
5353
"@google-cloud/common": "^0.5.0",
5454
"arrify": "^1.0.0",
55-
"async": "^1.4.2",
56-
"create-error-class": "^2.0.1",
55+
"async": "^2.0.1",
56+
"create-error-class": "^3.0.2",
5757
"extend": "^3.0.0",
5858
"gce-images": "^0.3.0",
5959
"is": "^3.0.1",

0 commit comments

Comments
 (0)