Merge pull request #1665 from brauner/2017-07-01/deprecate_lxc_rootfs_backend

author Serge Hallyn <serge@hallyn.com>

Sat, 8 Jul 2017 21:25:17 +0000 (21:25 +0000)

committer GitHub <noreply@github.com>

Sat, 8 Jul 2017 21:25:17 +0000 (21:25 +0000)
author Serge Hallyn <serge@hallyn.com>
Sat, 8 Jul 2017 21:25:17 +0000 (21:25 +0000)
committer GitHub <noreply@github.com>
Sat, 8 Jul 2017 21:25:17 +0000 (21:25 +0000)
diff --cc README.md
Simple merge
diff --cc src/lxc/confile.c
Simple merge
diff --cc src/tests/parse_config_file.c
Simple merge
author	Serge Hallyn <serge@hallyn.com>
	Sat, 8 Jul 2017 21:25:17 +0000 (21:25 +0000)
committer	GitHub <noreply@github.com>
	Sat, 8 Jul 2017 21:25:17 +0000 (21:25 +0000)
		1	2
README.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/lxc/confile.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/tests/parse_config_file.c	patch \|	diff1 \|	diff2 \|	blob \| history