]> 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: 8f79a7e 2e93424)
Merge PR #17289 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 6 Sep 2017 21:45:14 +0000 (14:45 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 6 Sep 2017 21:45:14 +0000 (14:45 -0700)
* refs/remotes/upstream/pull/17289/head:
osd, mds, tools: drop the invalid comment and some unused variables

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/osd/PrimaryLogPG.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedBackend.h patch | diff1 | diff2 | blob | history

diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/ReplicatedBackend.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.