diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-01-26 15:40:32 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-01-26 15:40:32 +0100 |
| commit | 9740fad81dce0f9389f157ac739473d17ad67839 (patch) | |
| tree | c71eeae7d425f0bc7c42ded5b9dcbb904a44cce5 /etc/rc.filter_synchronize | |
| parent | 2259901018552f8a8432e295b8d6064fa918cda0 (diff) | |
| parent | ee4fc984e1169a180457b3a10e011fab04fd0f31 (diff) | |
| download | pfsense-9740fad81dce0f9389f157ac739473d17ad67839.zip pfsense-9740fad81dce0f9389f157ac739473d17ad67839.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/system.inc
Diffstat (limited to 'etc/rc.filter_synchronize')
| -rwxr-xr-x | etc/rc.filter_synchronize | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index 15dca87..304d76c 100755 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -383,8 +383,8 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) { $sections[] = 'vouchers'; if (count($sections) > 0) { if (!carp_check_version($synchronizetoip, $carp['password'], $port)) { - update_filter_reload_status("The other member is on older version of {$g['product']}. Sync will not be done to prevent problems!"); - log_error("The other member is on older version of {$g['product']}. Sync will not be done to prevent problems!"); + update_filter_reload_status("The other member is on older configuration version of {$g['product_name']}. Sync will not be done to prevent problems!"); + log_error("The other member is on older configuration version of {$g['product_name']}. Sync will not be done to prevent problems!"); break; } |
