]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a695e8d 3239ce8)
Merge pull request #11868 from dachary/wip-17512-jewel
authorNathan Cutler <presnypreklad@gmail.com>
Wed, 1 Feb 2017 14:26:21 +0000 (15:26 +0100)
committerGitHub <noreply@github.com>
Wed, 1 Feb 2017 14:26:21 +0000 (15:26 +0100)
jewel: multisite: metadata master can get the wrong value for 'oldest_log_period'

Reviewed-by: Nathan Cutler <ncutler@suse.com>
1  2 
src/rgw/rgw_rados.cc patch | diff1 | diff2 | blob | history
src/rgw/rgw_sync.cc patch | diff1 | diff2 | blob | history

diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_sync.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.