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: 56fe749 b4f1935)

author	Sage Weil <sage@redhat.com>
	Fri, 11 Mar 2016 16:14:18 +0000 (11:14 -0500)
committer	Sage Weil <sage@redhat.com>
	Fri, 11 Mar 2016 16:14:18 +0000 (11:14 -0500)
commit	57c6d3b67ad10dcb1ce14c377ca992fe777addbe
tree	5eb8894a4fa69012de3fc9505b957079e277feb9	tree \| snapshot
parent	56fe749e2c6928df5ffe2c17c2b9d24da0c07ce2	commit \| diff
parent	b4f19352bc3a90b880760e034c559ddcbd2591e6	commit \| diff

Merge branch 'debian-stretch-dep-fix' of git://github.com/rldleblanc/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
# Conflicts:
# debian/control

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