]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-cookbooks.git/commit
Merge branch 'master' into ceph-client-no-library rebased
authorGreg Farnum <greg@inktank.com>
Thu, 6 Sep 2012 20:25:49 +0000 (13:25 -0700)
committerGreg Farnum <greg@inktank.com>
Thu, 6 Sep 2012 20:25:49 +0000 (13:25 -0700)
commit20e6c9ab4f549da6aed1ef466058d19580095935
tree48d271799e5c9683182f075b5d90a9ec18cac1e4
parentac1f09d22ceddb3ed7db417ced5df5fd24cf8a6c
parent3f3c7adbfb00eb5dd00ace0bb34fa44be33c2043
Merge branch 'master' into ceph-client-no-library

Conflicts:
recipes/osd.rb
recipes/mon.rb
recipes/osd.rb