From 48dfc1201f1d918a083dab32913fcfdbf35790ff Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Thu, 14 May 2020 14:14:14 +0200 Subject: [PATCH] Bumped version to 4.6.0.PRE --- CHANGELOG.md | 6 +++++- README.md | 2 +- configure | 4 ++-- configure.ac | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7139d9d..8c91d940 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Clixon Changelog +* [4.6.0](#460) Expected: July 2020 * [4.5.0](#450) 12 May 2020 * [4.4.0](#440) 5 April 2020 * [4.3.0](#430) 1 January 2020 @@ -21,6 +22,9 @@ * [3.3.2](#332) Aug 27 2017 * [3.3.1](#331) June 7 2017 +## 4.6.0 +Expected: July 2020 + ## 4.5.0 12 May 2020 @@ -40,7 +44,7 @@ Thanks to everyone at Netgate for making this possible * Two new plugin callbacks added * ca_daemon: Called just after a server has "daemonized", ie put in background. * ca_trans_commit_done: Called when all plugin commits have been done. - * Note: If you have used "end" callback and usign transaction data, you should probably use this instead. + * Note: If you have used "end" callback and using transaction data, you should probably use this instead. ### API changes on existing protocol/config features (For users) diff --git a/README.md b/README.md index 3001bf54..7da4a7af 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ Clixon interaction is best done posting issues, pull requests, or joining the [slack channel](https://clixondev.slack.com). [Slack invite](https://join.slack.com/t/clixondev/shared_invite/enQtMzI3OTM4MzA3Nzk3LTA3NWM4OWYwYWMxZDhiYTNhNjRkNjQ1NWI1Zjk5M2JjMDk4MTUzMTljYTZiYmNhODkwMDI2ZTkyNWU3ZWMyN2U). -[Netgate](https://www.netgate.com/) sponsors Clixon. +Clixon is sponsored by [Rubicon Communications LLC(Netgate)](https://www.netgate.com/) diff --git a/configure b/configure index a9b71732..e91643a7 100755 --- a/configure +++ b/configure @@ -2203,9 +2203,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. CLIXON_VERSION_MAJOR="4" -CLIXON_VERSION_MINOR="5" +CLIXON_VERSION_MINOR="6" CLIXON_VERSION_PATCH="0" -CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\"" +CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\"" # Check CLIgen if test "$prefix" = "NONE"; then diff --git a/configure.ac b/configure.ac index c75665c7..c654f3ac 100644 --- a/configure.ac +++ b/configure.ac @@ -48,9 +48,9 @@ AC_INIT(lib/clixon/clixon.h.in) AC_CONFIG_AUX_DIR(aux) CLIXON_VERSION_MAJOR="4" -CLIXON_VERSION_MINOR="5" +CLIXON_VERSION_MINOR="6" CLIXON_VERSION_PATCH="0" -CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\"" +CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\"" # Check CLIgen if test "$prefix" = "NONE"; then