From: Sage Weil <sage@newdream.net>
Date: Wed, 15 Feb 2017 15:03:13 +0000 (-0600)
Subject: Merge pull request #13439 from Liuchang0812/cleanup-osd
X-Git-Tag: v12.0.1~390
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cf171986a4354d89ec059b522b740b3c5068499f;p=ceph.git

Merge pull request #13439 from Liuchang0812/cleanup-osd

osd: add override in osd subsystem

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

cf171986a4354d89ec059b522b740b3c5068499f
diff --cc src/test/os/TestLFNIndex.cc
index 87a5a00e01f2,fee9d78db407..a111c8d89a67
--- a/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