[Pkg-javascript-commits] [node-jsonstream] 209/214: Merge branch 'upstream'

[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-jsonstream.

commit 37a537ea03a01163b275c7f980f7578f55a8b559
Merge: 05ee96f 71ab561
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 1 13:41:47 2017 +0100

    Merge branch 'upstream'

 .travis.yml                      |   7 ++-
 index.js                         |  76 +++++++++++++++++++++++-----
 package.json                     |   4 +-
 readme.markdown                  |  49 +++++++++++++++---
 test/error_contents.js           |  45 +++++++++++++++++
 test/fixtures/couch_sample.json  |  18 +++++++
 test/fixtures/error.json         |   1 +
 test/fixtures/header_footer.json |  19 +++++++
 test/header_footer.js            |  55 ++++++++++++++++++++
 test/issues.js                   |  14 ++++++
 test/keys.js                     | 105 +++++++++++++++++++++++++++++++++++++++
 test/parsejson.js                |   5 +-
 12 files changed, 372 insertions(+), 26 deletions(-)

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