]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 304efb0 4852de6)
Merge PR #20336 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 13 Feb 2018 19:36:11 +0000 (11:36 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 13 Feb 2018 19:36:11 +0000 (11:36 -0800)
* refs/pull/20336/head:
client: re-use free snap tag

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/client/Client.h patch | diff1 | diff2 | blob | history

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