]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'wip-opslog-socket2' into next
authorYehuda Sadeh <yehuda@inktank.com>
Thu, 22 Nov 2012 20:55:35 +0000 (12:55 -0800)
committerYehuda Sadeh <yehuda@inktank.com>
Thu, 22 Nov 2012 20:55:35 +0000 (12:55 -0800)
commita0e8452a09327547d5f60673e07046aeff1b51d8
tree88b6221ac6f425bc042dc1238169555338f6c758
parent189d073b2554ce32de7d6c759f03e08b25b3512e
parent29a96cf29c90f297de9d6e878fc0a8607c11bae9
Merge branch 'wip-opslog-socket2' into next

Conflicts:
src/rgw/rgw_main.cc
src/Makefile.am
src/common/config_opts.h
src/rgw/rgw_log.cc
src/rgw/rgw_main.cc