Clinton Gormley 10 лет назад
Родитель
Сommit
d82a685f57
1 измененных файлов с 3 добавлено и 5 удалено
  1. 3 5
      docs/reference/setup/upgrade.asciidoc

+ 3 - 5
docs/reference/setup/upgrade.asciidoc

@@ -21,12 +21,10 @@ consult this table:
 [cols="1<m,1<m,3",options="header",]
 |=======================================================================
 |Upgrade From   |Upgrade To     |Supported Upgrade Type
-|0.90.x         |1.x, 2.x       |<<restart-upgrade,Full cluster restart>>
-|< 0.90.7       |0.90.x         |<<restart-upgrade,Full cluster restart>>
-|>= 0.90.7      |0.90.x         |<<rolling-upgrades,Rolling upgrade>>
-|1.0.0 - 1.3.1  |1.x            |<<rolling-upgrades,Rolling upgrade>> (if <<recovery,`indices.recovery.compress`>> set to `false`)
-|>= 1.3.2       |1.x            |<<rolling-upgrades,Rolling upgrade>>
+|0.90.x         |2.x            |<<restart-upgrade,Full cluster restart>>
 |1.x            |2.x            |<<restart-upgrade,Full cluster restart>>
+|2.x            |2.y            |<<rolling-upgrades,Rolling upgrade>> (where `y > x `)
+|2.x            |3.x            |<<restart-upgrade,Full cluster restart>>
 |=======================================================================
 
 TIP: Take plugins into consideration as well when upgrading. Most plugins will have to be upgraded alongside Elasticsearch, although some plugins accessed primarily through the browser (`_site` plugins) may continue to work given that API changes are compatible.