Skip to content

Commit

Permalink
Merge branch 'add-elastic1.6-support'
Browse files Browse the repository at this point in the history
  • Loading branch information
omershelef committed Jun 20, 2015
2 parents 1a36bdd + ed9e9c9 commit 6914ee5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jdk:


before_install:
- wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.4.1.deb && sudo dpkg -i --force-confnew elasticsearch-1.4.1.deb
- wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.6.0.deb && sudo dpkg -i --force-confnew elasticsearch-1.6.0.deb

services:
- elasticsearch
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ You can also use ES functions in SQL.

Install as plugin:

###Elasticsearch 1.4.X
###Elasticsearch 1.6.X
````
./bin/plugin -u https://github.com/NLPchina/elasticsearch-sql/releases/download/1.3.3/elasticsearch-sql-1.3.3.zip --install sql
./bin/plugin -u https://github.com/NLPchina/elasticsearch-sql/releases/download/1.3.4/elasticsearch-sql-1.3.4.zip --install sql
````
## Basic Usage
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.nlpcn</groupId>
<artifactId>elasticsearch-sql</artifactId>
<version>1.3.3</version>
<version>1.3.4</version>
<packaging>jar</packaging>
<description>Query elasticsearch using SQL</description>
<name>elasticsearch-sql</name>
Expand Down Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>1.4.1</version>
<version>1.6.0</version>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/nlpcn/es4sql/MainTestSuite.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public static void loadBulk(String jsonPath) throws Exception {

BulkRequestBuilder bulkBuilder = new BulkRequestBuilder(client);
byte[] buffer = ByteStreams.toByteArray(new FileInputStream(jsonPath));
bulkBuilder.add(buffer, 0, buffer.length, true, TEST_INDEX, null);
bulkBuilder.add(buffer, 0, buffer.length, TEST_INDEX, null);
BulkResponse response = bulkBuilder.get();

if(response.hasFailures()) {
Expand Down

0 comments on commit 6914ee5

Please sign in to comment.