Igor Canadi 0143abdbb0 Merge branch 'master' into columnfamilies ...

Conflicts:
	HISTORY.md
	db/db_impl.cc
	db/db_impl.h
	db/db_iter.cc
	db/db_test.cc
	db/dbformat.h
	db/memtable.cc
	db/memtable_list.cc
	db/memtable_list.h
	db/table_cache.cc
	db/table_cache.h
	db/version_edit.h
	db/version_set.cc
	db/version_set.h
	db/write_batch.cc
	db/write_batch_test.cc
	include/rocksdb/options.h
	util/options.cc

2014-02-06 15:58:20 -08:00

..

c.h

C API: add rocksdb_env_set_high_priority_background_threads

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

cache.h

Merge branch 'master' into performance

2014-01-28 10:35:55 -08:00

column_family.h

Fix some lint warnings

2014-01-29 15:27:27 -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

[column families] Move memtable and immutable memtable list to column family data

2014-01-27 13:37:14 -08:00

env.h

Merge branch 'master' into columnfamilies

2014-02-06 15:58:20 -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

Clean up arena API

2014-01-30 22:10:10 -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-02-06 15:58:20 -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

Merge branch 'master' into performance

2014-01-23 16:32:49 -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

First phase API clean up

2014-02-03 00:30:43 -08:00

table.h

Put table factory back to public api

2014-02-03 19:51:20 -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

Moving Some includes from options.h to forward declaration

2014-01-24 17:16:22 -08:00

write_batch.h

Merge branch 'master' into columnfamilies

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