]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-release-notes' of git://github.com/dachary/ceph into wip-jewel
authorSage Weil <sage@redhat.com>
Tue, 22 Mar 2016 16:24:56 +0000 (12:24 -0400)
committerSage Weil <sage@redhat.com>
Tue, 22 Mar 2016 16:24:56 +0000 (12:24 -0400)
commit1c5c153aa92efbbfa85c269d6a3137dc300828fb
tree4034f7fb7174a878248217fc96d5d5d1dce023d3
parentccc3955f2cc316992aac84858c3b78b6196aedce
parent55f4ade6d8e383f8981d3f79712e08101ba9052f
Merge branch 'wip-release-notes' of git://github.com/dachary/ceph into wip-jewel

Conflicts:
doc/release-notes.rst
doc/release-notes.rst