Merge branch 'master' into 2.15.x-slim

openfrontier · Oct 8, 2018 · e9b41e3 · e9b41e3
2 parents 151b28a + 995cce3
commit e9b41e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ MAINTAINER zsx <thinkernel@gmail.com>
 ENV GERRIT_HOME /var/gerrit
 ENV GERRIT_SITE ${GERRIT_HOME}/review_site
 ENV GERRIT_WAR ${GERRIT_HOME}/gerrit.war
-ENV GERRIT_VERSION 2.15.3
+ENV GERRIT_VERSION 2.15.4
 ENV GERRIT_USER gerrit2
 ENV GERRIT_INIT_ARGS ""
 

diff --git a/README.md b/README.md
@@ -10,8 +10,8 @@
 
 #### Alpine base
 
- * openfrontier/gerrit:latest -> 2.15.3
- * openfrontier/gerrit:2.15.x -> 2.15.3
+ * openfrontier/gerrit:latest -> 2.15.4
+ * openfrontier/gerrit:2.15.x -> 2.15.4
  * openfrontier/gerrit:2.14.x -> 2.14.11
  * openfrontier/gerrit:2.13.x -> 2.13.11
  * openfrontier/gerrit:2.12.x -> 2.12.7
@@ -20,7 +20,7 @@
 
 #### Debian base
 
- * openfrontier/gerrit:2.15.x-slim -> 2.15.3
+ * openfrontier/gerrit:2.15.x-slim -> 2.15.4
  * openfrontier/gerrit:2.14.x-slim -> 2.14.11
 
 ## Migrate from ReviewDB to NoteDB