Merge pull request #10463 from gongchuang/gc-wip-test

author John Spray <jspray@redhat.com>

Fri, 23 Sep 2016 13:12:42 +0000 (14:12 +0100)

committer GitHub <noreply@github.com>

Fri, 23 Sep 2016 13:12:42 +0000 (14:12 +0100)
author John Spray <jspray@redhat.com>
Fri, 23 Sep 2016 13:12:42 +0000 (14:12 +0100)
committer GitHub <noreply@github.com>
Fri, 23 Sep 2016 13:12:42 +0000 (14:12 +0100)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	John Spray <jspray@redhat.com>
	Fri, 23 Sep 2016 13:12:42 +0000 (14:12 +0100)
committer	GitHub <noreply@github.com>
	Fri, 23 Sep 2016 13:12:42 +0000 (14:12 +0100)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history