]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ffd903 fdc4236)
Merge pull request #37181 from callithea/wip-47411-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Tue, 29 Sep 2020 15:16:08 +0000 (08:16 -0700)
committerGitHub <noreply@github.com>
Tue, 29 Sep 2020 15:16:08 +0000 (08:16 -0700)
commita3363c736f9076fa329a9aaff25ea82b817b5115
tree2d77d8fcf781b01853c0c8969599d4e45a163bfdtree | snapshot
parent9ffd903cce3155adba20ce851981323d0f74e324commit | diff
parentfdc4236d3226a9d971708d386b80d6606bf22125commit | diff
Merge pull request #37181 from callithea/wip-47411-nautilus

nautilus: mgr: don't update pending service map epoch on receiving map from mon

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Unnamed repository; edit this file 'description' to name the repository.