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 /etc/inc/globals.inc | |
| 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 'etc/inc/globals.inc')
| -rw-r--r-- | etc/inc/globals.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index da1a87f..6993148 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -153,7 +153,6 @@ $sysctls = array("net.inet.ip.portrange.first" => "1024", "net.link.bridge.pfil_member" => "1", "net.link.bridge.pfil_bridge" => "0", "net.link.tap.user_open" => "1", - "kern.rndtest.verbose" => "0", "kern.randompid" => "347", "net.inet.ip.intr_queue_maxlen" => "1000", "hw.syscons.kbd_reboot" => "0", |
