Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | jim-p | 2011-07-12 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/interfaces.inc etc/inc/services.inc etc/inc/xmlrpc_client.inc usr/local/www/fbegin.inc usr/local/www/services_dhcp.php | ||||
| * | Do a more strict check on this to avoid warnings | Ermal | 2011-07-12 | 1 | -1/+1 |
| | | |||||
* | | Merge remote branch 'upstream/master' | jim-p | 2011-06-15 | 1 | -4/+6 |
|\ \ | |/ | |||||
| * | Faster/more efficient xmlrpc sync for users/groups. Seems to work fine for ↵ | jim-p | 2011-06-15 | 1 | -4/+6 |
| | | | | | | | | me. Coded-By: Ermal | ||||
* | | Merge remote branch 'upstream/master' | jim-p | 2011-06-14 | 1 | -19/+19 |
|\ \ | |/ | | | | | | | | | Conflicts: etc/inc/globals.inc etc/inc/upgrade_config.inc | ||||
| * | Use the new username field from the GUI or default to admin. | Ermal | 2011-06-14 | 1 | -16/+14 |
| | | |||||
| * | Actually correct check so it throws some errors during the second try. | Ermal | 2011-06-14 | 1 | -2/+2 |
| | | |||||
| * | Porvide information for the filter reload status screen. | Ermal | 2011-06-14 | 1 | -1/+3 |
| | | |||||
* | | Merge remote branch 'upstream/master' | jim-p | 2011-06-01 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | | | Conflicts: conf.default/config.xml etc/inc/filter.inc etc/inc/globals.inc etc/inc/pfsense-utils.inc etc/inc/upgrade_config.inc usr/local/www/interfaces.php | ||||
| * | Use pfsense.restore_config_section | Scott Ullrich | 2011-05-31 | 1 | -1/+1 |
| | | |||||
* | | Merge remote branch 'upstream/master' | jim-p | 2011-05-19 | 1 | -3/+4 |
|\ \ | |/ | |||||
| * | Fixes #1514. Differentiate in the carp settings between layer7, limiter and ↵ | Ermal | 2011-05-18 | 1 | -3/+4 |
| | | | | | | | | queues so layer7 and limiters do not rely on queues being active. | ||||
* | | Merge remote branch 'upstream/master' | Seth Mos | 2011-04-12 | 1 | -4/+7 |
|\ \ | |/ | | | | | | | | | Conflicts: etc/inc/filter.inc usr/local/www/themes/the_wall/rrdcolors.inc.php | ||||
| * | By default assume admin user and do not blindly copy the first user from the ↵ | Ermal | 2011-03-30 | 1 | -3/+6 |
| | | | | | | | | config.xml | ||||
| * | clarify log | Chris Buechler | 2011-03-30 | 1 | -1/+1 |
| | | |||||
* | | Merge remote branch 'upstream/master' | Seth Mos | 2011-03-24 | 1 | -19/+18 |
|\ \ | |/ | | | | | | | | | Conflicts: etc/inc/rrd.inc usr/local/www/interfaces.php | ||||
| * | Log the configuration is not the same error message only when this is true. ↵ | Ermal | 2011-03-17 | 1 | -19/+18 |
| | | | | | | | | This message would have been shown even when a communication error would occur. | ||||
* | | Merge remote branch 'upstream/master' | Seth Mos | 2011-02-11 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | fix text | Chris Buechler | 2011-02-10 | 1 | -2/+2 |
| | | |||||
* | | Merge remote branch 'upstream/master' | Seth Mos | 2011-02-06 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Ticket #1248. Do not set this higher since the slave will take more time to ↵ | Ermal | 2011-02-03 | 1 | -1/+0 |
| | | | | | | | | detect a switch needs to be done. | ||||
* | | Merge remote branch 'upstream/master' | Seth Mos | 2011-02-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Allow ipalias with carp as parent interface to be synchronized. | Ermal | 2011-02-01 | 1 | -2/+2 |
| | | |||||
* | | Merge remote branch 'upstream/master' | Seth Mos | 2011-01-26 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | Conflicts: etc/inc/system.inc | ||||
| * | fix variable and text for this log | Chris Buechler | 2011-01-22 | 1 | -2/+2 |
| | | |||||
* | | Merge remote branch 'upstream/master' | Seth Mos | 2011-01-18 | 1 | -36/+35 |
|\ \ | |/ | | | | | | | | | Conflicts: etc/inc/interfaces.inc etc/inc/system.inc | ||||
| * | Fix whitespace. | Scott Ullrich | 2010-12-22 | 1 | -37/+36 |
| | | |||||
* | | Merge remote branch 'upstream/master' | Seth Mos | 2010-12-20 | 1 | -23/+83 |
|\ \ | |/ | | | | | | | | | | | Conflicts: etc/inc/interfaces.inc etc/inc/vslb.inc usr/local/www/interfaces.php | ||||
| * | Leave a notice for this as well. | Ermal | 2010-12-10 | 1 | -0/+2 |
| | | |||||
| * | If we fail to authenticate consider it as fatal since nothing else can be done. | Ermal | 2010-12-10 | 1 | -2/+2 |
| | | |||||
| * | Fix config synchronization. Also unbreak the config when erroring out ↵ | Ermal | 2010-12-10 | 1 | -11/+9 |
| | | | | | | | | because it will loop indefinitely. | ||||
| * | Hmmm use correct keys to returned array. | Ermal | 2010-12-10 | 1 | -2/+2 |
| | | |||||
| * | Just the password here. | Ermal | 2010-12-10 | 1 | -1/+0 |
| | | |||||
| * | Hello xmlrpc to another function! | Ermal | 2010-12-10 | 1 | -1/+1 |
| | | |||||
| * | Adjust even advbase while synching. This should be params though. | Ermal | 2010-12-07 | 1 | -0/+7 |
| | | |||||
| * | Prevent sync problems when upgrading carp clusters. Now we check that the ↵ | Ermal | 2010-12-07 | 1 | -12/+69 |
| | | | | | | | | other cluster is at least at our config file version. | ||||
| * | Whitespace fixes to make this readble. | Ermal | 2010-12-07 | 1 | -1/+1 |
| | | |||||
| * | Tighten check even more. Ticket #1006. | Ermal | 2010-11-16 | 1 | -1/+1 |
| | | |||||
| * | Ticket #1006. Make sure to interpret the response as needed. First check if ↵ | Ermal | 2010-11-16 | 1 | -5/+2 |
| | | | | | | | | we got 0 and then check if we have a faultCode(). | ||||
* | | Properly format the IPv6 address within brackets so that Carp sync to a ipv6 ↵ | Seth Mos | 2010-11-15 | 1 | -0/+2 |
|/ | | | | address works | ||||
* | Various sync fixes to ensure sections are pushed even if empty, otherwise ↵ | jim-p | 2010-11-01 | 1 | -20/+53 |
| | | | | the last entries of these sections cannot be deleted and have that deletion sync to the secondary. | ||||
* | Ooops use meant logic. | Ermal | 2010-10-27 | 1 | -1/+1 |
| | |||||
* | Ticket #975. Properly initialize variables to avoid caching issues. Also ↵ | Ermal | 2010-10-27 | 1 | -5/+8 |
| | | | | check an array exists before trying to foreach to avoid errors. | ||||
* | If there are no aliases, push an empty aliases array. Fixes #961 | jim-p | 2010-10-25 | 1 | -1/+4 |
| | |||||
* | Add l7 rules synchro. Ticket #951 | pierrepomes | 2010-10-24 | 1 | -0/+2 |
| | |||||
* | Sync CRLs, too. | jim-p | 2010-10-20 | 1 | -0/+3 |
| | |||||
* | ipalias type should be handled in backup_vip_config_section. Remove useless ↵ | pierrepomes | 2010-10-18 | 1 | -11/+1 |
| | | | | code which copies vip section before call to backup_vip_config_section. Ticket #882 | ||||
* | Do not synchronize ip alias. Ticket #882 | pierrepomes | 2010-09-26 | 1 | -2/+4 |
| | |||||
* | Update sync code since CERT/CA have moved. | jim-p | 2010-09-02 | 1 | -4/+8 |
| | |||||
* | Add Captive Portal CARP configuration synchronization | Scott Ullrich | 2010-08-29 | 1 | -202/+208 |
| |