Merge pull request #2168 from joto/remove-cache-strategy-option

Remove --cache-strategy option

Author: lonvia

man/osm2pgsql.1

@@ -165,9 +165,6 @@ It needs at least the amount of \f[V]shared_buffers\f[R] given in its
 configuration.
 Defaults to 800.
 .TP
---cache-strategy=STRATEGY
-This deprecated option will be ignored.
-.TP
 -x, --extra-attributes
 Include attributes of each object in the middle tables and make them
 available to the outputs.

man/osm2pgsql.md

@@ -149,9 +149,6 @@ mandatory for short options too.
     It needs at least the amount of `shared_buffers` given in its configuration.
     Defaults to 800.
 
-\--cache-strategy=STRATEGY
-:   This deprecated option will be ignored.
-
 -x, \--extra-attributes
 :   Include attributes of each object in the middle tables and make them
     available to the outputs. Attributes are: user name, user id, changeset id,

src/command-line-parser.cpp

@@ -619,21 +619,6 @@ options_t parse_command_line(int argc, char *argv[])
         ->option_text("TBLSPC")
         ->group("Tablespace options");
 
-    // ----------------------------------------------------------------------
-    // Deprecated options
-    // ----------------------------------------------------------------------
-
-    // --cache-strategy
-    app.add_option_function<std::string>(
-           "--cache-strategy",
-           [&](std::string const &) {
-               log_warn("Deprecated option --cache-strategy ignored");
-           })
-        ->description(
-            "The option has been removed and only a warning is printed.")
-        ->option_text("TYPE")
-        ->group("Deprecated options");
-
     try {
         app.parse(argc, argv);
     } catch (...) {