Squashed 'src/leveldb/' changes from 936b461..e991315

e991315 Merge upstream LevelDB 1.15. 0cfb990 Release LevelDB 1.15 02ac9f1 Merge upstream LevelDB 1.14. 0b9a89f Release LevelDB 1.14 git-subtree-dir: src/leveldb git-subtree-split: e991315d7fe4ca84a98902578106cbffa3dcccfd
2013-12-12 22:08:18 +01:00
parent eed29f0f50
commit 55c6890294
31 changed files with 449 additions and 366 deletions
--- a/db/version_set.h
+++ b/db/version_set.h
@@ -292,8 +292,6 @@ class VersionSet {

  void AppendVersion(Version* v);

-  bool ManifestContains(const std::string& record) const;
-
  Env* const env_;
  const std::string dbname_;
  const Options* const options_;