diff --git a/CMakeLists.txt b/CMakeLists.txt index 30d6f598..df9c16da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ project(mosquitto) cmake_minimum_required(VERSION 2.6) -set (VERSION 1.3.1) +set (VERSION 1.3.2) if (WIN32) execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP diff --git a/ChangeLog.txt b/ChangeLog.txt index 312b3194..fe735351 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,12 +1,4 @@ -Broker: -- Default TLS mode now accepts TLS v1.2, v1.1 and v1.0. -- Support for ECDHE-ECDSA family ciphers. - -Clients: -- Both clients can now load default configuration options from a file. -- Add -1 (oneshot) option to mosquitto_sub. - -1.3.2 - 2014xxxx +1.3.2 - 20140713 ================ Broker: diff --git a/config.mk b/config.mk index bd588fd5..2d5c36e9 100644 --- a/config.mk +++ b/config.mk @@ -83,7 +83,7 @@ WITH_DOCS:=yes # Also bump lib/mosquitto.h, lib/python/setup.py, CMakeLists.txt, # installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi -VERSION=1.3.1 +VERSION=1.3.2 TIMESTAMP:=$(shell date "+%F %T%z") # Client library SO version. Bump if incompatible API/ABI changes are made. diff --git a/installer/mosquitto-cygwin.nsi b/installer/mosquitto-cygwin.nsi index c79c3cd2..e45cdbf7 100644 --- a/installer/mosquitto-cygwin.nsi +++ b/installer/mosquitto-cygwin.nsi @@ -7,7 +7,7 @@ !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' Name "mosquitto" -!define VERSION 1.3.1 +!define VERSION 1.3.2 OutFile "mosquitto-${VERSION}-install-cygwin.exe" InstallDir "$PROGRAMFILES\mosquitto" diff --git a/installer/mosquitto.nsi b/installer/mosquitto.nsi index 30db4e28..9ffe54b4 100644 --- a/installer/mosquitto.nsi +++ b/installer/mosquitto.nsi @@ -7,7 +7,7 @@ !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' Name "mosquitto" -!define VERSION 1.3.1 +!define VERSION 1.3.2 OutFile "mosquitto-${VERSION}-install-win32.exe" InstallDir "$PROGRAMFILES\mosquitto" diff --git a/lib/mosquitto.h b/lib/mosquitto.h index 27535929..7ebb81eb 100644 --- a/lib/mosquitto.h +++ b/lib/mosquitto.h @@ -45,7 +45,7 @@ extern "C" { #define LIBMOSQUITTO_MAJOR 1 #define LIBMOSQUITTO_MINOR 3 -#define LIBMOSQUITTO_REVISION 1 +#define LIBMOSQUITTO_REVISION 2 /* LIBMOSQUITTO_VERSION_NUMBER looks like 1002001 for e.g. version 1.2.1. */ #define LIBMOSQUITTO_VERSION_NUMBER (LIBMOSQUITTO_MAJOR*1000000+LIBMOSQUITTO_MINOR*1000+LIBMOSQUITTO_REVISION)