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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 048ca96 d1f8742)

author	Sage Weil <sage@inktank.com>
	Thu, 20 Mar 2014 17:42:26 +0000 (10:42 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 20 Mar 2014 17:42:26 +0000 (10:42 -0700)
commit	513e4ad8ec708dbee0fe59b72f1ac9f4d453fd35
tree	904ea2d83b279c0647142675ce1fc4be94d9ed28	tree \| snapshot
parent	048ca96c4de509b35d61111b0c751e0faf3b07e5	commit \| diff
parent	d1f8742db1cd07b65afb7ac9ced04a2c02d85b73	commit \| diff

Merge remote-tracking branch 'gh/firefly'

src/mon/MDSMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history

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