]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@inktank.com>
Fri, 4 Oct 2013 04:23:05 +0000 (21:23 -0700)
committerSage Weil <sage@inktank.com>
Fri, 4 Oct 2013 04:23:05 +0000 (21:23 -0700)
commit6afb16e52b6a9d83fa4729aa2341ee3bbe1eb276
tree33b4be716d2fba8cf7dd0902e17179edf6a598a3
parentaacd67e07174ca1e8687e78dcec1a2f68e3bdf5f
parente9e64545d5300364e4775ec68b4a6b9ca76b505b
Merge remote-tracking branch 'gh/next'

Conflicts:
src/Makefile.am
src/mon/Monitor.cc
src/mon/Monitor.h