]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Wed, 27 Aug 2014 00:33:59 +0000 (17:33 -0700)
committerSage Weil <sage@redhat.com>
Wed, 27 Aug 2014 00:33:59 +0000 (17:33 -0700)
commit0a0c10f0efebe980a8769cc94a97e65cfada86de
treef9b2d4b2f44ad8083748f43ff24879ae3c25ec72
parentac4b45625435634c90a5a1a21352aaca128d7d90
parente81723a3d45d70eddf527bc885fdf94f035081bc
Merge remote-tracking branch 'gh/next'

Conflicts:
src/os/CollectionIndex.h
src/mon/Monitor.cc
src/mon/Monitor.h