Steve Harris
|
3ba28aabea
|
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 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: 069093884f
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
779553142c
|
OB_14.1.1-19 baseline
Former-commit-id: 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: cfa4997978
|
2014-02-21 06:50:59 -05:00 |
|
Steve Harris
|
80614c0e52
|
14.1.1-7 baseline
Former-commit-id: 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]
Former-commit-id: 3328e2dd1d
|
2013-11-06 14:16:14 -05:00 |
|
Richard Peter
|
ff660a78c7
|
Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: 7175e78cf7 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]
Former-commit-id: 592218edb8
|
2013-09-03 11:51:27 -05:00 |
|
Nate Jensen
|
38fa2ca855
|
Issue #2208 moving ncep unit tests to tests project
Change-Id: I723edf8936970d57108796ca1bc775b93e5e2507
Former-commit-id: d7be59a97e [formerly b027914534dc808a616e2b5b2ee55ed3dd304b2e]
Former-commit-id: 838554cf98
|
2013-07-25 13:28:27 -05:00 |
|
Max Schenkelberg
|
94fa6f0e30
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]
Former-commit-id: 63421a4819
|
2013-07-15 14:26:15 -05:00 |
|
Steve Harris
|
6384018950
|
13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
|
2013-06-10 15:17:17 -04:00 |
|
Richard Peter
|
3d84e1dd53
|
Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java
Former-commit-id: 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]
Former-commit-id: 8aa4b0025c
|
2013-05-21 12:11:21 -05:00 |
|
Steve Harris
|
68fe2134b8
|
13.4.1-10 baseline
Former-commit-id: 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]
Former-commit-id: 9a403b3615
|
2013-05-20 10:52:47 -04:00 |
|
Ben Steffensmeier
|
dab2af2df5
|
Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 79015595ee [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]
Former-commit-id: 4209e014d8
|
2013-05-08 18:39:25 -05:00 |
|
Steve Harris
|
99f4569650
|
13.4.1-4 baseline
Former-commit-id: 7a78f8ac6e [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]
Former-commit-id: d33e5861aa
|
2013-05-02 10:00:38 -05:00 |
|
Brad Gonzales
|
005c935be6
|
Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
added sequence delta script.
Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1
Former-commit-id: b75ef08190 [formerly 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95]
Former-commit-id: dc37712fda
|
2013-04-16 14:44:06 -05:00 |
|
Steve Harris
|
dc9fef33a9
|
13.3.1-19 baseline
Former-commit-id: abaf9f12f9 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]
Former-commit-id: 9be238bcc4
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
2e110bd151
|
13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]
Former-commit-id: 3a4c7931e1
|
2013-03-12 08:35:45 -05:00 |
|