| commit | 969e5aa3b0162a02c4f287d48ff58ca2145acf1b | [log] [tgz] |
|---|---|---|
| author | Alex Elder <elder@inktank.com> | Wed Jan 30 07:54:34 2013 -0600 |
| committer | Alex Elder <elder@inktank.com> | Wed Jan 30 07:54:34 2013 -0600 |
| tree | 1af8e8e47e7352c6d3b4abfdb4aea6bd9458666f | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 [diff] | |
| parent | 1ec3911dbd19076bcdfe5540096ff67f91a6ec02 [diff] |
Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testing