Steve Harris
|
f6988eefff
|
Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: e733dd9d05d3704f86e2a711607a1834df1a56f2
|
2012-12-11 08:45:53 -06:00 |
|
Dustin Johnson
|
31d7d09c10
|
Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 89583d97c8823818f87dc1a234078d85ba7bea4a
|
2012-11-01 13:36:06 -05:00 |
|
Ben Steffensmeier
|
6f2c1ede9e
|
Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: 8bcb077174ef7bcb923dd974e53e82f12936b580
|
2012-10-25 16:17:54 -05:00 |
|
Ben Steffensmeier
|
c2934ae7a5
|
merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: ab80625b5c573d8ab1350b4c251414ea036ef016
|
2012-10-25 12:22:11 -05:00 |
|
Steve Harris
|
0ba69044a2
|
12.11.1-10 baseline
Former-commit-id: 9dd41e6322bad3e7dced1a32867d9a7f886d70cf
|
2012-10-24 15:13:57 -05:00 |
|
Steve Harris
|
a0eaf651ff
|
12.11.1-5 baseline
Former-commit-id: a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
6958b861f0
|
12.11.1-4 baseline
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
|
2012-10-16 13:27:07 -05:00 |
|
Ben Steffensmeier
|
0132d35871
|
Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640
Former-commit-id: 20f41b849a468c968e866fc84ec9e50c13773f2b
|
2012-09-20 12:24:35 -05:00 |
|
Ben Steffensmeier
|
05849f634d
|
Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece
Former-commit-id: 8f164a7b948e462b14caf6576de2b898a9a4e880
|
2012-09-18 15:19:05 -05:00 |
|
Steve Harris
|
f2fac39428
|
12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
33b95fb96d
|
12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
cd49ef3eda
|
12.8.1-5 baseline
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
27afa60345
|
12.6.1-9 baseline
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
3904c4ccf5
|
12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
2a216f333c
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
David Gillingham
|
85998bc654
|
Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 67aaf1c21e8372b4a84cb82cae62549502992651
|
2012-02-23 13:23:59 -06:00 |
|
Steve Harris
|
b137302802
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
|
2012-02-17 10:55:02 -06:00 |
|
Matt Nash
|
c83e5ff474
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
06a8b51d6d
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|