| commit | 7ecba6f2f3f6e862287e07908ba583199c7772a9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 21 06:27:40 2013 -1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 21 06:27:40 2013 -1000 |
| tree | 538719bb3395752dc1e1feba2bca94ee49c3a50e | |
| parent | a3d5c3460a86f52ea435b3fb98be112bd18faabc [diff] | |
| parent | 3a96d5cd7bdce45d5dded75c3a62d4fb98050280 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client Pull Ceph fix from Sage Weil: "This fixes a problem preventing the kernel and userland librbd libraries from sharing data with the new format 2 images" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: rbd: use the correct length for format 2 object names