summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure.ac2
-rw-r--r--redhat/frr.spec.in7
2 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 7e07fabf8b..6faa3b6c45 100755
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
##
AC_PREREQ(2.60)
-AC_INIT(frr, 6.0, [https://github.com/frrouting/frr/issues])
+AC_INIT(frr, 6.0.1, [https://github.com/frrouting/frr/issues])
PACKAGE_URL="https://frrouting.org/"
AC_SUBST(PACKAGE_URL)
PACKAGE_FULLNAME="FRRouting"
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index 51ec7006df..f533f9f4a9 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -663,7 +663,12 @@ fi
%changelog
-* Sun Oct 7 2018 Martin Winter <mwinter@opensourcerouting.org> - %{version}
+* Sat Dec 29 2018 Martin Winter <mwinter@opensourcerouting.org> - %{version}
+- Various fixes for label manager
+- Fix BGP unnumbered peer setup
+- Various other fixes
+
+* Sun Oct 7 2018 Martin Winter <mwinter@opensourcerouting.org> - 6.0
- Staticd: New daemon responsible for management of static routes
- ISISd: Implement dst-src routing as per draft-ietf-isis-ipv6-dst-src-routing
- BFDd: new daemon for BFD (Bidrectional Forwarding Detection). Responsiblei