| commit | 4c7a08c83a7842e88838dde16684d6bafffdfaf0 | [log] [tgz] |
|---|---|---|
| author | Alex Elder <elder@inktank.com> | Tue Feb 19 19:20:56 2013 -0600 |
| committer | Alex Elder <elder@inktank.com> | Tue Feb 19 19:21:08 2013 -0600 |
| tree | c5fe0057b2ff9f98a64ceb6fa076e75da8225cdd | |
| parent | 19f949f52599ba7c3f67a5897ac6be14bfcb1200 [diff] | |
| parent | 903bb32e890237ca43ab847e561e5377cfe0fdb3 [diff] |
Merge branch 'testing' of github.com:ceph/ceph-client into into linux-3.8-ceph