Merge branch 'release/0.19.0'

pblittle · pblittle · commit fcd4e6e47165 · 2015-08-25T11:24:16.000-04:00
diff --git a/1.4/Makefile b/1.4/Makefile
@@ -1,5 +1,5 @@
 NAME = pblittle/docker-logstash
-VERSION = 0.18.0
+VERSION = 0.19.0
 
 # Set the LOGSTASH_CONFIG_URL env var to your logstash.conf file.
 # We will use our basic config if the value is empty.
diff --git a/1.4/base/Dockerfile b/1.4/base/Dockerfile
@@ -2,7 +2,7 @@ FROM java:7-jre
 MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)
 
 # Set default Logstash version
-ENV LOGSTASH_VERSION 1.4.4
+ENV LOGSTASH_VERSION 1.4.5
 
 # Set default Logstash source directory
 ENV LOGSTASH_SRC_DIR /opt/logstash
diff --git a/1.4/test/Makefile b/1.4/test/Makefile
@@ -1,5 +1,5 @@
 NAME = pblittle/docker-logstash-test
-VERSION = 0.18.0
+VERSION = 0.19.0
 
 BUILD_SRC = ${CURDIR}/../base
 
diff --git a/1.4/test/elasticsearch-embedded/Dockerfile b/1.4/test/elasticsearch-embedded/Dockerfile
@@ -1,4 +1,4 @@
-FROM pblittle/docker-logstash:0.18.0
+FROM pblittle/docker-logstash:0.19.0
 MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)
 
 # Download packages required to run the test suite
diff --git a/1.4/test/elasticsearch-linked/Dockerfile b/1.4/test/elasticsearch-linked/Dockerfile
@@ -1,4 +1,4 @@
-FROM pblittle/docker-logstash:0.18.0
+FROM pblittle/docker-logstash:0.19.0
 MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)
 
 # Download packages required to run the test suite
diff --git a/1.4/test/kibana-embedded/Dockerfile b/1.4/test/kibana-embedded/Dockerfile
@@ -1,4 +1,4 @@
-FROM pblittle/docker-logstash:0.18.0
+FROM pblittle/docker-logstash:0.19.0
 MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)
 
 # Download packages required to run the test suite
diff --git a/1.4/test/logstash-configtest/Dockerfile b/1.4/test/logstash-configtest/Dockerfile
@@ -1,2 +1,2 @@
-FROM pblittle/docker-logstash:0.18.0
+FROM pblittle/docker-logstash:0.19.0
 MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)
diff --git a/1.4/test/logstash-tarball-config/Dockerfile b/1.4/test/logstash-tarball-config/Dockerfile
@@ -1,4 +1,4 @@
-FROM pblittle/docker-logstash:0.18.0
+FROM pblittle/docker-logstash:0.19.0
 MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)
 
 # Download packages required to run the test suite
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Logstash Dockerfile
 
-This is a highly configurable [logstash][7] (1.4.4) image running [Elasticsearch][8] (1.7.0) and [Kibana][9] (3.1.2).
+This is a highly configurable [logstash][7] (1.4.5) image running [Elasticsearch][8] (1.7.0) and [Kibana][9] (3.1.2).
 
 ## How to use this image
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM pblittle/docker-logstash:0.18.0`
	`1`	`+FROM pblittle/docker-logstash:0.19.0`
`2`	`2`	`MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)`
`3`	`3`
`4`	`4`	`# Download packages required to run the test suite`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-FROM pblittle/docker-logstash:0.18.0`
	`1`	`+FROM pblittle/docker-logstash:0.19.0`
`2`	`2`	`MAINTAINER P. Barrett Little <barrett@barrettlittle.com> (@pblittle)`