From 62abfe72767c9a90983c2719fa27fbc9be341ffc Mon Sep 17 00:00:00 2001
From: Jan ONDREJ (SAL) <ondrejj(at)salstar.sk>
Date: Jun 16 2015 17:22:58 +0000
Subject: Merge branch 'master' into epel7


---

diff --git a/mod_evasive.conf b/mod_evasive.conf
index a3c1e97..3ad66ce 100644
--- a/mod_evasive.conf
+++ b/mod_evasive.conf
@@ -1,5 +1,5 @@
 # mod_evasive configuration
-LoadModule evasive24_module modules/mod_evasive24.so
+LoadModule evasive20_module modules/mod_evasive24.so
 
 <IfModule mod_evasive24.c>
     # The hash table size defines the number of top-level nodes for each
diff --git a/mod_evasive.spec b/mod_evasive.spec
index 981301f..9292058 100644
--- a/mod_evasive.spec
+++ b/mod_evasive.spec
@@ -2,7 +2,7 @@
 
 Name:           mod_evasive
 Version:        1.10.1
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Denial of Service evasion module for Apache
 
 Group:          System Environment/Daemons
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 16 2015 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.10.1-22
+- revert evasive24_module to evasive20_module (bz#1232360)
+
 * Tue May 26 2015 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.10.1-21
 - changed mod_evasive20 to mod_evasive24 (bz#1190556)