[Opsview-checkins] [opsview] [11833] Merge of 11798 and 11799, with virtual machine icon and brand colour for network icon

Mon, 18 Mar 2013 03:42:02 -0700

Title: [opsview] [11833] Merge of 11798 and 11799, with virtual machine icon and brand colour for network icon
Revision
11833
Author
tvoon
Date
2013-03-18 10:41:56 +0000 (Mon, 18 Mar 2013)

Log Message

Merge of 11798 and 11799, with virtual machine icon and brand colour for network icon


Modified Paths




Added 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/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
/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/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
/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/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
/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/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
/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/import/hosticons.db
===================================================================
--- trunk/opsview-core/import/hosticons.db	2013-03-18 10:21:34 UTC (rev 11832)
+++ trunk/opsview-core/import/hosticons.db	2013-03-18 10:41:56 UTC (rev 11833)
@@ -19,6 +19,7 @@
 SYMBOL - Server:server
 SYMBOL - Storage:storage
 SYMBOL - Switch:switch
+SYMBOL - Virtual Machine:virtual_machine
 SYMBOL - VLAN:vlan
 SYMBOL - VPN:vpn
 SYMBOL - Web Site:website

Modified: trunk/opsview-core/opsview-images/hosticons/network.png
===================================================================
(Binary files differ)

Modified: trunk/opsview-core/opsview-images/hosticons/network_small.png
===================================================================
(Binary files differ)

Copied: trunk/opsview-core/opsview-images/hosticons/virtual_machine.png (from rev 11799, branches/enterprise/DEV-professional/opsview-core/opsview-images/hosticons/virtual_machine.png)
===================================================================
(Binary files differ)

Copied: trunk/opsview-core/opsview-images/hosticons/virtual_machine_small.png (from rev 11799, branches/enterprise/DEV-professional/opsview-core/opsview-images/hosticons/virtual_machine_small.png)
===================================================================
(Binary files differ)


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

Reply via email to