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: 25d197f ee3e466)

author	Sage Weil <sage@redhat.com>
	Thu, 12 Feb 2015 02:31:39 +0000 (18:31 -0800)
committer	Sage Weil <sage@redhat.com>
	Thu, 12 Feb 2015 02:31:39 +0000 (18:31 -0800)
commit	26dfad798d5193295cbe86902a6bbcf773b03974
tree	408bd4e5ba4f79779a8e2754a79d7ab054983a89	tree \| snapshot
parent	25d197f0520f5143c8a58038a94e2c98a079ef24	commit \| diff
parent	ee3e466fc435d368537723cbd0f1b556c31b79eb	commit \| diff

Merge remote-tracking branch 'gh/master' into hammer

src/librados/RadosClient.cc	diff1 \|	diff2 \|	blob \| history
src/librados/librados.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history

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