git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

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

projects / ceph-ci.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1033746 cbcad63)

author	Sage Weil <sage@redhat.com>
	Mon, 18 Mar 2019 17:10:50 +0000 (12:10 -0500)
committer	Sage Weil <sage@redhat.com>
	Mon, 18 Mar 2019 17:10:50 +0000 (12:10 -0500)
commit	b298aa972d7c6448c120ebfc49c3412520189760
tree	942e9db696e57d0fcbdea2e8e50ea891e7a26423	tree \| snapshot
parent	1033746e421ed0f977d412093c95755fcc3c68db	commit \| diff
parent	cbcad6325c9e6315e4b7c87a25f8d5f99bebb621	commit \| diff

Merge remote-tracking branch 'gh/nautilus'

src/mon/Monitor.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history

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