diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-05-03 10:09:06 +0200 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-05-03 10:09:06 +0200 |
| commit | dcb846e3cd1604ec9c0a024b6bd721d306bbce46 (patch) | |
| tree | 49624a702780f2714c9141ead186bfe113043550 /conf.default/config.xml | |
| parent | 03f824a5e540cb32a025b79ddc29baba4d1ea959 (diff) | |
| parent | 8c218e1d0190a218686cf2b65913be3198791206 (diff) | |
| download | pfsense-dcb846e3cd1604ec9c0a024b6bd721d306bbce46.zip pfsense-dcb846e3cd1604ec9c0a024b6bd721d306bbce46.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
usr/local/www/status_rrd_graph_img.php
Diffstat (limited to 'conf.default/config.xml')
| -rw-r--r-- | conf.default/config.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/conf.default/config.xml b/conf.default/config.xml index 42662f7..b291c38 100644 --- a/conf.default/config.xml +++ b/conf.default/config.xml @@ -101,11 +101,6 @@ <value>default</value> </item> <item> - <descr><![CDATA[Verbosity of the rndtest driver (0: do not display results on console)]]></descr> - <tunable>kern.rndtest.verbose</tunable> - <value>default</value> - </item> - <item> <descr><![CDATA[Randomize PID's (see src/sys/kern/kern_fork.c: sysctl_kern_randompid())]]></descr> <tunable>kern.randompid</tunable> <value>default</value> |
