git-server-git.apps.pok.os.sepia.ceph.com Git

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

Merge branch 'wip-7701' of git://github.com/xinxinsh/ceph into hammer

Conflicts:
src/osd/osd_types.h

qa/workunits/cephtool/test.sh	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	diff1 \|	diff2 \|	blob \| history
src/mon/PGMap.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

qa/workunits/cephtool/test.sh	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	diff1 \|	diff2 \|	blob \| history
src/mon/PGMap.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history