Igor Canadi 64904b39a0 Merge branch 'master' into columnfamilies ...

Conflicts:
	utilities/backupable/backupable_db.cc

2014-03-17 17:57:14 -07:00

..

backupable

Merge branch 'master' into columnfamilies

2014-03-17 17:57:14 -07:00

merge_operators

Remove .DS_Store files.

2013-12-17 06:00:47 +01:00

redis

Fixed typos

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

ttl

[CF] db_stress for column families

2014-03-11 12:06:12 -07:00

merge_operators.h

Add appropriate LICENSE and Copyright message.

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