]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Revert "Merge pull request #3641 from athanatos/wip-10731"
authorSamuel Just <sjust@redhat.com>
Mon, 23 Mar 2015 18:46:35 +0000 (11:46 -0700)
committerSamuel Just <sjust@redhat.com>
Mon, 23 Mar 2015 18:46:35 +0000 (11:46 -0700)
commit45bff593decbe5217ef7c0eb5ed5b549e6e76e87
treeecf9b5a4be468a9720b49ac82a943e306defcb8a
parent6f23d3420f60b4a2655805320a3e7b6869791760
Revert "Merge pull request #3641 from athanatos/wip-10731"

This reverts commit 54a22236a00ab18ec62c6e7df1117055d5fd0ef1, reversing
changes made to 7eca03e290f278bdf3a9613e0f383ec49f40b645.

Conflicts:
src/include/ceph_features.h
src/include/ceph_features.h
src/osd/ReplicatedPG.cc