Merge pull request #24078 from Songweibin/wip-rbd-trash-state

author Jason Dillaman <dillaman@redhat.com>

Mon, 24 Sep 2018 14:19:13 +0000 (10:19 -0400)

committer GitHub <noreply@github.com>

Mon, 24 Sep 2018 14:19:13 +0000 (10:19 -0400)
author Jason Dillaman <dillaman@redhat.com>
Mon, 24 Sep 2018 14:19:13 +0000 (10:19 -0400)
committer GitHub <noreply@github.com>
Mon, 24 Sep 2018 14:19:13 +0000 (10:19 -0400)
diff --cc src/cls/rbd/cls_rbd_client.h
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Mon, 24 Sep 2018 14:19:13 +0000 (10:19 -0400)
committer	GitHub <noreply@github.com>
	Mon, 24 Sep 2018 14:19:13 +0000 (10:19 -0400)
		1	2
src/cls/rbd/cls_rbd_client.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/librbd/internal.cc	patch \|	diff1 \|	diff2 \|	blob \| history