[Opsview-checkins] [opsview] [12366] Merged from Commercial ?\226?\128?\148 ' New notification methods should default to run on the master, not a slave.'

Tue, 28 May 2013 05:22:31 -0700

Title: [opsview] [12366] Merged from Commercial ?\226?\128?\148 'New notification methods should default to run on the master, not a slave.'
Revision
12366
Author
pknight
Date
2013-05-28 13:22:25 +0100 (Tue, 28 May 2013)

Log Message

Merged from Commercial ?\226?\128?\148 'New notification methods should default to run on the master, not a slave.'


Modified Paths




Property Changed





Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,12189
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
   + /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/US539:12178-12182
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,12189,12322,12355
/branches/nagvis-iframe:9764-9786
/branches/opsview2runtime:10960-11258
/branches/opsview2runtime_xs:11279-11303
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10944,11017
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837


Property changes on: trunk/opsview-core
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/DEV-capside/release-3.9.0/opsview-core:6365-6370
/branches/DEV-extra-notification-data/opsview-core:6734-6746
/branches/DEV-odw-calculations/opsview-core:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core:9778
/branches/DEV-snmp-multi/opsview-core:7324-7376
/branches/US187/opsview-core:9403-9479
/branches/US198b/opsview-core:8875-8994
/branches/US310/opsview-core:9851-9873
/branches/US539/opsview-core:12178-12182
/branches/enterprise/BRAN-3.14/opsview-core:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,12189
/branches/nagvis-iframe/opsview-core:9764-9786
/branches/opsview2runtime/opsview-core:10960-11258
/branches/opsview2runtime_xs/opsview-core:11279-11303
/branches/us168/opsview-core:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10966
/commercial/branches/BRAN-4.2/opsview-core:10944,10966,11017
/commercial/branches/US306-slaves/opsview-core:9804-9823
/commercial/branches/US307-network-map/opsview-core:9685-9837
   + /branches/DEV-capside/release-3.9.0/opsview-core:6365-6370
/branches/DEV-extra-notification-data/opsview-core:6734-6746
/branches/DEV-odw-calculations/opsview-core:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core:9778
/branches/DEV-snmp-multi/opsview-core:7324-7376
/branches/US187/opsview-core:9403-9479
/branches/US198b/opsview-core:8875-8994
/branches/US310/opsview-core:9851-9873
/branches/US539/opsview-core:12178-12182
/branches/enterprise/BRAN-3.14/opsview-core:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,11798-11799,12189,12322,12355
/branches/nagvis-iframe/opsview-core:9764-9786
/branches/opsview2runtime/opsview-core:10960-11258
/branches/opsview2runtime_xs/opsview-core:11279-11303
/branches/us168/opsview-core:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2:10966
/commercial/branches/BRAN-4.2/opsview-core:10944,10966,11017
/commercial/branches/US306-slaves/opsview-core:9804-9823
/commercial/branches/US307-network-map/opsview-core:9685-9837

Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview	2013-05-28 11:57:26 UTC (rev 12365)
+++ trunk/opsview-core/bin/db_opsview	2013-05-28 12:22:25 UTC (rev 12366)
@@ -964,7 +964,7 @@
                 active tinyint(1) NOT NULL DEFAULT 1,
                 name varchar(64) NOT NULL,
                 namespace varchar(255) NOT NULL,
-                master tinyint(1) NOT NULL DEFAULT 0,
+                master tinyint(1) NOT NULL DEFAULT 1,
                 command text,
                 priority int NOT NULL DEFAULT 1,
                 uncommitted int DEFAULT 0 NOT NULL,
@@ -1233,6 +1233,7 @@
     INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130221snmpthro', 'install', NOW());
     INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130219hsteh', 'install', NOW());
     INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130424alerts', 'install', NOW());
+    INSERT INTO schema_version (major_release, version, created_at) VALUES ('20130521notmeth', 'install', NOW());
 
 EOF
 	populate_db


