From 56399cc179ae5f58f621f9f467cc8e4ed608e64f Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Fri, 4 Apr 2014 13:48:09 +0000
Subject: Don't use merge, it's not a standard function

---
 modules/apache/manifests/vhost/catalyst_app.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/apache')

diff --git a/modules/apache/manifests/vhost/catalyst_app.pp b/modules/apache/manifests/vhost/catalyst_app.pp
index 3540a9c7..b86cf27e 100644
--- a/modules/apache/manifests/vhost/catalyst_app.pp
+++ b/modules/apache/manifests/vhost/catalyst_app.pp
@@ -6,10 +6,10 @@ define apache::vhost::catalyst_app( $script,
                                     $vhost = false) {
     include apache::mod::fastcgi
     if ($location) {
-      $aliases = merge($aliases, {'/static' => "$location/root/static"})
+      $aliases['/static'] = "$location/root/static"
     }
 
-    $aliases = merge($aliases, {'/' => $script})
+    $aliases['/'] = $script
 
     apache::vhost::base { $name:
         vhost   => $vhost,
-- 
cgit v1.2.1