xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
7032 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 306826aed9 Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.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.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: f4b771ea72 [formerly da463c484e] [formerly 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]
Former-commit-id: 2616fe04b6
Former-commit-id: 523cedbb56
2014-10-03 10:18:34 -05:00
cave Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1 2014-10-03 10:18:34 -05:00
deltaScripts Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1 2014-09-29 12:58:56 -05:00
edexOsgi Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1 2014-10-03 10:18:34 -05:00
javaUtilities Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1 2014-09-02 10:40:13 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP. 2014-05-09 09:34:49 -05:00
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib Omaha #3300 - Added another compiled nativeLib binary to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 2014-09-23 15:30:55 -05:00
ncep Omaha #3663 move features that contain primarily ncep plugins to ncep 2014-09-29 17:24:34 -05:00
ost Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 2014-09-23 11:41:10 -05:00
pythonPackages Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes. 2014-10-01 14:57:16 -04:00
RadarServer Omaha #3502 removed common.convert from rcm feature 2014-08-11 09:56:53 -05:00
rpms Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1 2014-10-03 10:18:34 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Omaha #3365 Realign AWIPS2_baseline tests 2014-09-30 12:53:20 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00