From 3f8576157be83d746cc200991f6fc5149833e8ce Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Wed, 26 Nov 2014 20:08:07 +0100
Subject: RADIUS: Sync with FreeRADIUS Master

commit 30dac6d3dc87aaaa9c29ecdb33874fa57c2bcbc6
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Tue Nov 25 16:45:45 2014 -0500

    as found on the net

commit ee79c59d3a1cae76fcb1940710d9a0f7fbdf8427
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date:   Thu Nov 13 17:39:46 2014 -0500

    Add memcached rlm_cache_driver

commit 6277960bc830891123b00400af56912e51d4d311
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Tue Oct 28 17:01:49 2014 -0400

    Add FreeRADIUS-Response-Delay-USec

Change-Id: I705d0e852d38eaace4f71cfc0a38ecdd41c0b58f
Reviewed-on: https://code.wireshark.org/review/5510
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 radius/dictionary | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'radius/dictionary')

diff --git a/radius/dictionary b/radius/dictionary
index 8c81daa8e3..bdfc179471 100644
--- a/radius/dictionary
+++ b/radius/dictionary
@@ -143,6 +143,7 @@ $INCLUDE dictionary.alcatel-lucent.aaa
 $INCLUDE dictionary.alteon
 $INCLUDE dictionary.alvarion
 $INCLUDE dictionary.apc
+$INCLUDE dictionary.arbor
 $INCLUDE dictionary.aruba
 $INCLUDE dictionary.azaire
 $INCLUDE dictionary.ascend
@@ -210,6 +211,7 @@ $INCLUDE dictionary.livingston
 $INCLUDE dictionary.localweb
 $INCLUDE dictionary.lucent
 $INCLUDE dictionary.manzara
+$INCLUDE dictionary.meinberg
 $INCLUDE dictionary.merit
 $INCLUDE dictionary.meru
 $INCLUDE dictionary.microsoft
-- 
cgit v1.2.1