Merge branch 'master' into columnfamilies

Browse Source

Conflicts:
	db/db_impl.cc
	db/db_impl_readonly.cc
	db/db_test.cc
	db/version_edit.cc
	db/version_edit.h
	db/version_set.cc
	db/version_set.h
	db/version_set_reduce_num_levels.cc

...

This commit is contained in:

Igor Canadi

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

parent 00065d0d5d 4e8321bfea

commit 23f6791c9e

49 changed files with 2550 additions and 2317 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1700

db/version_set.cc

File diff suppressed because it is too large Load Diff