honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed the watcher info API 

To return the right build info & version

Fixes elastic/elasticsearch#258

Original commit: elastic/x-pack-elasticsearch@53f5189978
This commit is contained in:
uboness 2015-04-29 18:00:56 +02:00
parent 7f24f229e2
commit 20059d353a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -9,6 +9,12 @@
<artifactId>elasticsearch-watcher</artifactId>
<version>1.0.0-Beta1-SNAPSHOT</version>
<scm>
<connection>scm:git:git@github.com:elastic/elasticsearch-watcher.git</connection>
<developerConnection>scm:git:git@github.com:elastic/elasticsearch-watcher.git</developerConnection>
<url>http://github.com/elastic/elasticsearch-watcher</url>
</scm>
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>

10
src/main/java/org/elasticsearch/watcher/WatcherVersion.java
View File

@ -25,10 +25,10 @@ public class WatcherVersion implements Serializable {
// the (internal) format of the id is there so we can easily do after/before checks on the id
// The first internal beta has already been released, without this class being here, so we start version version 2.
public static final int V_1_0_0_Beta2_ID = /*00*/1000002;
public static final WatcherVersion V_1_0_0_Beta2 = new WatcherVersion(V_1_0_0_Beta2_ID, true, Version.V_1_4_0, LicenseVersion.V_1_0_0);
public static final int V_1_0_0_Beta1_ID = /*00*/1000001;
public static final WatcherVersion V_1_0_0_Beta1 = new WatcherVersion(V_1_0_0_Beta1_ID, true, Version.V_1_4_0, LicenseVersion.V_1_0_0);
public static final WatcherVersion CURRENT = V_1_0_0_Beta2;
public static final WatcherVersion CURRENT = V_1_0_0_Beta1;
public static WatcherVersion readVersion(StreamInput in) throws IOException {
return fromId(in.readVInt());
@ -36,8 +36,8 @@ public class WatcherVersion implements Serializable {
public static WatcherVersion fromId(int id) {
switch (id) {
case V_1_0_0_Beta2_ID:
return V_1_0_0_Beta2;
case V_1_0_0_Beta1_ID:
return V_1_0_0_Beta1;
default:
return new WatcherVersion(id, null, Version.CURRENT, LicenseVersion.CURRENT);