]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Tue, 12 Aug 2014 16:35:08 +0000 (09:35 -0700)
committerSage Weil <sage@redhat.com>
Tue, 12 Aug 2014 16:35:08 +0000 (09:35 -0700)
commite3e4883081dd48c88eece43398a78ddf12d71b0c
tree484992b065a3b550f7ef8d6d8c3c35e4f1810006
parent95fbce22c5d7a2498b8a2d419f97d2ee50ed0e53
parent7e7afafeb3c3e5fe62697d99a85a21aef5222574
Merge remote-tracking branch 'gh/next'

Conflicts:
PendingReleaseNotes
PendingReleaseNotes
src/common/LogClient.cc
src/msg/Pipe.cc
src/tools/rados/rados.cc