]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Mon, 22 Apr 2013 20:01:11 +0000 (13:01 -0700)
committerSage Weil <sage@inktank.com>
Mon, 22 Apr 2013 20:01:11 +0000 (13:01 -0700)
1  2 
teuthology/task/ceph-deploy.py

Simple merge