Remove deprecated gateways

Closes #5422
elastic · Mar 26, 2014 · 3ffd0a1 · 3ffd0a1
1 parent c5e6749
commit 3ffd0a1
Show file tree

Hide file tree

Showing 51 changed files with 5 additions and 3,791 deletions.
diff --git a/docs/reference/indices.asciidoc b/docs/reference/indices.asciidoc
@@ -55,7 +55,6 @@ and warmers.
 * <<indices-refresh>>
 * <<indices-flush>>
 * <<indices-optimize>>
-* <<indices-gateway-snapshot>>
 
 --
 
@@ -105,5 +104,3 @@ include::indices/refresh.asciidoc[]
 
 include::indices/optimize.asciidoc[]
 
-include::indices/gateway-snapshot.asciidoc[]
-
diff --git a/docs/reference/indices/gateway-snapshot.asciidoc b/docs/reference/indices/gateway-snapshot.asciidoc
diff --git a/docs/reference/modules/gateway.asciidoc b/docs/reference/modules/gateway.asciidoc
@@ -12,9 +12,9 @@ When the cluster first starts up, the state will be read from the
 gateway and applied.
 
 The gateway set on the node level will automatically control the index
-gateway that will be used. For example, if the `fs` gateway is used,
+gateway that will be used. For example, if the `local` gateway is used,
 then automatically, each index created on the node will also use its own
-respective index level `fs` gateway. In this case, if an index should
+respective index level `local` gateway. In this case, if an index should
 not persist its state, it should be explicitly set to `none` (which is
 the only other value it can be set to).
 
@@ -68,8 +68,3 @@ will be recovered once the settings has been reached.
 
 include::gateway/local.asciidoc[]
 
-include::gateway/fs.asciidoc[]
-
-include::gateway/hadoop.asciidoc[]
-
-include::gateway/s3.asciidoc[]
diff --git a/docs/reference/modules/gateway/fs.asciidoc b/docs/reference/modules/gateway/fs.asciidoc
diff --git a/docs/reference/modules/gateway/hadoop.asciidoc b/docs/reference/modules/gateway/hadoop.asciidoc
diff --git a/docs/reference/modules/gateway/s3.asciidoc b/docs/reference/modules/gateway/s3.asciidoc
diff --git a/rest-api-spec/api/indices.snapshot_index.json b/rest-api-spec/api/indices.snapshot_index.json
diff --git a/rest-api-spec/test/indices.snapshot_index/10_basic.yaml b/rest-api-spec/test/indices.snapshot_index/10_basic.yaml
diff --git a/src/main/java/org/elasticsearch/action/ActionModule.java b/src/main/java/org/elasticsearch/action/ActionModule.java
@@ -82,8 +82,6 @@
 import org.elasticsearch.action.admin.indices.exists.types.TypesExistsAction;
 import org.elasticsearch.action.admin.indices.flush.FlushAction;
 import org.elasticsearch.action.admin.indices.flush.TransportFlushAction;
-import org.elasticsearch.action.admin.indices.gateway.snapshot.GatewaySnapshotAction;
-import org.elasticsearch.action.admin.indices.gateway.snapshot.TransportGatewaySnapshotAction;
 import org.elasticsearch.action.admin.indices.mapping.delete.DeleteMappingAction;
 import org.elasticsearch.action.admin.indices.mapping.delete.TransportDeleteMappingAction;
 import org.elasticsearch.action.admin.indices.mapping.get.*;
@@ -240,7 +238,6 @@ protected void configure() {
         registerAction(GetIndexTemplatesAction.INSTANCE, TransportGetIndexTemplatesAction.class);
         registerAction(DeleteIndexTemplateAction.INSTANCE, TransportDeleteIndexTemplateAction.class);
         registerAction(ValidateQueryAction.INSTANCE, TransportValidateQueryAction.class);
-        registerAction(GatewaySnapshotAction.INSTANCE, TransportGatewaySnapshotAction.class);
         registerAction(RefreshAction.INSTANCE, TransportRefreshAction.class);
         registerAction(FlushAction.INSTANCE, TransportFlushAction.class);
         registerAction(OptimizeAction.INSTANCE, TransportOptimizeAction.class);

diff --git a/src/main/java/org/elasticsearch/action/admin/indices/gateway/package-info.java b/src/main/java/org/elasticsearch/action/admin/indices/gateway/package-info.java
diff --git a/...n/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotAction.java b/...n/java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotAction.java
diff --git a/.../java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotRequest.java b/.../java/org/elasticsearch/action/admin/indices/gateway/snapshot/GatewaySnapshotRequest.java