git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 492720e f2432e0)

author	Sage Weil <sage@redhat.com>
	Sat, 14 Nov 2015 17:27:43 +0000 (12:27 -0500)
committer	Sage Weil <sage@redhat.com>
	Sat, 14 Nov 2015 17:27:43 +0000 (12:27 -0500)
commit	118fc222074b2730a9d653d3a96349ddaf326833
tree	0ab4625fe6caa7a4c557e15f586010ed56ce9a36	tree \| snapshot
parent	492720e85dff6fa1f102c1f782a0f4bf47d71082	commit \| diff
parent	f2432e01f25db3a95d38184c1c9197986cd51994	commit \| diff

Merge pull request #6583 from ceph/wip-krbd-map-args

rbd: unbreak rbd map + cephx_sign_messages option

Reviewed-by: Sage Weil <sage@redhat.com>

Unnamed repository; edit this file 'description' to name the repository.