]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'master' of https://github.com/ceph/ceph
authorJohn Wilkins <john.wilkins@inktank.com>
Thu, 10 Jul 2014 18:30:41 +0000 (11:30 -0700)
committerJohn Wilkins <john.wilkins@inktank.com>
Thu, 10 Jul 2014 18:30:41 +0000 (11:30 -0700)
commit60f27a2602b5efca424a0ee96676ef264ca78270
tree87da5f3e4b44edb59b4d8f367536e5d396d2ecd3
parent98f92d84d6bb7ed1f6fa8d93076de648a657e412
parent115c07857c7432105a405f5b855da620235424a7
Merge branch 'master' of https://github.com/ceph/ceph