Skip to content

Instantly share code, notes, and snippets.

@thumbot
Created February 1, 2017 23:22
Show Gist options
  • Save thumbot/db9793f707ec6003b5683d21f7b27522 to your computer and use it in GitHub Desktop.
Save thumbot/db9793f707ec6003b5683d21f7b27522 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 | 84 ++++++++++++++----
c_src/refobjects.cc | 1 -
c_src/router.cc | 189 +++++++++++++++++++++++++++++++++++++++++
c_src/router.h | 45 ++++++++++
priv/eleveldb.schema | 9 --
src/eleveldb.erl | 26 +++++-
test/eleveldb_schema_tests.erl | 6 +-
9 files changed, 366 insertions(+), 36 deletions(-)
create mode 100644 c_src/router.cc
create mode 100644 c_src/router.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment