]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Mon, 22 Dec 2014 14:51:14 +0000 (06:51 -0800)
committerSage Weil <sage@redhat.com>
Mon, 22 Dec 2014 14:51:14 +0000 (06:51 -0800)
commit20a4c57c4bb4fcfae68469c60a60d71c0188148a
tree6e8250173b6fae93a07cac962034aba5bc13831d
parent97c8156916d4bac4ba71ad040318e5ba7532ed38
parent4047f2ddef22794fad1e97bb852151e4c6b3cf82
Merge remote-tracking branch 'gh/next'

Conflicts:
PendingReleaseNotes
PendingReleaseNotes
src/mon/PGMap.cc