Merge branch 'low_level_examine_metadata' into merge-show-blocks

Conflicts:
	.gitignore
	Makefile.in
	persistent-data/space-maps/disk.cc
This commit is contained in:
Joe Thornber
2016-02-24 15:24:43 +00:00
8 changed files with 185 additions and 5 deletions

View File

@@ -105,7 +105,8 @@ SOURCE=\
DEVTOOLS_SOURCE=\
thin-provisioning/thin_generate_metadata.cc \
thin-provisioning/variable_chunk_stream.cc
thin-provisioning/variable_chunk_stream.cc \
thin-provisioning/thin_show_blocks.cc
ifeq ("@DEVTOOLS@", "yes")
SOURCE+=$(DEVTOOLS_SOURCE)