merge.txt

Auto-merging c_src/eleveldb.cc
Auto-merging c_src/build_deps.sh
Merge made by the 'recursive' strategy.
 c_src/atoms.h                  |  40 ++++++++-
 c_src/build_deps.sh            |   2 +-
 c_src/eleveldb.cc              |  84 ++++++++++++++----
 c_src/refobjects.cc            |   1 -
 c_src/router.cc                | 189 +++++++++++++++++++++++++++++++++++++++++
 c_src/router.h                 |  45 ++++++++++
 priv/eleveldb.schema           |   9 --
 src/eleveldb.app.src           |   3 +-
 src/eleveldb.erl               |   8 +-
 src/eleveldb_app.erl           |  37 ++++++++
 src/eleveldb_metadata.erl      | 105 +++++++++++++++++++++++
 src/eleveldb_sup.erl           |  37 ++++++++
 test/eleveldb_schema_tests.erl |   6 +-
 13 files changed, 529 insertions(+), 37 deletions(-)
 create mode 100644 c_src/router.cc
 create mode 100644 c_src/router.h
 create mode 100644 src/eleveldb_app.erl
 create mode 100644 src/eleveldb_metadata.erl
 create mode 100644 src/eleveldb_sup.erl