Brian.Dyke
|
a0a879be7d
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]
Former-commit-id: a8737e18f0
|
2014-05-30 10:46:25 -04:00 |
|
Steve Harris
|
848519177d
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]
Former-commit-id: cf62cf4a6e
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
3aa2f7974b
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]
Former-commit-id: 386ec058e1
|
2014-05-12 14:07:11 -04:00 |
|
Chip Gobs
|
4e4d00792d
|
VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada
Former-commit-id: e42bef2a33 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]
Former-commit-id: 65d2135ac2
|
2014-05-06 10:48:35 -04:00 |
|
David Gillingham
|
607ce13c19
|
Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: de12904c7a [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]
Former-commit-id: 32719432ff
|
2014-02-18 13:24:37 -06:00 |
|
Nate Jensen
|
2103294b75
|
Issue #2208 moving edex unit tests to tests project
Change-Id: I9189ebd225df930d021855c19d338e74af800702
Former-commit-id: 15fae243c9 [formerly 37c1d3c5b1a60260a537951c8a4bbceef4204029]
Former-commit-id: 8d1e19f2df
|
2013-07-25 12:29:46 -05:00 |
|
Max Schenkelberg
|
94fa6f0e30
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]
Former-commit-id: 63421a4819
|
2013-07-15 14:26:15 -05:00 |
|
Steve Harris
|
a5a0da5c02
|
13.2.1-3 baseline
Former-commit-id: 2b6ac028bd [formerly ba03739c3528638c5383528fd64674ae5af1ed64]
Former-commit-id: 7435527b25
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
98171b5de9
|
12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: d3497e47eb
|
2012-10-16 13:27:07 -05:00 |
|
root
|
a02aeb236c
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
|
2012-01-06 08:55:05 -06:00 |
|