Igor Canadi e8168382c4 Merge branch 'master' into columnfamilies ...

Conflicts:
	db/db_impl.cc
	include/rocksdb/options.h
	util/options.cc

2014-03-25 11:09:40 -07:00

..

backupable

Merge branch 'master' into columnfamilies

2014-03-25 11:09:40 -07:00

merge_operators

Enhance partial merge to support multiple arguments

2014-03-24 17:57:13 -07:00

redis

Fixed typos

2013-11-16 11:21:34 +00:00

ttl

Merge branch 'master' into columnfamilies

2014-03-25 11:09:40 -07:00

merge_operators.h

Add appropriate LICENSE and Copyright message.

2013-10-16 17:48:41 -07:00