Steve Harris
|
a19beb1e5d
|
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: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
|
2014-03-06 08:39:43 -06:00 |
|
Dave Hladky
|
36bc408bc2
|
Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558
Former-commit-id: 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 39f97723d6 [formerly 6172c83afc [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]]
Former-commit-id: 39f97723d6
Former-commit-id: 14f2c99e46 [formerly 39f5579103] [formerly d5d37d7b55d86fa82a363075d901e0a1583e45de [formerly 2b998409f5]]
Former-commit-id: d275e71a9e574bd23d396da26d9a5eaa6435dea7 [formerly 8e2eb4d255]
Former-commit-id: 59590fdf36
|
2014-02-05 14:49:26 -06:00 |
|
Dustin Johnson
|
c9b74d06a1
|
Issue #2106 Fix transactional semantics
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits
Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9
Former-commit-id: fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly fe8c0b47d1 [formerly 5bfef9bb45] [formerly fac7d3a9d9] [formerly 69c09e530f [formerly fac7d3a9d9 [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]]]
Former-commit-id: 69c09e530f
Former-commit-id: 84ecc6dec4 [formerly da1ad3c8a0] [formerly 116120f9c8fe8a517e5ae2e8f6ca08adc0db5a75 [formerly f67d02a394]]
Former-commit-id: 99261465c72149de5291722572317482216a9d86 [formerly c2ed1495ad]
Former-commit-id: 9b42432838
|
2013-06-25 08:33:55 -05:00 |
|
Dustin Johnson
|
f002cbc4b3
|
Issue #2086 Move data delivery phase 3 code into AWIPS_baseline
Change-Id: I60bf6ac9d886d27c70543a0b7df24d626639fc3e
Former-commit-id: e19ff76a2c [formerly 063e68bc93] [formerly da69d3e630] [formerly e19ff76a2c [formerly 063e68bc93] [formerly da69d3e630] [formerly 1c7d99f53f [formerly da69d3e630 [formerly c213b3b5552a2b11c69965bc6edcfb8acf7fa0a8]]]]
Former-commit-id: 1c7d99f53f
Former-commit-id: c42465efb0 [formerly 2b64936595] [formerly 246a3e209fbb65328702c6de7f86e34cd06fc369 [formerly fef2708ff5]]
Former-commit-id: 62389cfa6373cb32dea356319b4d094a371d7797 [formerly 9220f1a199]
Former-commit-id: 2f75f26b1d
|
2013-06-10 18:47:17 -05:00 |
|