summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-10-07 15:46:27 +0000
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-10-07 15:46:27 +0000
commit2c137af198c81b3f6eec083bd1cc787d76e9c0cc (patch)
tree77059a8e2f31a4f62e21d0b5d768247ff5dc1744
parent491f7f4dd4e9d75c74aa7820c3b75937cc431f03 (diff)
parent19ddc07abcd4a4a6ab24893be7804fe790322679 (diff)
Merge branch 'non_ascii_comment' into 'master' HEADmaster
remove non-ascii char in comment in init.pp Apparently puppet doesn't like ppl who don't speak English and crashes on non-ASCII chars in comments. Assigned to Jerome for review (but the pick was somewhat random) See merge request !4
-rw-r--r--manifests/init.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 85fc88a..2e4b8bf 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,7 +3,7 @@
# Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
# Copyright 2008, admin(at)immerda.ch
# Copyright 2008, Puzzle ITC GmbH
-# Marcel Härry haerry+puppet(at)puzzle.ch
+# Marcel Haerry haerry+puppet(at)puzzle.ch
# Simon Josi josi+puppet(at)puzzle.ch
# Copyright 2009-2010, Riseup Labs <http://riseuplabs.org>
# Pietro Ferrari <pietro@riseup.net>