diff --git a/fhem/CHANGED b/fhem/CHANGED index 2112e7932..93aff4e31 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,8 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 6.0 released + +- 2020-01-26 (6.0) - new: MSwitch_Wizard: preparation for Mswitch V3.0 - change: 93_DbLog: default Event parsing changed again, Forum: #106769 - change: 93_DbRep: adjust behavior of writeToDB - write value at every begin diff --git a/fhem/Makefile b/fhem/Makefile index f464de110..0f30a3858 100644 --- a/fhem/Makefile +++ b/fhem/Makefile @@ -1,7 +1,7 @@ # $Id$ -VERS=5.9 -DATE=2018-10-07 +VERS=6.0 +DATE=2020-01-26 # used for nightly build DATEN=$(shell date +"%Y-%m-%d") diff --git a/fhem/UPGRADE b/fhem/UPGRADE index 42858cba5..5058cafe8 100644 --- a/fhem/UPGRADE +++ b/fhem/UPGRADE @@ -33,6 +33,7 @@ enable the old feature. FLORRPLAN users - the default fhem.cfg does not contain a telnet definition -- XXXX-XX-XX (6.0) +- 2020-01-26 (6.0) - attribute names can only consist of the character A-Za-z/\d_\.- - - the length of attribute and reading names must be 64 or less + - 98_structure: propagateAttr defaults to empty and not to all => setting + attributes on structure wont be set automatically on the members. diff --git a/fhem/fhem.pl b/fhem/fhem.pl index 52048c738..8ae5eccd2 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -307,7 +307,7 @@ my %fuuidHash; # for duplicate checking $init_done = 0; $lastDefChange = 0; $readytimeout = ($^O eq "MSWin32") ? 0.1 : 5.0; -$featurelevel = 5.9; # see also GlobalAttr +$featurelevel = 6.0; # see also GlobalAttr $modules{Global}{ORDER} = -1; @@ -2751,7 +2751,7 @@ GlobalAttr($$$$) if($type eq "del") { my %noDel = ( modpath=>1, verbose=>1, logfile=>1, configfile=>1 ); return "The global attribute $name cannot be deleted" if($noDel{$name}); - $featurelevel = 5.9 if($name eq "featurelevel"); + $featurelevel = 6.0 if($name eq "featurelevel"); $haveInet6 = 0 if($name eq "useInet6"); # IPv6 delete($defs{global}{ignoreRegexpObj}) if($name eq "ignoreRegexp"); return undef;