Property changes on: trunk/opsview-core/bin/nagconfgen.pl
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/DEV-capside/release-3.9.0/opsview-core/bin/nagconfgen.pl:6365-6370
/branches/DEV-extra-notification-data/opsview-core/bin/nagconfgen.pl:6734-6746
/branches/DEV-odw-calculations/opsview-core/bin/nagconfgen.pl:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core/bin/nagconfgen.pl:9778
/branches/DEV-snmp-multi/opsview-core/bin/nagconfgen.pl:7324-7376
/branches/US187/opsview-core/bin/nagconfgen.pl:9403-9479
/branches/US198b/opsview-core/bin/nagconfgen.pl:8875-8994
/branches/US310/opsview-core/bin/nagconfgen.pl:9851-9873
/branches/US539/opsview-core/bin/nagconfgen.pl:12178-12182
/branches/enterprise/BRAN-3.14/opsview-core/bin/nagconfgen.pl:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core/bin/nagconfgen.pl:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,12189
/branches/nagvis-iframe/opsview-core/bin/nagconfgen.pl:9764-9786
/branches/opsview2runtime/opsview-core/bin/nagconfgen.pl:10960-11258
/branches/opsview2runtime_xs/opsview-core/bin/nagconfgen.pl:11279-11303
/branches/us168/opsview-core/bin/nagconfgen.pl:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2/bin/nagconfgen.pl:10966
/commercial/branches/BRAN-4.2/opsview-core/bin/nagconfgen.pl:10944,10966,11017
/commercial/branches/BRAN-4.2/opsview-core/bin-protected/nagconfgen.pl:11017
/commercial/branches/US306-slaves/opsview-core/bin/nagconfgen.pl:9804-9823
/commercial/branches/US307-network-map/opsview-core/bin/nagconfgen.pl:9685-9837
   + /branches/DEV-capside/release-3.9.0/opsview-core/bin/nagconfgen.pl:6365-6370
/branches/DEV-extra-notification-data/opsview-core/bin/nagconfgen.pl:6734-6746
/branches/DEV-odw-calculations/opsview-core/bin/nagconfgen.pl:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core/bin/nagconfgen.pl:9778
/branches/DEV-snmp-multi/opsview-core/bin/nagconfgen.pl:7324-7376
/branches/US187/opsview-core/bin/nagconfgen.pl:9403-9479
/branches/US198b/opsview-core/bin/nagconfgen.pl:8875-8994
/branches/US310/opsview-core/bin/nagconfgen.pl:9851-9873
/branches/US539/opsview-core/bin/nagconfgen.pl:12178-12182
/branches/enterprise/BRAN-3.14/opsview-core/bin/nagconfgen.pl:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core/bin/nagconfgen.pl:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11360-11612,12189,12322,12355
/branches/nagvis-iframe/opsview-core/bin/nagconfgen.pl:9764-9786
/branches/opsview2runtime/opsview-core/bin/nagconfgen.pl:10960-11258
/branches/opsview2runtime_xs/opsview-core/bin/nagconfgen.pl:11279-11303
/branches/us168/opsview-core/bin/nagconfgen.pl:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2/bin/nagconfgen.pl:10966
/commercial/branches/BRAN-4.2/opsview-core/bin/nagconfgen.pl:10944,10966,11017
/commercial/branches/BRAN-4.2/opsview-core/bin-protected/nagconfgen.pl:11017
/commercial/branches/US306-slaves/opsview-core/bin/nagconfgen.pl:9804-9823
/commercial/branches/US307-network-map/opsview-core/bin/nagconfgen.pl:9685-9837

Modified: trunk/opsview-core/import/initial_opsview.sql
===================================================================
--- trunk/opsview-core/import/initial_opsview.sql	2013-05-28 11:57:26 UTC (rev 12365)
+++ trunk/opsview-core/import/initial_opsview.sql	2013-05-28 12:22:25 UTC (rev 12366)
@@ -67,9 +67,9 @@
 
 LOCK TABLES `notificationmethods` WRITE;
 /*!40000 ALTER TABLE `notificationmethods` DISABLE KEYS */;
-INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (2,0,'SMS Notification Module','com.opsview.notificationmethods.smsgateway',0,'submit_sms_script',2,0,'PAGER');
-INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (3,1,'Email','com.opsview.notificationmethods.email',0,'notify_by_email',1,0,'EMAIL');
-INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (4,1,'RSS','com.opsview.notificationmethods.rss',0,'notify_by_rss',1,0,'RSS_MAXIMUM_ITEMS,RSS_MAXIMUM_AGE,RSS_COLLAPSED');
+INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (2,0,'SMS Notification Module','com.opsview.notificationmethods.smsgateway',1,'submit_sms_script',2,0,'PAGER');
+INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (3,1,'Email','com.opsview.notificationmethods.email',1,'notify_by_email',1,0,'EMAIL');
+INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (4,1,'RSS','com.opsview.notificationmethods.rss',1,'notify_by_rss',1,0,'RSS_MAXIMUM_ITEMS,RSS_MAXIMUM_AGE,RSS_COLLAPSED');
 INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (5,1,'Push Notifications For IOS Mobile','com.opsview.notificationmethods.iospush',1,'notify_by_ios_push',1,0,NULL);
 /*!40000 ALTER TABLE `notificationmethods` ENABLE KEYS */;
 UNLOCK TABLES;


Property changes on: trunk/opsview-core/installer/nagios_3-4_servicechecks.pl
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/US539/opsview-core/installer/nagios_3-4_servicechecks.pl:12178-12182
/trunk/opsview-core/installer/nagios_3-4_servicechecks.pl:12197-12223,12253-12305,12315
   + /branches/US539/opsview-core/installer/nagios_3-4_servicechecks.pl:12178-12182
/branches/enterprise/DEV-professional/opsview-core/installer/nagios_3-4_servicechecks.pl:12322,12355
/trunk/opsview-core/installer/nagios_3-4_servicechecks.pl:12197-12223,12253-12305,12315

Modified: trunk/opsview-core/installer/upgradedb_opsview.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb_opsview.pl	2013-05-28 11:57:26 UTC (rev 12365)
+++ trunk/opsview-core/installer/upgradedb_opsview.pl	2013-05-28 12:22:25 UTC (rev 12366)
@@ -4735,6 +4735,22 @@
 #    $db->updated;
 #}
 
