Merge branch 'master' into issue-1650

This commit is contained in:
Aaron Daniels
2016-01-15 17:52:40 +10:00
38 changed files with 811 additions and 222 deletions
+1
View File
@@ -0,0 +1 @@
ALTER TABLE `perf_times` ADD `poller` VARCHAR( 255 ) NOT NULL ;
+1
View File
@@ -0,0 +1 @@
INSERT INTO config (config_name,config_value,config_default,config_descr,config_group,config_group_order,config_sub_group,config_sub_group_order,config_hidden,config_disabled) values ('oxidized.reload_nodes','false','false','Reload Oxidized nodes list, each time a device is added','external',0,'oxidized',0,'0','0');