[DEV] open new 1.6 development branch

This new branch is based on 1.5.0, which 1.6-dev0 is 100% equivalent to.
The README has been updated to mention that it is a development branch.

Released version 1.6-dev0 with the following main changes :
    - exact copy of 1.5.0
This commit is contained in:
Willy Tarreau 2014-06-19 21:10:58 +02:00
parent 9229f1248f
commit 15480d7250
5 changed files with 18 additions and 10 deletions

View File

@ -1,6 +1,9 @@
ChangeLog : ChangeLog :
=========== ===========
2014/06/19 : 1.6-dev0
- exact copy of 1.5.0
2014/06/19 : 1.5.0 2014/06/19 : 1.5.0
- MEDIUM: ssl: ignored file names ending as '.issuer' or '.ocsp'. - MEDIUM: ssl: ignored file names ending as '.issuer' or '.ocsp'.
- MEDIUM: ssl: basic OCSP stapling support. - MEDIUM: ssl: basic OCSP stapling support.

16
README
View File

@ -1,7 +1,7 @@
---------------------- ----------------------
HAProxy how-to HAProxy how-to
---------------------- ----------------------
version 1.5 version 1.6-dev
willy tarreau willy tarreau
2014/06/19 2014/06/19
@ -9,12 +9,14 @@
1) How to build it 1) How to build it
------------------ ------------------
First, please note that this version is a stable version, so in general if you First, please note that this version is a development version, so in general if
are not used to build from sources, it is recommended that instead you follow you are not used to build from sources or if you don't have the time to track
the packaged updates provided by your software vendor or Linux distribution. very frequent updates, it is recommended that instead you switch to the stable
Most of them are taking this task seriously and are doing a good job. If for version (1.5) or follow the packaged updates provided by your software vendor
any reason you'd prefer a different version than the one packaged for your or Linux distribution. Most of them are taking this task seriously and are
system, or to get some commercial support, other choices are available at : doing a good job. If for any reason you'd prefer a different version than the
one packaged for your system, or to get some commercial support, other choices
are available at :
http://www.haproxy.com/ http://www.haproxy.com/

View File

@ -1 +1 @@
1.5.0 1.6-dev0

View File

@ -2,7 +2,7 @@
HAProxy HAProxy
Configuration Manual Configuration Manual
---------------------- ----------------------
version 1.5 version 1.6
willy tarreau willy tarreau
2014/06/19 2014/06/19

View File

@ -1,6 +1,6 @@
Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
Name: haproxy Name: haproxy
Version: 1.5.0 Version: 1.6-dev0
Release: 1 Release: 1
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
@ -76,6 +76,9 @@ fi
%attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name} %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
%changelog %changelog
* Thu Jun 19 2014 Willy Tarreau <w@1wt.eu>
- updated to 1.6-dev0
* Thu Jun 19 2014 Willy Tarreau <w@1wt.eu> * Thu Jun 19 2014 Willy Tarreau <w@1wt.eu>
- updated to 1.5.0 - updated to 1.5.0