[Pkg-javascript-commits] [node-nan] 02/04: Merge tag 'upstream/2.4.0'

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository node-nan.

commit 86a896440127e423025dccafb1b0d2ebdf777863
Merge: 49ef935 b2239b7
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sat Sep 10 10:52:52 2016 +0200

    Merge tag 'upstream/2.4.0'
    
    Upstream version 2.4.0
    
    # gpg: Signature faite le sam. 10 sept. 2016 10:52:49 CEST
    # gpg:                avec la clef RSA 6611C05EDD39F374
    # gpg:                issuer "kapouer at melix.org"
    # gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> » [ultime]
    # gpg:                 alias « Jérémy Lal <jerry at edagames.com> » [ultime]
    # gpg:                 alias « Jérémy Lal <jerry at eda.sarl> » [ultime]

 CHANGELOG.md                              |   8 ++-
 Makefile                                  |   1 +
 README.md                                 |   4 +-
 doc/asyncworker.md                        |  15 +++--
 doc/callback.md                           |   4 ++
 nan.h                                     | 104 +++++++++++++++---------------
 nan_persistent_pre_12_inl.h               |   8 +--
 package.json                              |   3 +-
 test/binding.gyp                          |   4 ++
 test/cpp/asyncprogressworkerstream.cpp    |  86 ++++++++++++++++++++++++
 test/cpp/nancallback.cpp                  |  20 ++++++
 test/js/asyncprogressworkerstream-test.js |  54 ++++++++++++++++
 test/js/nancallback-test.js               |   6 +-
 13 files changed, 250 insertions(+), 67 deletions(-)

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