Skip to content

Instantly share code, notes, and snippets.

@thumbot
Created February 10, 2017 15:54
Show Gist options
  • Save thumbot/3e88619a1f474f47608bb82276d4d8c5 to your computer and use it in GitHub Desktop.
Save thumbot/3e88619a1f474f47608bb82276d4d8c5 to your computer and use it in GitHub Desktop.
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 | 68 ++++++++++---
c_src/refobjects.cc | 1 -
c_src/router.cc | 216 +++++++++++++++++++++++++++++++++++++++++
c_src/router.h | 46 +++++++++
priv/eleveldb.schema | 9 --
src/eleveldb.erl | 11 ++-
src/eleveldb_metadata.erl | 32 ++++++
test/eleveldb_schema_tests.erl | 6 +-
10 files changed, 398 insertions(+), 33 deletions(-)
create mode 100644 c_src/router.cc
create mode 100644 c_src/router.h
create mode 100644 src/eleveldb_metadata.erl
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment