Steve Harris
|
069093884f
|
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: 889200c9eb3fbb835f8fef067476799f30a7a7e0
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
cfa4997978
|
OB_14.1.1-19 baseline
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
|
2014-02-21 06:50:59 -05:00 |
|
Steve Harris
|
3328e2dd1d
|
14.1.1-7 baseline
Former-commit-id: 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998
|
2013-11-06 14:16:14 -05:00 |
|
Richard Peter
|
592218edb8
|
Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: 54356ea774bfab26b85aff317fc759de41e259d1
|
2013-09-03 11:51:27 -05:00 |
|
Richard Peter
|
359ee5d1af
|
Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13
Former-commit-id: 8a8eff74685abb8a709480fa33f2c56dd7923ab9
|
2013-07-26 14:36:46 -05:00 |
|
Max Schenkelberg
|
63421a4819
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
|
2013-07-15 14:26:15 -05:00 |
|
Steve Harris
|
998961612c
|
13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
|
2013-06-10 15:17:17 -04:00 |
|
Ben Steffensmeier
|
4209e014d8
|
Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 7fd2829cd730562a549a2f3c423ac5ead15872e7
|
2013-05-08 18:39:25 -05:00 |
|
Steve Harris
|
d33e5861aa
|
13.4.1-4 baseline
Former-commit-id: 4477bad886dc7ae0418409e3bc5ebce7965b6146
|
2013-05-02 10:00:38 -05:00 |
|
Brad Gonzales
|
dc37712fda
|
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: 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95
|
2013-04-16 14:44:06 -05:00 |
|
Steve Harris
|
9be238bcc4
|
13.3.1-19 baseline
Former-commit-id: ce855032b2b7235b2aea8dc66aff89ca7c54854a
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
b13cbb7e00
|
12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
9f8cb727a5
|
12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
67a5a68300
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
Roger Ferrel
|
472e788dba
|
Issue #181
new files not indexed
Former-commit-id: 6e2032f9290e77e8e597ae4256ffe7ad8142407b
|
2012-01-26 14:37:19 -06:00 |
|
Nate Jensen
|
8e3730adbf
|
Issue #181 fixing edex feature and component deploys
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d
Former-commit-id: 0c82def5c753aab240848aac8dc906a161461ac3
|
2012-01-24 12:15:01 -06:00 |
|
Nate Jensen
|
fe52a35f7a
|
Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3
Former-commit-id: 3aa13bd49e23ef963127f7efbc91054c06808f1c
|
2012-01-24 09:59:50 -06:00 |
|
Bryan Kowal
|
2142afe3f1
|
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 296d2915b17f0086d93e200d4780663bff34edbb
|
2012-01-20 11:37:38 -06:00 |
|
Matt Nash
|
66be3bec40
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
9f19e3f712
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|