diff --git a/CHANGED b/CHANGED index 8d9666c66..e0eeb35d6 100644 --- a/CHANGED +++ b/CHANGED @@ -52,8 +52,6 @@ - feature: motd with SecurityCheck added - feature: telnet module added, attr global port moved. allowfrom changed. - feature: FhemUtils/release.pm for the new update process added. (M. Fischer) - - feature: new global attributes updateserver, updatepath, updatectrlfile - for the new update process added (M. Fischer) - 2011-12-31 (5.2) - bugfix: applying smallscreen attributes to firefox/opera diff --git a/FHEM/FhemUtils/release.pm b/FHEM/FhemUtils/release.pm index 18f37f988..d83b67c53 100644 --- a/FHEM/FhemUtils/release.pm +++ b/FHEM/FhemUtils/release.pm @@ -12,7 +12,7 @@ use vars qw(%UPDATE); $DISTRIB_ID="Fhem"; $DISTRIB_RELEASE="5.2"; -$DISTRIB_BRANCH="EXPERIMENTAL"; +$DISTRIB_BRANCH="DEVELOPMENT"; $DISTRIB_DESCRIPTION="$DISTRIB_ID $DISTRIB_RELEASE ($DISTRIB_BRANCH)"; $UPDATE{server} = "http://fhem.de"; diff --git a/fhem.pl b/fhem.pl index 21ff19f79..cd462f836 100755 --- a/fhem.pl +++ b/fhem.pl @@ -196,8 +196,7 @@ $modules{Global}{AttrList} = "verbose:1,2,3,4,5 mseclog version nofork logdir holiday2we " . "autoload_undefined_devices dupTimeout latitude longitude " . "backupcmd backupdir backupsymlink backup_before_update " . - "exclude_from_update motd updatebranch updateserver updatepath " . - "updatectrlfile "; + "exclude_from_update motd updatebranch "; $modules{Global}{AttrFn} = "GlobalAttr";