]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #300 from ceph/restore_giant-x_on_master
authorYuri Weinstein <yuri.weinstein@gmail.com>
Fri, 16 Jan 2015 22:45:13 +0000 (14:45 -0800)
committerYuri Weinstein <yuri.weinstein@gmail.com>
Fri, 16 Jan 2015 22:45:13 +0000 (14:45 -0800)
Restored giant-x suite on master


Trivial merge