Merge branch 'master' into columnfamilies

Conflicts:
	db/db_impl.cc
	db/db_impl.h

Author: igorcanadi

Makefile

@@ -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
 

build_tools/make_new_version.sh

@@ -16,7 +16,7 @@ function title() {
   echo -e "\033[1;32m$*\033[0m"
 }
 
-usage="Create new rocksdb version and prepare it for the release process\n"
+usage="Create new RocksDB version and prepare it for the release process\n"
 usage+="USAGE: ./make_new_version.sh <version>"
 
 # -- Pre-check
@@ -33,8 +33,8 @@ if [ $GIT_BRANCH != "master" ]; then
 fi
 
 title "Adding new tag for this release ..."
-$TAG="$ROCKSDB_VERSION.fb"
-$GIT tag -a "$TAG" -m "Rocksdb $ROCKSDB_VERSION"
+TAG="$ROCKSDB_VERSION.fb"
+$GIT tag -a "$TAG" -m "RocksDB $ROCKSDB_VERSION"
 
 # Setting up the proxy for remote repo access
 title "Pushing new tag to remote repo ..."