]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: afb9061 45202a0)
Merge branch 'pacific-saved' into pacific
authorIlya Dryomov <idryomov@gmail.com>
Tue, 20 Apr 2021 09:01:15 +0000 (11:01 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Tue, 20 Apr 2021 09:01:15 +0000 (11:01 +0200)
Conflicts:
qa/tasks/ceph.conf.template [ commit 94df76244798
  ("qa/tasks/ceph.conf: shorten cephx TTL for testing") was
  cherry-picked to 16.2.0 separately and so exists both in
  16.2.0 and pacific-saved ]
qa/tasks/cephadm.conf [ ditto ]

1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history
src/common/options.cc patch | diff1 | diff2 | blob | history

diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/common/options.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.