Merge branch 'release/1.0.2'

ccin2p3 · Nov 27, 2015 · d66e70a · d66e70a
2 parents fea2de9 + aa35c65
commit d66e70a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+#### 2015-11-27 - Remi Ferrand <[email protected]> - 1.0.2
+
+* Fix LICENSE file encoding issue that prevents publication on the Puppet forge
+
 #### 2015-11-27 - Remi Ferrand <[email protected]> - 1.0.1
 
 * [PR#4](https://github.com/ccin2p3/puppet-etc_services/pull/4): Add support for dashed services names

diff --git a/LICENSE b/LICENSE
@@ -20,7 +20,7 @@ the two main principles guiding its drafting:
 The authors of the CeCILL (for Ce[a] C[nrs] I[nria] L[ogiciel] L[ibre]) 
 license are: 
 
-Commissariat � l'�nergie atomique et aux �nergies alternatives - CEA, a
+Commissariat à l'énergie atomique et aux énergies alternatives - CEA, a
 public scientific, technical and industrial research establishment,
 having its principal place of business at 25 rue Leblanc, immeuble Le
 Ponant D, 75015 Paris, France.
@@ -341,7 +341,7 @@ The Licensee expressly undertakes:
 
 The Licensee undertakes not to directly or indirectly infringe the
 intellectual property rights on the Software of the Holder and/or
-Contributors, and to take, where applicable, vis-�-vis its staff, any
+Contributors, and to take, where applicable, vis-à-vis its staff, any
 and all measures required to ensure respect of said intellectual
 property rights of the Holder and/or Contributors.
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "ccin2p3-etc_services",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "source": "https://github.com/ccin2p3/puppet-etc_services",
   "author": "IN2P3 Computing Centre",
   "license": "CeCILL B",