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-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/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
/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
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/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
/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
Modified: trunk/opsview-core/bin/create_opspack
===================================================================
--- trunk/opsview-core/bin/create_opspack 2012-07-16 20:42:14 UTC (rev 9574)
+++ trunk/opsview-core/bin/create_opspack 2012-07-16 20:55:56 UTC (rev 9575)
@@ -80,7 +80,7 @@
map { ( $_ => 1 ) } @common_servicecheck_dependencies;
my $norm_hosttemplate_name = lc $hosttemplate_name;
-$norm_hosttemplate_name =~ s/\W+/-/g;
+$norm_hosttemplate_name =~ s/\W+/_/g;
my $result;
my %hosttemplates;
Deleted: trunk/opsview-core/import/opspacks_source/application-http/Makefile
===================================================================
--- trunk/opsview-core/import/opspacks_source/application-http/Makefile 2012-07-16 20:42:14 UTC (rev 9574)
+++ trunk/opsview-core/import/opspacks_source/application-http/Makefile 2012-07-16 20:55:56 UTC (rev 9575)
@@ -1,12 +0,0 @@
-NAME := $(shell perl -ne 'if (/ALIAS=(.*)/){ $$_ = lc($$1); s/ /-/g; s/\-+/-/g; print $$_ }' info)
-
-PACKNAME = ${NAME}
-
-mpack: clean
- mkdir ${PACKNAME}
- cp info config.json ${PACKNAME}
- tar --exclude=.svn -cf - plugins | tar -C ${PACKNAME} -xf -
- tar --gzip -cf ${PACKNAME}.tar.gz ${PACKNAME}
-
-clean:
- rm -fr ${PACKNAME}
Deleted: trunk/opsview-core/import/opspacks_source/os-opsview-agent/Makefile
===================================================================
--- trunk/opsview-core/import/opspacks_source/os-opsview-agent/Makefile 2012-07-16 20:42:14 UTC (rev 9574)
+++ trunk/opsview-core/import/opspacks_source/os-opsview-agent/Makefile 2012-07-16 20:55:56 UTC (rev 9575)
@@ -1,12 +0,0 @@
-NAME := $(shell perl -ne 'if (/ALIAS=(.*)/){ $$_ = lc($$1); s/ /-/g; s/\-+/-/g; print $$_ }' info)
-
-PACKNAME = ${NAME}
-
-mpack: clean
- mkdir ${PACKNAME}
- cp info config.json ${PACKNAME}
- tar --exclude=.svn -cf - plugins | tar -C ${PACKNAME} -xf -
- tar --gzip -cf ${PACKNAME}.tar.gz ${PACKNAME}
-
-clean:
- rm -fr ${PACKNAME}
Modified: trunk/opsview-core/import/opspacks_source/os-opsview-agent/info
===================================================================
--- trunk/opsview-core/import/opspacks_source/os-opsview-agent/info 2012-07-16 20:42:14 UTC (rev 9574)
+++ trunk/opsview-core/import/opspacks_source/os-opsview-agent/info 2012-07-16 20:55:56 UTC (rev 9575)
@@ -1,4 +1,4 @@
-NAME=com.example.monitorpack.os-opsview-agent
+NAME=com.example.monitorpack.os_opsview_agent
VERSION=1.0
ALIAS=OS - Opsview Agent
DEPENDENCIES=
