[Pkg-javascript-commits] [node-stream-http] 41/208: Merge remote-tracking branch 'bendrucker/codes-module'

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-stream-http.

commit 5b63e524cae0b14eba0b4edda322e9c8bc9cea90
Merge: 44921fb 44a7d34
Author: John Hiesey <john at hiesey.com>
Date:   Sun Jul 12 14:50:43 2015 -0700

    Merge remote-tracking branch 'bendrucker/codes-module'

 index.js     | 60 ++----------------------------------------------------------
 package.json |  1 +
 2 files changed, 3 insertions(+), 58 deletions(-)

diff --cc index.js
index c5e5c55,8ca2a3e..4e88c71
--- a/index.js
+++ b/index.js
@@@ -1,7 -1,6 +1,8 @@@
  var ClientRequest = require('./lib/request')
 -var url = require('url')
 +var extend = require('xtend')
+ var statusCodes = require('builtin-status-codes')
 +var url = require('url')
 +var util = require('util')
  
  var http = exports
  
diff --cc package.json
index b228c6f,62181cb..bbc4baa
--- a/package.json
+++ b/package.json
@@@ -16,12 -14,11 +16,13 @@@
    "author": "John Hiesey",
    "license": "MIT",
    "dependencies": {
+     "builtin-status-codes": "~1.0.0",
      "foreach": "^2.0.5",
 -    "object-keys": "^1.0.4"
 +    "object-keys": "1.0.4",
 +    "xtend": "^4.0.0"
    },
    "devDependencies": {
 +    "basic-auth": "^1.0.3",
      "brfs": "^1.4.0",
      "express": "^4.13.0",
      "tape": "^4.0.0",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-stream-http.git