]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge tag 'v0.83'
authorSage Weil <sage@redhat.com>
Tue, 29 Jul 2014 23:23:12 +0000 (16:23 -0700)
committerSage Weil <sage@redhat.com>
Tue, 29 Jul 2014 23:23:12 +0000 (16:23 -0700)
v0.83

1  2 
configure.ac
src/upstart/ceph-osd.conf

diff --cc configure.ac
Simple merge
Simple merge