gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Till Brehm

2016-01-02 c6611ee0fc88487541f1aa90528a0b9cdcb6a703

refs
author	Till Brehm <tbrehm@ispconfig.org>
	Saturday, January 2, 2016 09:04 -0500
committer	Till Brehm <tbrehm@ispconfig.org>
	Saturday, January 2, 2016 09:04 -0500
commit	c6611ee0fc88487541f1aa90528a0b9cdcb6a703
tree	7a967458cfc95e0f0bc008ec1f28cbbc63bff548 tree \| zip \| gz
parent	ea30e1c0fecdc0e44afb5fb20a9b407087dd553a view \| diff 2c7813beca5e10b268e64736d2c791a1e7248c76 view \| diff

Merge branch 'master' into 'master'

use mktemp in update scripts to avoid race conditions



See merge request !254

5 files modified

	interface/lib/classes/validate_dkim.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/validate_openvz.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/mail_plugin_dkim.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	server/scripts/update_from_dev.sh	20 ●●●●● diff \| view \| raw \| blame \| history
	server/scripts/update_from_tgz.sh	30 ●●●●● diff \| view \| raw \| blame \| history