honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-25 01:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to elasticsearch 1.3.0

Browse Source 
Closes #24.

(cherry picked from commit 9c62411)
This commit is contained in:
David Pilato 2014-06-15 11:17:47 +02:00
parent 37474b43d6
commit 81742c3c1d
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -3,9 +3,10 @@ Google Compute Engine Cloud Plugin for Elasticsearch
The GCE Cloud plugin allows to use GCE API for the unicast discovery mechanism.
In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-gce/2.0.0`.
In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-gce/2.1.1`.
* For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/master).
* For 1.3.x elasticsearch versions, look at [es-1.3 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.3).
* For 1.2.x elasticsearch versions, look at [es-1.2 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.2).
* For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.1).
* For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.0).

2
pom.xml
View File

@ -51,7 +51,7 @@ governing permissions and limitations under the License. -->
<elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
<google.gce.version>v1-rev15-1.18.0-rc</google.gce.version>
<google.api.version>1.18.0-rc</google.api.version>
<lucene.version>4.8.0</lucene.version>
<lucene.version>4.8.1</lucene.version>
<tests.shuffle>true</tests.shuffle>
<tests.output>onerror</tests.output>
<tests.client.ratio></tests.client.ratio>

2
src/test/java/org/elasticsearch/discovery/gce/AbstractGceComputeServiceTest.java
View File

@ -22,6 +22,7 @@ package org.elasticsearch.discovery.gce;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.plugins.PluginsService;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.junit.Test;
@ -55,6 +56,7 @@ public abstract class AbstractGceComputeServiceTest extends ElasticsearchIntegra
return ImmutableSettings.builder()
.put("transport.tcp.port", getPort(nodeOrdinal))
.put("http.enabled", false)
.put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)
.build();
}

11
src/test/java/org/elasticsearch/gce/itest/GceSimpleITest.java
View File

@ -23,6 +23,7 @@ import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
import org.elasticsearch.cloud.gce.AbstractGceTest;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.plugins.PluginsService;
import org.elasticsearch.test.ElasticsearchIntegrationTest;
import org.hamcrest.Matchers;
import org.junit.Test;
@ -36,11 +37,19 @@ import org.junit.Test;
*/
@AbstractGceTest.GceTest
@ElasticsearchIntegrationTest.ClusterScope(
scope = ElasticsearchIntegrationTest.Scope.TEST,
scope = ElasticsearchIntegrationTest.Scope.SUITE,
numDataNodes = 1,
transportClientRatio = 0.0)
public class GceSimpleITest extends AbstractGceTest {
@Override
protected Settings nodeSettings(int nodeOrdinal) {
return ImmutableSettings.builder()
.put(super.nodeSettings(nodeOrdinal))
.put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)
.build();
}
@Test
public void one_node_should_run() {
// Do nothing... Just start :-)