[Pkg-javascript-commits] [node-leveldown] 250/492: Merge branch 'master' of github.com:rvagg/node-leveldown

[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 d610b4e7d568bbcf6c783d08132df28ee1a76f40
Merge: a8d3447 567e6bf
Author: Rod Vagg <rod at vagg.org>
Date:   Mon Mar 11 16:09:44 2013 +1100

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

 src/database.cc          | 30 +++++++++++++++---------------
 src/iterator.cc          |  4 ++--
 src/leveldown.h          |  9 +++------
 test/put-get-del-test.js | 22 +++++++++++-----------
 4 files changed, 31 insertions(+), 34 deletions(-)

diff --cc src/database.cc
index 673592a,c5df710..855947e
--- a/src/database.cc
+++ b/src/database.cc
@@@ -276,10 -276,9 +276,10 @@@ v8::Handle<v8::Value> Database::Delete 
  
    LD_METHOD_SETUP_COMMON(put, 1, 2)
  
-   LD_CB_ERR_IF_OPTION_NULL_OR_UNDEFINED(0, Key)
+   LD_CB_ERR_IF_NULL_OR_UNDEFINED(args[0], key)
 +
    v8::Local<v8::Value> keyBufferV = args[0];
-   LD_STRING_OR_BUFFER_TO_SLICE(key, keyBufferV, Key)
+   LD_STRING_OR_BUFFER_TO_SLICE(key, keyBufferV)
  
    v8::Persistent<v8::Value> keyBuffer =
        v8::Persistent<v8::Value>::New(keyBufferV);

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