From ed1b6526ca74f3af2c6e25b22c76bb6d588f1c96 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Mon, 7 Oct 2013 15:35:53 +0300
Subject: [PATCH] network: Fix network::carp for puppet 2.6

---
 network/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/network/manifests/init.pp b/network/manifests/init.pp
index 05bf243..bdf184a 100644
--- a/network/manifests/init.pp
+++ b/network/manifests/init.pp
@@ -365,7 +365,7 @@ define network::carp($password, $ipaddr, $netmask, $options = [], $postcmd = [])
                 ipaddr  => $ipaddr,
                 netmask => $netmask,
                 options => [ "vhid ${name}", "pass ${password}", $options ],
-                postcmd => merge([ "/usr/sbin/ndp -i carp${name} -- -accept_rtadv" ], $postcmd),
+                postcmd => merge("/usr/sbin/ndp -i carp${name} -- -accept_rtadv", $postcmd),
             }
         }
         "centos","redhat","fedora": {