Skip to content

Commit

Permalink
Merge pull request #176 from scality/forward/rel/6.2.0-beta5
Browse files Browse the repository at this point in the history
Forward/rel/6.2.0 beta5
  • Loading branch information
LaurenSpiegel authored Aug 30, 2016
2 parents 95905df + 17adcf7 commit 8b9407b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/routes/routeGET.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function _pushMetrics(err, utapi, action, resource, contentLength) {
} else if (action === 'objectGetACL') {
utapi.pushMetricGetObjectAcl(resource, timestamp);
} else if (action === 'listParts') {
utapi.pushMetricListBucketMultipartUploads(resource, timestamp);
utapi.pushMetricListMultipartUploadParts(resource, timestamp);
} else if (action === 'objectGet') {
utapi.pushMetricGetObject(resource, timestamp, contentLength);
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"babel-plugin-transform-es2015-modules-commonjs": "^6.2.0",
"babel-plugin-transform-es2015-parameters": "^6.2.0",
"bucketclient": "scality/bucketclient",
"commander": "^2.9.0",
"ioctl": "^2.0.0",
"level": "^1.4.0",
"level-sublevel": "^6.5.4",
Expand All @@ -46,7 +47,6 @@
"devDependencies": {
"babel-cli": "^6.2.0",
"babel-eslint": "^6.0.0",
"commander": "^2.9.0",
"eslint": "^2.4.0",
"eslint-config-airbnb": "^6.0.0",
"eslint-config-scality": "scality/Guidelines",
Expand Down

0 comments on commit 8b9407b

Please sign in to comment.