]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-cookbooks.git/commitdiff
projects / ceph-cookbooks.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac1f09d 3f3c7ad)
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)
Conflicts:
recipes/osd.rb

1  2 
recipes/mon.rb patch | diff1 | diff2 | blob | history
recipes/osd.rb patch | diff1 | diff2 | blob | history

diff --cc recipes/mon.rb
Simple merge
diff --cc recipes/osd.rb
Simple merge
Unnamed repository; edit this file 'description' to name the repository.