added some points to ChangeLog and increase the version to 1.2.6.rc2

munin-monitoring · Apr 29, 2008 · 2ac707b · 2ac707b
1 parent a8c8e99
commit 2ac707b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,17 @@
+munin (1.2.6rc2)
+	* [r1599] server/Munin.pm.in: added "ok" and "unknown" to @legal,
+	  this is the missing part from r1469 (merged r1288 from trunk)
+
+	* [r1590] node/node.d/multips.in: copied node.d/multips.in from
+	  trunk
+
+	* [r1589] node/node.d.linux/df_abs.in,
+	  node/node.d.linux/df_inode.in: As suggested in Debian #454260 /
+	  Trac #572 exclude the same filesystems in all df*-plugins
+
+	* [r1588] server/munin-graph.in: remove the not used and error
+	  causing array NEWCOLOUR
+
 munin (1.2.6rc1)
 	* [r1584] server/Munin.pm.in: fix locking bug, lock was not created
 	  (same like r1437)

diff --git a/RELEASE b/RELEASE
@@ -1 +1 @@
-1.2.6rc1
+1.2.6rc2