Merge from Master

[l2tpns.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 1c96e14..14b5b52 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+l2tpns (2.2.1-2sames3.15) unstable; urgency=low
+
+  * new feature: If the user attribute "Framed-IPv6-Address" is defined then the ICMPv6_RA advertise this IPv6 address.
+  * Fix: Incorrect delegation of IPv6 prefixes when multiple of 4 bits (nibble) (eg: /44, /52 ...).
+  * Added ability to define up to 5 IPv6 prefix delegation by user.
+
+ -- Fernando Alves <fendo@sameswifi.fr>  Thu, 18 Sep 2014 18:36:43 +0200
+

 l2tpns (2.2.1-2sames3.14) unstable; urgency=low
 
   * Fix cluster slave; reset to 0, the end of the session when the master version < slave version.
 l2tpns (2.2.1-2sames3.14) unstable; urgency=low
 
   * Fix cluster slave; reset to 0, the end of the session when the master version < slave version.


@@ -7,7 +15,7 @@ l2tpns (2.2.1-2sames3.14) unstable; urgency=low
 
  -- Fernando Alves <fendo@sameswifi.fr>  Sun, 14 Sep 2014 18:27:09 +0200
 
 
  -- Fernando Alves <fendo@sameswifi.fr>  Sun, 14 Sep 2014 18:27:09 +0200
 

-l2tpns (2.2.1-2sames3.12) UNRELEASED; urgency=low
+l2tpns (2.2.1-2sames3.12) unstable; urgency=low

 
   * Fix: throttle ipv6 out.
   * Fix: remove old IPV6 routes on slave
 
   * Fix: throttle ipv6 out.
   * Fix: remove old IPV6 routes on slave