[Pkg-javascript-commits] [node-sqlite3] 12/20: Merge tag 'upstream/2.1.15+ds1'

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

commit 1c52ef30de0a45a1ac8d110b890966c401a1e618
Merge: c9347a5 90eef8c
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Sep 4 13:39:14 2013 +0200

    Merge tag 'upstream/2.1.15+ds1'
    
    Upstream version 2.1.15+ds1
    
    # gpg: Signature faite le mer. 04 sept. 2013 13:39:11 CEST avec la clef RSA d'identifiant DD39F374
    # gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
    # gpg:                 alias « Jérémy Lal <jerry at edagames.com> »

 .gitignore                          |   26 +-
 .travis.yml                         |    6 +
 CHANGELOG.md                        |    9 +
 Makefile                            |   28 +-
 README.md                           |  115 +++++--
 binding.gyp                         |   59 ++++
 configure                           |    2 +-
 lib/sqlite3.js                      |    2 +-
 package.json                        |   22 +-
 src/async.h                         |   30 +-
 src/database.cc                     |   46 ++-
 src/database.h                      |    6 +-
 src/macros.h                        |    2 +-
 src/{sqlite3.cc => node_sqlite3.cc} |    3 +-
 src/statement.cc                    |   32 +-
 src/statement.h                     |   23 +-
 src/threading.h                     |   48 +++
 test/affected.test.js               |   28 +-
 test/blob.test.js                   |   36 +-
 test/cache.test.js                  |   71 ++--
 test/constants.test.js              |   72 ++--
 test/database_fail.test.js          |  361 +++++++++-----------
 test/each.test.js                   |   62 ++--
 test/exec.test.js                   |   30 +-
 test/extension.test.js              |   31 +-
 test/fts-content.test.js            |   13 +
 test/map.test.js                    |  127 ++++---
 test/named_columns.test.js          |   34 +-
 test/named_params.test.js           |   59 ++--
 test/null_error.test.js             |   34 +-
 test/open_close.test.js             |  194 +++++------
 test/other_objects.test.js          |  137 ++++----
 test/parallel_insert.test.js        |   46 +--
 test/prepare.test.js                |  622 +++++++++++++++++------------------
 test/profile.test.js                |   74 +++--
 test/rerun.test.js                  |   65 ++--
 test/scheduling.test.js             |   80 ++---
 test/serialization.test.js          |  127 +++----
 test/support/createdb.js            |   38 ++-
 test/support/helper.js              |   11 +-
 test/trace.test.js                  |  105 +++---
 test/unicode.test.js                |   64 ++--
 wscript                             |  146 --------
 43 files changed, 1579 insertions(+), 1547 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-sqlite3.git