From: Andrei Pavel <andrei.pavel@qualitance.com>
Date: Thu, 30 Jun 2016 07:34:23 +0000 (+0300)
Subject: Merge branch 'isc-master'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa6decdbea5eb2aae4d95970bb1f97a6c5128402;p=thirdparty%2Fkea.git

Merge branch 'isc-master'
---

aa6decdbea5eb2aae4d95970bb1f97a6c5128402
diff --cc AUTHORS
index 3df5202ca1,da3170ad42..3f78036192
--- a/AUTHORS
+++ b/AUTHORS
@@@ -97,12 -97,9 +97,15 @@@ We have received the following contribu
   - Angelo Failla, Facebook
     2016-04: Fixes for transaction id generation in perfdhcp
  
+  - Razvan Becheriu, Qualitance
+    2016-05: Added support for Cassandra
+ 
 + - Cristian Secareanu, Qualitance
 +   2016-06: Added support for IPv6 prefix and PDEXCLUDE option
 +
 + - Andrei Pavel, Qualitance
 +   2016-06: [RFCs 6334, 6603, 7598] Additional native option support
 +
  Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
  Boost (http://www.boost.org/) library for almost everything, and can use Botan
  (http://botan.randombit.net/) or OpenSSL (https://www.openssl.org/) for