Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 32c6a48a39 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
	edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java

Former-commit-id: 856f5bc3b7 [formerly b3bc71c8a4] [formerly 652fb19bc4] [formerly 856f5bc3b7 [formerly b3bc71c8a4] [formerly 652fb19bc4] [formerly 6964df0664 [formerly 652fb19bc4 [formerly a20833879f1a0434c562a22a874b1e1722278954]]]]
Former-commit-id: 6964df0664
Former-commit-id: 7f7e8e69a4 [formerly 77b2da7a4f] [formerly 9655787e1bc6f95e4e9dab9054aa147d706bdd37 [formerly 661eceea83]]
Former-commit-id: 343ac38383e296e3ae1f421f8cf6238df294b55b [formerly d33fbe7c31]
Former-commit-id: ae3bc184ce
2014-05-12 15:05:43 -05:00
cave Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-05-12 15:05:43 -05:00
cots Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-05-12 15:05:43 -05:00
deltaScripts Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays 2014-05-08 14:36:54 -05:00
edexOsgi Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-05-12 15:05:43 -05:00
javaUtilities Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting. 2014-05-06 18:06:44 -05: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 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays 2014-05-08 14:36:54 -05:00
ncep Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-05-12 15:05:43 -05:00
ost Omaha #2782: Update thread based logging 2014-05-08 09:06:31 -05:00
pythonPackages Merge branch 'master_14.2.2' into master_14.3.1 2014-04-25 11:06:11 -04:00
RadarServer Merge branch 'omaha_14.2.2' (14.2.2-3) into development 2014-04-11 16:23:09 -05:00
rpms Omaha #3147 removed spring from groovy RPM component spec 2014-05-09 10:31:28 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #3026 - NullPointer fix, test classpath fix 2014-05-08 15:02:54 -05: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