[Pkg-javascript-commits] [node-leveldown] 292/492: Merge branch '0.2-wip' of https://github.com/rvagg/node-leveldown into 0.2-wip

[Andrew Kelley]

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

andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.

commit 119ad97ce71ae66b1493fb65db57924c7960f629
Merge: e38459f c9d3d0e
Author: Rod Vagg <rod at vagg.org>
Date:   Sat Mar 30 17:02:19 2013 +1100

    Merge branch '0.2-wip' of https://github.com/rvagg/node-leveldown into 0.2-wip

 README.md                                          | 56 ++++++++++++++-
 binding.gyp                                        |  1 +
 deps/leveldb/leveldb.gyp                           |  9 ++-
 .../libuv_port => port-libuv}/env_win.cc           |  0
 .../libuv_port => port-libuv}/port_uv.cc           |  0
 .../libuv_port => port-libuv}/port_uv.h            |  0
 .../libuv_port => port-libuv}/port_uv.h.bak        |  0
 .../libuv_port => port-libuv}/stdint-msvc2008.h    |  0
 .../libuv_port => port-libuv}/uv_condvar.h         |  0
 .../libuv_port => port-libuv}/uv_condvar_posix.cc  |  0
 .../libuv_port => port-libuv}/win_logger.cc        |  0
 .../libuv_port => port-libuv}/win_logger.h         |  0
 index.js                                           |  5 +-
 package.json                                       |  4 +-
 src/async.h                                        |  3 +-
 src/database.cc                                    | 10 ++-
 src/database.h                                     |  4 ++
 src/database_async.cc                              | 20 ++++--
 src/database_async.h                               |  4 ++
 src/leveldown.cc                                   | 81 +++++++++++++++++++++-
 src/leveldown_async.cc                             | 49 +++++++++++++
 src/leveldown_async.h                              | 45 ++++++++++++
 test/cleanup-hanging-iterators-test.js             | 31 +--------
 test/common.js                                     | 44 ++++++++++--
 test/destroy-test.js                               | 77 ++++++++++++++++++++
 test/repair-test.js                                | 49 +++++++++++++
 26 files changed, 436 insertions(+), 56 deletions(-)

diff --cc binding.gyp
index e0f1926,f9e2057..6c20da5
--- a/binding.gyp
+++ b/binding.gyp
@@@ -28,6 -28,7 +28,7 @@@
            , "src/iterator.cc"
            , "src/iterator_async.cc"
            , "src/leveldown.cc"
+           , "src/leveldown_async.cc"
          ]
      }]
 -}
 +}

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