Merge remote-tracking branch 'origin/develop'

qiniu · Apr 3, 2014 · 633c218 · 633c218
2 parents e42e9ca + c3c0f66
commit 633c218
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,14 +1,14 @@
 {
   "name": "qiniu",
-  "version": "6.1.0",
+  "version": "6.1.3",
   "description": "Node wrapper for Qiniu Resource (Cloud) Storage API",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "scripts": {
     "test": "make test",
-    "blanket": { 
+    "blanket": {
       "pattern": "qiniu/qiniu",
       "data-cover-flags": {
         "debug": false

diff --git a/qiniu/conf.js b/qiniu/conf.js
@@ -2,9 +2,9 @@
 exports.ACCESS_KEY = '<PLEASE APPLY YOUR ACCESS KEY>';
 exports.SECRET_KEY = '<DONT SEND YOUR SECRET KEY TO ANYONE>';
 
-exports.USER_AGENT = 'qiniu nodejs-sdk v6.0.0';
+exports.USER_AGENT = 'qiniu nodejs-sdk v6.1.3';
 
 exports.UP_HOST = 'http://up.qbox.me';
 exports.RS_HOST = 'http://rs.qbox.me';
 exports.RSF_HOST = 'http://rsf.qbox.me';
-exports.RPC_TIMEOUT = 3600000; // default rpc timeout: one hour
+exports.RPC_TIMEOUT = 3600000; // default rpc timeout: one hour