xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
4601 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 14a082a4e9 Merge branch 'master_14.1.1' into master_14.2.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: 4155b9785e0a82078db6805659146980cafc2aa7
2014-02-18 10:45:20 -06:00
cave Merge branch 'master_14.1.1' into master_14.2.1 2014-02-18 10:45:20 -06:00
cots Issue #2581 fix local storm report delta script and unique constraint 2014-01-15 09:50:35 -06:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Issue #2581 fix local storm report delta script and unique constraint 2014-01-15 09:50:35 -06:00
edexOsgi Merge branch 'master_14.1.1' into master_14.2.1 2014-02-18 10:45:20 -06:00
javaUtilities Issue #2359 remove ignore threads capability since it was a hack to stop 2014-01-23 18:09:50 -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 Issue #179 2014-02-04 16:53:34 -05:00
ncep Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1 2014-01-31 08:28:09 -05:00
ost 14.1.1-7 baseline 2013-11-06 14:16:14 -05:00
pythonPackages Merge branch 'master_14.1.1' into master_14.2.1 2014-02-18 10:45:20 -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 master_14.2.1 2014-02-18 10:45:20 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry. 2014-01-26 20:31:38 -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