Steve Harris
|
52226061e9
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: 069093884f
Former-commit-id: 3ba28aabea
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
3508e488f5
|
OB_14.1.1-19 baseline
Former-commit-id: 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: cfa4997978
Former-commit-id: 779553142c
|
2014-02-21 06:50:59 -05:00 |
|
Ben Steffensmeier
|
318e48c945
|
Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc
Former-commit-id: 46a466497c [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]
Former-commit-id: f682e66e9b
Former-commit-id: 7c2a4ef72c
|
2013-12-05 10:54:28 -06:00 |
|
Steve Harris
|
cb3b53f205
|
14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: bd95bb6a4e
Former-commit-id: 82dec19b6a
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
a0ba2e1252
|
14.1.1-3 baseline
Former-commit-id: 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 94f24e0d8a
Former-commit-id: 851f9df229
|
2013-10-28 10:46:02 -04:00 |
|
Steve Harris
|
553238dca4
|
13.5.2-8 baseline
Former-commit-id: 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]
Former-commit-id: 94aa71fcd1
Former-commit-id: 8ba7d392d6
|
2013-10-04 11:30:03 -04:00 |
|
Richard Peter
|
449692aeff
|
Issue #2368: Update JMS routing to set message persistence and durability at the config level
Former-commit-id: a5a7816b98 [formerly 5111debc92 [formerly 9ac3d2ddbeee7265b9b7879fcc6efcee95281872]]
Former-commit-id: 5111debc92
Former-commit-id: b803359eb4
|
2013-09-15 13:44:17 -05:00 |
|
Greg Armendariz
|
ed9da994c7
|
13.5.1-5 baseline
Former-commit-id: ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]
Former-commit-id: 492f92ef7b
Former-commit-id: 82aabf1066
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
2487a8b435
|
13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: 70e4ff30a6
Former-commit-id: c56be8a332
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
5d99df9969
|
13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: 998961612c
Former-commit-id: 6384018950
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
32fdf6ed3b
|
12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 2c0ff851ca
Former-commit-id: 7c064b6868
|
2012-07-10 07:53:49 -05:00 |
|
Matt Nash
|
d8da2252c3
|
Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
|
2012-01-19 11:53:12 -06:00 |
|
root
|
133dc97f67
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
|
2012-01-06 08:55:05 -06:00 |
|