ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into columnfamilies

Browse Source 
Conflicts:
	db/db_impl.cc
	db/db_impl.h
This commit is contained in:
Igor Canadi
2014-01-30 10:53:07 -08:00
parent 514e42c7cc 3c0dcf0e25
commit c37e7de669
8 changed files with 505 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -98,7 +98,9 @@ BENCHMARKS = db_bench_sqlite3 db_bench_tree_db table_reader_bench
# The library name is configurable since we are maintaining libraries of both
# debug/release mode.
LIBNAME = librocksdb
ifeq ($(LIBNAME),)
LIBNAME=librocksdb
endif
LIBRARY = ${LIBNAME}.a
MEMENVLIBRARY = libmemenv.a