[Pkg-javascript-commits] [node-leveldown] 254/492: Merge remote-tracking branch 'origin/chained-batch' 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 af46ce20fa9e019c5e0f7c14a09a44fd23e27d21
Merge: 6fc9b05 f0f8f79
Author: Rod Vagg <rod at vagg.org>
Date:   Wed Mar 13 16:09:52 2013 +1100

    Merge remote-tracking branch 'origin/chained-batch' into 0.2-wip
    
    Conflicts:
    	binding.gyp
    	src/database.cc

 binding.gyp         |   1 +
 index.js            |   5 ++-
 src/cbatch.cc       | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/cbatch.h        |  27 ++++++++++++++
 src/database.cc     |  59 +++++++++++++++++++++++++++++
 src/database.h      |  12 ++++++
 src/leveldown.cc    |   2 +
 test/cbatch-test.js |  27 ++++++++++++++
 8 files changed, 236 insertions(+), 1 deletion(-)

diff --cc binding.gyp
index bedc1bb,e74409c..c8628a1
--- a/binding.gyp
+++ b/binding.gyp
@@@ -6,6 -6,8 +6,7 @@@
          ]
        , "sources": [
              "src/async.cc"
 -          , "src/batch.cc"
+           , "src/cbatch.cc"
            , "src/database.cc"
            , "src/database_async.cc"
            , "src/iterator.cc"
diff --cc src/database.cc
index d5060b4,cc56202..929975b
--- a/src/database.cc
+++ b/src/database.cc
@@@ -14,6 -13,8 +14,7 @@@
  #include "database.h"
  #include "async.h"
  #include "database_async.h"
 -#include "batch.h"
+ #include "cbatch.h"
  #include "iterator.h"
  
  namespace leveldown {

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