]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #989 from ceph/revert-981-revert-955-tracker13531
authorSamuel Just <sjust@redhat.com>
Tue, 10 May 2016 17:28:03 +0000 (10:28 -0700)
committerSamuel Just <sjust@redhat.com>
Tue, 10 May 2016 17:28:03 +0000 (10:28 -0700)
Revert "Revert "Rados: Tracker-13531-resolve stuck peering""

Reviewed-by: Samuel Just <sjust@redhat.com>

Trivial merge