release v2.2.5

antoineco · antoineco · commit eff7c2dd932b · 2015-06-18T23:30:57.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+###2.2.5
+
+Fix conflict introduced by [nanliu-archive](https://forge.puppetlabs.com/nanliu/archive/changelog) v0.3.0
+
 ###2.2.4
 
 * Add support for Java '7u79', '7u80' and '8u45'
diff --git a/metadata.json b/metadata.json
@@ -5,7 +5,7 @@
   "project_page": "https://github.com/antoineco/aco-oracle_java",
   "source": "git://github.com/antoineco/aco-oracle_java.git",
   "summary": "Puppet module to install Oracle Java on Linux systems",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "tags": ["jre","jdk","oracle","java"],
   "dependencies": [
     {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"project_page": "https://github.com/antoineco/aco-oracle_java",`
`6`	`6`	`"source": "git://github.com/antoineco/aco-oracle_java.git",`
`7`	`7`	`"summary": "Puppet module to install Oracle Java on Linux systems",`
`8`		`- "version": "2.2.4",`
	`8`	`+ "version": "2.2.5",`
`9`	`9`	`"tags": ["jre","jdk","oracle","java"],`
`10`	`10`	`"dependencies": [`
`11`	`11`	`{`