prep master for new checkins

diff --git a/CHANGES b/CHANGES
index 934256fd8df9cff307c63a13d4be4dd466b94e86..2b9a7801292ac77c60ee0e84d2eeafad13bdbb32 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,41 @@
-RRDtool 1.5.x - 2015-xx-xx
+RRDtool 1.6.0 - 2016-04-19
+==========================
+Features
+--------
+* librrd is now fully thread-safe. librrd_th is gone
+* make lua bindings work with lua 5.1
+* configure option to disable doc building --enable-docs=no
+* new CDEF function SMIN: a,b,c,3,SMIN -> min(a,b,c)
+* new CDEF function SMAX: a,b,c,3,SMAX -> max(a,b,c)
+* new CDEF function STDEV: a,b,c,3,STDEV -> stdev(a,b,c)
+* new CDEF function POW: a,b,POW -> a**b
+* new CDEF function PERCENT: a,b,c,95,3,PERCENT -> find 95percentile of a,b,c
+* re-introducted --showtime option on rrdxport
+* be more careful in determining the locales idea of first day of the week
+* lots of spelling fixes all around
+
+RRDtool 1.5.6 - 2016-04-19
+==========================
+
+Bugfixes
+--------
+* segfault on CDEF:x=
+* Disable nagel algorithm as it is causing massive slowdown
+* make vname nameing rules more liberal and more in line with 1.4
+* Fix recursive directory creation in rrdcached on FREEBSD
+* Fixed compilation when there's no sigwaitinfo
+
+RRDtool 1.5.5 - 2015-11-10
 ==========================
 
 Bugfixes
 --------
-* shorten test precision to 7 digits ... 
+* fix JSON output in xport with legend and gprint blocks
+* fix parse_time mutex unlocking in the error case
+* don't crash on invalid variable names in CDEF
+* add mutex locking in rrdc_fetch
+* fix buffer overflow in rrd_restore
+* shorten test precision to 7 digits ...
 * never exit from a library function
 * buffer overflow in rrd_restore.c fixed #669
 

diff --git a/NEWS b/NEWS
index c92c4a95071ec30666ed1ebb9f3c89bb652925a5..de6dfe7d840124d47e5821fd6390c80ab962d730 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+#####################################
+Major Changes between 1.6.x and 1.6.x
+-------------------------------------
+API
+---
+* librrd_th is gone. librrd is now fully thread-safe
+
+RRD Graph
+---------
+* new CDEF function SMIN: a,b,c,3,SMIN -> min(a,b,c)
+* new CDEF function SMAX: a,b,c,3,SMAX -> max(a,b,c)
+* new CDEF function STDEV: a,b,c,3,STDEV -> stdev(a,b,c)
+* new CDEF function POW: a,b,POW -> a**b
+* new CDEF function PERCENT: a,b,c,95,3,PERCENT -> find 95percentile of a,b,c
+
 #####################################
 Major Changes between 1.4.x and 1.5.x
 -------------------------------------
@@ -36,11 +51,11 @@ API
 libDBI
 ------
 * make rrdfillmissing actually work. The parameter is now in seconds and not
-  in steps for ease of use by Hans Jørgen Jakobsen
+  in steps for ease of use by Hans J�rgen Jakobsen
 
 Bindings
 --------
-* dotnet by  Chris Larsen of Euphoria Audio  
+* dotnet by  Chris Larsen of Euphoria Audio
 
 
 #####################################
@@ -91,7 +106,7 @@ by Martin Sperl
 Miscellaneous Changes
 ---------------------
 * graph legends can now be placed left, right or above the graph with the
-  new --legend-direction and --legend-positon placement options. 
+  new --legend-direction and --legend-positon placement options.
   by Melchior Rabe
 
 * switched to using automake 1.11 which provides a 'silent' build process,
@@ -113,11 +128,11 @@ Miscellaneous Changes
 * allow the HW smoothing window size to be set to 0 with rrdtool tune
   by sylvain luiset
 
-* new graph option --border to set the 3d border width 
+* new graph option --border to set the 3d border width
   by Bernhard Reutner-Fischer
 
 * draw different color markers (enable with --dynamic-labels) depending on the
-  type of element in the graph by Loïc Tortay
+  type of element in the graph by Lo�c Tortay
 
 for more detail see the CHANGES file.
 
@@ -231,7 +246,7 @@ Graphing
   - anti-aliased output
   - alpha transparency support
   - truetype fonts
- 
+
 * additional graphics formats: EPS, PDF, SVG
 
 * extended multi-part documentation
@@ -257,7 +272,7 @@ Logging
 
 * COMPUTE data type for artificial data-sources calculating their
   input using RPN math and data from the other data-sources.
- 
+
 Incompatibilities
 -----------------
 * Colons in COMMENT arguments to rrdtool graph must be escaped with a backslash

diff --git a/configure.ac b/configure.ac
index 9995314aee03ec98670907541df8176fb76fd6e6..67d046edd2e7f2cf2d95c085454775dd80ad59d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl the released version are
 dnl a.bccc
 dnl the devel versions will be something like
 dnl a.b999yymmddhh
-NUMVERS=1.6000
+NUMVERS=1.6999
 AC_SUBST(NUMVERS)
 
 dnl for the linker to understand which versions the library are compatible with

diff --git a/doc/rrdbuild.pod b/doc/rrdbuild.pod
index cca13bd284786038d62c96197a6d976a51a8f8ef..853b407fe651beb06a62dce85457068a258c02b9 100644 (file)
--- a/doc/rrdbuild.pod
+++ b/doc/rrdbuild.pod
@@ -41,7 +41,7 @@ Where you want to install the software.
 Once you have decided. Save the two locations into environment variables.
 
  BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/opt/rrdtool-1.5.999
+ INSTALL_DIR=/opt/rrdtool-1.6.0
 
 
 If your F</tmp> is mounted with the option noexec (RHEL seems todo that) you have to choose
@@ -55,9 +55,9 @@ Now make sure the BUILD_DIR exists and go there:
 Lets first assume you already have all the necessary libraries
 pre-installed. 
 
- wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.999.tar.gz
- gunzip -c rrdtool-1.5.999.tar.gz | tar xf -
- cd rrdtool-1.5.999
+ wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
+ gunzip -c rrdtool-1.6.0.tar.gz | tar xf -
+ cd rrdtool-1.6.0
  ./configure --prefix=$INSTALL_DIR && make && make install
 
 Ok, this was very optimistic. This try will probably have ended with
@@ -345,7 +345,7 @@ because it seems that a fair number of people have ill configured python and
 tcl setups that would prevent RRDtool from building if they are included in
 their current state.
 
- cd $BUILD_DIR/rrdtool-1.5.999
+ cd $BUILD_DIR/rrdtool-1.6.0
  ./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
  $MAKE clean
  $MAKE