rocksdb/include/rocksdb
Igor Canadi ddbd1ece88 Merge branch 'master' into columnfamilies
Conflicts:
	db/db_impl.cc
	db/db_test.cc
	db/internal_stats.cc
	db/internal_stats.h
	db/version_edit.cc
	db/version_edit.h
	db/version_set.cc
	include/rocksdb/options.h
	util/options.cc
2014-03-31 13:39:24 -07:00
..
c.h Enhance partial merge to support multiple arguments 2014-03-24 17:57:13 -07:00
cache.h Merge branch 'master' into performance 2014-01-28 10:35:55 -08:00
compaction_filter.h Fix valgrind issues 2014-03-27 08:22:59 -07:00
comparator.h Add License message to public header files. 2013-11-18 10:21:35 -08:00
db.h Sanity check on Open 2014-03-20 14:18:29 -07:00
env.h Merge branch 'master' into columnfamilies 2014-03-25 11:09:40 -07:00
filter_policy.h Add License message to public header files. 2013-11-18 10:21:35 -08:00
flush_block_policy.h Remove the terrible hack in for flush_block_policy_factory 2014-02-28 16:39:27 -08:00
iterator.h Add License message to public header files. 2013-11-18 10:21:35 -08:00
ldb_tool.h Add License message to public header files. 2013-11-18 10:21:35 -08:00
memtablerep.h Consolidate SliceTransform object ownership 2014-03-10 12:56:46 -07:00
merge_operator.h Enhance partial merge to support multiple arguments 2014-03-24 17:57:13 -07:00
options.h Merge branch 'master' into columnfamilies 2014-03-31 13:39:24 -07:00
perf_context.h output perf_context in db_bench readrandom 2014-03-05 10:32:54 -08:00
slice_transform.h Add License message to public header files. 2013-11-18 10:21:35 -08:00
slice.h Add License message to public header files. 2013-11-18 10:21:35 -08:00
statistics.h [RocksDB] make sure KSVObsolete does not get accessed as a valid pointer. 2014-03-10 12:55:25 -07:00
status.h IOError cleanup 2014-02-12 11:42:54 -08:00
table_properties.h Support prefix seek in UserCollectedProperties 2014-02-12 13:14:59 -08:00
table.h Make the block-based table's index pluggable 2014-02-28 18:19:07 -08:00
transaction_log.h Revert "Fix bad merge of D16791 and D16767" 2014-03-12 09:37:43 -07:00
types.h Add License message to public header files. 2013-11-18 10:21:35 -08:00
universal_compaction.h Moving Some includes from options.h to forward declaration 2014-01-24 17:16:22 -08:00
write_batch.h [CF] WriteBatch to take in ColumnFamilyHandle 2014-03-14 11:30:14 -07:00