Merge changes If3e5fbf0,I2e331d6a

* changes: Remove rocksdb dependency Suppress logging output of the peer during unit-tests
hyperledger · Nov 30, 2016 · 9bd4e85 · 9bd4e85
2 parents f8e9015 + e9f9806
commit 9bd4e85
Show file tree

Hide file tree

Showing 46 changed files with 2 additions and 4,544 deletions.
diff --git a/Makefile b/Makefile
@@ -48,7 +48,7 @@ endif
 
 PKGNAME = github.com/$(PROJECT_NAME)
 GO_LDFLAGS = -X $(PKGNAME)/metadata.Version=$(PROJECT_VERSION)
-CGO_FLAGS = CGO_CFLAGS=" " CGO_LDFLAGS="-lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy"
+CGO_FLAGS = CGO_CFLAGS=" "
 ARCH=$(shell uname -m)
 OS=$(shell uname)
 CHAINTOOL_RELEASE=v0.10.0

diff --git a/core/db/db.go b/core/db/db.go