+unless (
+    $db->is_installed(
+        '20130521notmeth', "New notitication method on master", 'all'
+    )
+  )
+{
+    $dbh->do(
+        q[
+        ALTER TABLE notificationmethods
+        MODIFY master TINYINT(1) NOT NULL DEFAULT '1'
+        ]
+    );
+    $db->updated;
+}
+
+# end of updates
 if ( $postupdate->{regenerate_hostgroups_lft_rgt} ) {
     $db->print( "Regenerating host group information" );
     require Opsview::Schema;


Property changes on: trunk/opsview-core/share/_javascript_/forms.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/DEV-capside/release-3.9.0/opsview-core/share/_javascript_/forms.js:6365-6370
/branches/DEV-extra-notification-data/opsview-core/share/_javascript_/forms.js:6734-6746
/branches/DEV-odw-calculations/opsview-core/share/_javascript_/forms.js:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core/share/_javascript_/forms.js:9778
/branches/DEV-snmp-multi/opsview-core/share/_javascript_/forms.js:7324-7376
/branches/US187/opsview-core/share/_javascript_/forms.js:9403-9479
/branches/US198b/opsview-core/share/_javascript_/forms.js:8875-8994
/branches/US310/opsview-core/share/_javascript_/forms.js:9851-9873
/branches/US539/opsview-core/share/_javascript_/forms.js:12178-12182
/branches/enterprise/BRAN-3.14/opsview-core/share/_javascript_/forms.js:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core/share/_javascript_/forms.js:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10335,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11526,11528,12189
/branches/nagvis-iframe/opsview-core/share/_javascript_/forms.js:9764-9786
/branches/opsview2runtime/opsview-core/share/_javascript_/forms.js:10960-11258
/branches/opsview2runtime_xs/opsview-core/share/_javascript_/forms.js:11279-11303
/branches/us168/opsview-core/share/_javascript_/forms.js:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2/opsview-core/share/_javascript_/forms.js:10944,10966,11017
/commercial/branches/BRAN-4.2/share/_javascript_/forms.js:10966
/commercial/branches/US306-slaves/opsview-core/share/_javascript_/forms.js:9804-9823
/commercial/branches/US307-network-map/opsview-core/share/_javascript_/forms.js:9685-9837
   + /branches/DEV-capside/release-3.9.0/opsview-core/share/_javascript_/forms.js:6365-6370
/branches/DEV-extra-notification-data/opsview-core/share/_javascript_/forms.js:6734-6746
/branches/DEV-odw-calculations/opsview-core/share/_javascript_/forms.js:9016-9160
/branches/DEV-restapi-monitoringservers/opsview-core/share/_javascript_/forms.js:9778
/branches/DEV-snmp-multi/opsview-core/share/_javascript_/forms.js:7324-7376
/branches/US187/opsview-core/share/_javascript_/forms.js:9403-9479
/branches/US198b/opsview-core/share/_javascript_/forms.js:8875-8994
/branches/US310/opsview-core/share/_javascript_/forms.js:9851-9873
/branches/US539/opsview-core/share/_javascript_/forms.js:12178-12182
/branches/enterprise/BRAN-3.14/opsview-core/share/_javascript_/forms.js:6874,6882,6956
/branches/enterprise/DEV-professional/opsview-core/share/_javascript_/forms.js:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939,10002,10029,10038-10041,10070,10086,10093,10335,10345,10347,10388,10407,10481,10549,10560-10562,10565,10568,10571,10577,10932,11025,11035,11526,11528,12189,12322,12355
/branches/nagvis-iframe/opsview-core/share/_javascript_/forms.js:9764-9786
/branches/opsview2runtime/opsview-core/share/_javascript_/forms.js:10960-11258
/branches/opsview2runtime_xs/opsview-core/share/_javascript_/forms.js:11279-11303
/branches/us168/opsview-core/share/_javascript_/forms.js:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/BRAN-4.2/opsview-core/share/_javascript_/forms.js:10944,10966,11017
/commercial/branches/BRAN-4.2/share/_javascript_/forms.js:10966
/commercial/branches/US306-slaves/opsview-core/share/_javascript_/forms.js:9804-9823
/commercial/branches/US307-network-map/opsview-core/share/_javascript_/forms.js:9685-9837

Modified: trunk/opsview-core/t/var/opsview.test.db
===================================================================
--- trunk/opsview-core/t/var/opsview.test.db	2013-05-28 11:57:26 UTC (rev 12365)
+++ trunk/opsview-core/t/var/opsview.test.db	2013-05-28 12:22:25 UTC (rev 12366)
@@ -1402,7 +1402,7 @@
   `active` tinyint(1) NOT NULL DEFAULT '1',
   `name` varchar(64) NOT NULL DEFAULT '',
   `namespace` varchar(255) NOT NULL,
-  `master` tinyint(1) NOT NULL DEFAULT '0',
+  `master` tinyint(1) NOT NULL DEFAULT '1',
   `command` text,
   `priority` int(11) NOT NULL DEFAULT '1',
   `uncommitted` tinyint(1) NOT NULL DEFAULT '0',
@@ -2068,6 +2068,7 @@
 INSERT INTO `schema_version` VALUES ('20130219hsteh','all','Host event handlers','2013-02-19 14:49:43',0);
 INSERT INTO `schema_version` VALUES ('20130221snmpthro','all','Increasing the size of snmp.throughput_*','2013-02-21 15:30:52',0);
 INSERT INTO `schema_version` VALUES ('20130424alerts','all','Support for limiting notification alerts','2013-04-24 11:14:58',0);
+INSERT INTO `schema_version` VALUES ('20130521notmeth','all','New notitication method on master','2013-05-21 14:19:29',0);
 INSERT INTO `schema_version` VALUES ('3.0','4',NULL,NULL,NULL);
 INSERT INTO `schema_version` VALUES ('3.1','4',NULL,NULL,NULL);
 INSERT INTO `schema_version` VALUES ('3.11','15',NULL,NULL,NULL);


_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins

Reply via email to