Igor Canadi 3d2fe844ab Merge branch 'master' into columnfamilies ...

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

2014-04-07 11:31:11 -07:00

..

backupable

Merge branch 'master' into columnfamilies

2014-04-07 11:31:11 -07:00

geodb

Fix some other signed & unsigned comparisons

2014-04-03 20:51:27 -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-04-07 11:31:11 -07:00

merge_operators.h

Add appropriate LICENSE and Copyright message.

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