]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'master' into rgw
authorYehuda Sadeh <yehuda.sadeh@dreamhost.com>
Thu, 3 Mar 2011 19:26:50 +0000 (11:26 -0800)
committerYehuda Sadeh <yehuda.sadeh@dreamhost.com>
Thu, 3 Mar 2011 19:26:50 +0000 (11:26 -0800)
commit6a686c8f57e87e0326d1b0d770e0026f618fb5cf
treeb7cbb6a74934b0e3902eac1f6b03ee36a650931c
parent5bc1a332d2c57468ba28cc6dcefa1bbb5548c9f3
parent5c668d2b1737ffb823b68b51bae94c89b70122ee
Merge branch 'master' into rgw

Conflicts:
src/Makefile.am
configure.ac
src/Makefile.am