xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/rpms/awips2.core
History
Steve Harris ffcc34f8d4 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
..
deploy.builder 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
Installer.adapt-native 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.ant OB_14.1.1-19 baseline 2014-02-21 06:50:59 -05:00
Installer.aviation 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.cli Issue #2520 - Update rpm query calls 2013-11-05 13:30:01 -06:00
Installer.common-base 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.database 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.database-server-configuration Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf 2013-12-16 16:39:10 -06:00
Installer.database-standalone-configuration Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf 2013-12-16 16:39:10 -06:00
Installer.edex-environment 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.gfe 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.gfe.climo 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.gfesuite-client 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.gfesuite-server 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.groovy 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.httpd-collaboration 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.httpd-pypies Issue #2182 - Change release number 2013-12-17 08:46:15 -06:00
Installer.hydroapps 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.irt 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.java 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.ldm ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev) 2014-02-20 15:50:50 -05:00
Installer.localapps-environment 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.localization 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.maps-database 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.ncep-database 13.4.1-7 baseline 2013-05-13 12:58:10 -04:00
Installer.notification 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.pgadmin 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.postgres Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf 2013-12-16 16:39:10 -06:00
Installer.pypies 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.python Merge branch 'master_14.1.1' into master_14.2.1 2014-02-18 10:45:20 -06:00
Installer.rcm 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.tools Merge branch 'master_14.1.1' into master_14.2.1 2014-02-18 10:45:20 -06:00
Installer.topo Issue #2788 Fix topo for large areas. 2014-02-13 10:10:34 -06:00
Installer.version Issue #2268 - fix CAVE installation error 2013-10-29 11:44:48 -05:00
Installer.xmpp 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00