]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Merge branch 'firefly'
authorSage Weil <sage@inktank.com>
Tue, 18 Mar 2014 22:01:04 +0000 (15:01 -0700)
committerSage Weil <sage@inktank.com>
Tue, 18 Mar 2014 22:01:04 +0000 (15:01 -0700)
1  2 
teuthology/ceph.conf.template

Simple merge