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: 67696f0 389ecbb)

author	Sage Weil <sage@redhat.com>
	Wed, 2 Mar 2016 14:22:28 +0000 (09:22 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 2 Mar 2016 14:22:28 +0000 (09:22 -0500)
commit	2786f0bf11c3c2ec0e3e8bd61cd97c6b5a70345d
tree	d0c76525e5665d6ca03a5bb9234bd8b0c5a20794	tree \| snapshot
parent	67696f0becb7d6e02b5fc74e33aab9853d229483	commit \| diff
parent	389ecbbc2a9d7d4d334ea31a5c4120e9acc1b9aa	commit \| diff

Merge remote-tracking branch 'gh/jewel'

ceph.spec.in	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
debian/control	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
src/init-ceph.in	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history

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