]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/master' into wip-librados-fadvise
authorSage Weil <sage@redhat.com>
Fri, 12 Dec 2014 21:09:45 +0000 (13:09 -0800)
committerSage Weil <sage@redhat.com>
Fri, 12 Dec 2014 21:09:45 +0000 (13:09 -0800)
commitcf2113eb38c55ccb1f66a0b78e77a163a0aeac0b
treeb257ca2d9a4e893f6366234262b040ff7d2d4213
parent0c802e11d9f0ee993994d391d1e00aeb76965d6a
parentd818a24eb1df88e186729f0af327cb1e68b22244
Merge remote-tracking branch 'gh/master' into wip-librados-fadvise

Conflicts:
src/test/librbd/test_librbd.cc
src/rgw/rgw_rados.cc
src/test/librbd/test_librbd.cc
src/tracing/librbd.tp