Igor Canadi 28d1a0c6f5 Merge branch 'master' into columnfamilies ...

Conflicts:
	db/db_impl.cc
	db/db_impl.h
	db/db_impl_readonly.h
	db/db_test.cc
	include/rocksdb/db.h
	include/utilities/stackable_db.h

2014-01-24 09:27:29 -08:00

..

arena.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

c.h

C API: add rocksdb_env_set_high_priority_background_threads

2013-12-31 15:14:18 -08:00

cache.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

column_family.h

[column families] Implement DB::OpenWithColumnFamilies()

2014-01-07 11:05:50 -08:00

compaction_filter.h

Clarify CompactionFilter thread safety requirements

2013-12-02 16:41:43 -08:00

comparator.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

db.h

Merge branch 'master' into columnfamilies

2014-01-24 09:27:29 -08:00

env.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

filter_policy.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

flush_block_policy.h

Add License message to public header files.

2013-11-18 10:21:35 -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

Remove the unnecessary use of shared_ptr

2014-01-15 18:22:01 -08:00

merge_operator.h

Introduce MergeContext to Lazily Initialize merge operand list

2013-12-11 11:37:28 -08:00

options.h

Merge branch 'master' into columnfamilies

2014-01-24 09:27:29 -08:00

perf_context.h

Revert "Allow users to profile a query and see bottleneck of the query"

2013-11-21 17:40:39 -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

Statistics code cleanup

2014-01-17 12:46:06 -08:00

status.h

Avoid malloc in NotFound key status if no message is given.

2013-12-26 16:23:10 -08:00

table_properties.h

Improve the "table stats"

2013-11-19 16:29:42 -08:00

table.h

Improve the "table stats"

2013-11-19 16:29:42 -08:00

transaction_log.h

Initialize sequence number in BatchResult - issue #39

2013-12-20 10:01:12 -08:00

types.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

universal_compaction.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

write_batch.h

Merge branch 'master' into columnfamilies

2014-01-21 17:01:52 -08:00