Merge branch 'master_14.4.1' of ssh://github.com/Unidata/awips2 into master_14.4.1

Former-commit-id: de48b2241afd842f75d8150e31f9afe4a6a2d99d [formerly 49ca158ca941cf8b14bd37100a6bf1ed2657110c] [formerly d0c838add3 [formerly e8d7fa53f4]]
Former-commit-id: d0c838add3
Former-commit-id: 81947cc628
This commit is contained in:
AWIPS User 2015-07-03 09:18:00 -06:00
commit a34a895a31
2 changed files with 1 additions and 3 deletions

View file

@ -42,7 +42,7 @@
<!-- Begin Radar routes -->
<route id="radarIngestRoute">
<from uri="jms-durable:queue:Ingest.Radar"/>
<from uri="jms-durable:queue:Ingest.Radar?concurrentConsumers=4"/>
<setHeader headerName="dataType">
<constant>radar-sbn</constant>
</setHeader>

View file

@ -326,8 +326,6 @@ edex_stop() { # stop all edex services
su -c "service qpidd stop"
su -c "service httpd-pypies stop"
su -c "service edex_postgres stop"
sleep 5
su -c "service qpidd stop"
edex_status;
}