[Pkg-javascript-commits] [node-leveldown] 227/492: Merge branch '0.1-wip' of github.com:rvagg/node-leveldown into 0.1-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 1b0b80ff71b75b807255f252fbd9bfe854d4d350
Merge: 0a7b4d5 70840b5
Author: Rod Vagg <rod at vagg.org>
Date:   Sat Feb 23 14:19:26 2013 +1100

    Merge branch '0.1-wip' of github.com:rvagg/node-leveldown into 0.1-wip
    
    Conflicts:
    	src/database.cc

 src/database.cc | 9 +++++++--
 src/database.h  | 5 -----
 src/leveldown.h | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --cc src/database.cc
index f5fba2e,ca086eb..72c994c
--- a/src/database.cc
+++ b/src/database.cc
@@@ -292,6 -287,6 +292,13 @@@ v8::Handle<v8::Value> Database::Delete 
    return v8::Undefined();
  }
  
++/* property key & value strings for elements of the array sent to batch() */
++LU_STR ( key   );
++LU_STR ( value );
++LU_STR ( type  );
++LU_STR ( del   );
++LU_STR ( put   );
++
  v8::Handle<v8::Value> Database::Batch (const v8::Arguments& args) {
    v8::HandleScope scope;
  

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