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: a981c1e 4f4dc88)

author	Sage Weil <sage@redhat.com>
	Mon, 8 Feb 2016 14:12:12 +0000 (09:12 -0500)
committer	Sage Weil <sage@redhat.com>
	Mon, 8 Feb 2016 14:12:12 +0000 (09:12 -0500)
commit	658780730a69989d6867e07be20bf9aaf3ad2dd7
tree	6ce38ffbfc44308ad6543a6a59cb0e8bd3384b52	tree \| snapshot
parent	a981c1ecc282467ca2932a91f980390dde7e9161	commit \| diff
parent	4f4dc880fd0969cbc5aefbc511d921cbe3c56df8	commit \| diff

Merge branch 'master' of git://github.com/joconcepts/ceph

Reviewed-by: Sage Weil <sage@redhat.com>

src/ceph-disk/ceph_disk/main.py

|

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