]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1fd258 88dbde2)
Merge pull request #11262 from jcsp/wip-17270-master
authorJohn Spray <jspray@redhat.com>
Mon, 17 Oct 2016 12:06:42 +0000 (14:06 +0200)
committerGitHub <noreply@github.com>
Mon, 17 Oct 2016 12:06:42 +0000 (14:06 +0200)
Revert "osdc: After write try merge bh."

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

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