xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
4452 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
Ron Anderson ba7a25a88f Merge branch 'master_14.1.1' into solutions 
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 9f121ec921a2f8635c48f005ddb71787ad6bf166
2014-01-13 17:45:20 -06:00
cave Merge branch 'master_14.1.1' into solutions 2014-01-13 17:45:20 -06:00
cots Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge 2013-11-19 10:08:45 -06:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1 2013-12-11 16:19:02 -06:00
edexOsgi Merge branch 'master_14.1.1' into solutions 2014-01-13 17:45:20 -06:00
javaUtilities 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
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 #2009: Fix NullPointerException in SocketServer start up. 2013-07-23 13:57:38 -05:00
msi Merge branch 'omaha_14.1.1' (14.1.1-11) into development 2013-12-05 12:12:27 -06:00
nativeLib Merge branch 'master_14.1.1' into solutions 2014-01-13 17:45:20 -06:00
ncep Merge branch 'master_14.1.1' into solutions 2014-01-13 17:45:20 -06:00
ost 14.1.1-7 baseline 2013-11-06 14:16:14 -05:00
pythonPackages Merge branch 'omaha_14.1.1' (14.1.1-11) into development 2013-12-05 12:12:27 -06:00
RadarServer Merge branch 'development' into development_on_RHEL6 2013-11-12 11:11:36 -06:00
rpms Merge branch 'master_14.1.1' into solutions 2014-01-13 17:45:20 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2619 Fix rare dateline bug. 2013-12-12 10:30:22 -06:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00