Merge pull request #13439 from Liuchang0812/cleanup-osd

osd: add override in osd subsystem

Reviewed-by: Sage Weil <sage@redhat.com.

diff --cc src/os/bluestore/BlueStore.cc
Simple merge

diff --cc src/os/filestore/FileStore.cc
Simple merge

diff --cc src/os/memstore/MemStore.cc
Simple merge

diff --cc src/osd/ECBackend.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PGBackend.cc
Simple merge

diff --cc src/osd/PrimaryLogPG.cc
Simple merge

diff --cc src/osd/ReplicatedBackend.cc
Simple merge

diff --cc src/osdc/Objecter.cc
Simple merge

diff --cc src/test/objectstore/store_test.cc
Simple merge

diff --cc src/test/os/TestLFNIndex.cc
index 87a5a00e01f2a069fcc638711577fd648299925d,fee9d78db4072a4eac05d127ee1e07cc0337fc75..a111c8d89a6749e3bb2a00c5212d6b69a4949903
--- 1/src/test/os/TestLFNIndex.cc
--- 2/src/test/os/TestLFNIndex.cc
+++ b/src/test/os/TestLFNIndex.cc
@@@ -75,11 -75,12 +75,11 @@@ protected
                      vector<string> *path,
                      string *mangled_name,
                      int *exists                
-                     ) { return 0; }
+                     ) override { return 0; }
  
-   virtual int _collection_list_partial(
+   int _collection_list_partial(
                                       const ghobject_t &start,
                                       const ghobject_t &end,
 -                                     bool sort_bitwise,
                                       int max_count,
                                       vector<ghobject_t> *ls,
                                       ghobject_t *next

diff --cc src/test/osd/TestPGLog.cc
Simple merge

diff --cc src/test/osd/types.cc
Simple merge