xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
5830 commits 31 branches 40 tags 3.8 GiB
Java 75.8%
Python 18%
HTML 4.5%
Shell 1.3%
PLpgSQL 0.1%
Find a file
Steve Harris 7a29f74a3d Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: b2ca44adc7 [formerly 741dc31fcb] [formerly 2f2958df37] [formerly 2f2958df37 [formerly d4dc1723c1]] [formerly b2ca44adc7 [formerly 741dc31fcb] [formerly 2f2958df37] [formerly 2f2958df37 [formerly d4dc1723c1]] [formerly 7acd9ab2dd [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 020a525bfd [formerly d70da4127e] [formerly 7fb4663d75] [formerly 3e0604521c6e7522f3a4123eee8600cb5a71226f [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6] [formerly 7fb4663d75 [formerly dcbab5621f]]]
Former-commit-id: 9365f3461acd78bd354b2cc5cd317b9d8c76d98e [formerly 8343b8e876918b72044e0b509f5b5b8afdbd53e2] [formerly 8fb747ad27 [formerly 71357da9d2]]
Former-commit-id: 8fb747ad27
Former-commit-id: 1bbbdc9c62
2014-07-01 11:08:46 -04:00
cave Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1 2014-07-01 11:08:46 -04:00
cots Issue #3194 Fix GeoTIFF import 2014-05-22 09:53:47 -05:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse. 2014-06-05 13:37:02 -04:00
edexOsgi Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1 2014-07-01 11:08:46 -04:00
javaUtilities Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 2014-05-30 10:46:25 -04:00
ldm 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things 2013-07-11 13:32:26 -05:00
MHSEmulator Issue #2758 Fix MHSEmulator to pass small files 2014-02-13 15:53:15 -06:00
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse. 2014-06-05 13:37:02 -04:00
ncep VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1 2014-05-22 14:35:49 -04:00
ohd VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse. 2014-06-05 13:37:02 -04:00
ost Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 2014-04-28 16:27:40 -05:00
pythonPackages ASM #550 - Remove ITO call from monitor_qpid_hosts.sh 2014-05-30 14:09:16 -04:00
RadarServer Merge branch 'master_14.3.1' into asm_14.3.1 2014-05-30 10:09:00 -04:00
rpms Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 2014-06-12 07:07:17 -04:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1 2014-07-01 11:08:46 -04:00
tools Issue #2726: Edex graceful shutdown. 2014-04-14 13:10:11 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00