Steve Harris
|
d4dc1723c1
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: d25ab509cb53d559edbd520dd1e3c036166f2e29
|
2014-07-01 11:08:46 -04:00 |
|
Steve Harris
|
89606076ec
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 174fe6d66525229f328846a1f4564300d7603c10
|
2014-06-24 10:57:56 -05:00 |
|
Nate Jensen
|
51da67dd3f
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: c6ce72840a4ee0f44eacff46015b5382d86dd47f
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
b84dda5930
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
399c06820a
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 86dc406cd227362abc5274f4cd64813ceb91d00d
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
30d8644fa5
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Merge branch 'master_14.1.3_merge' into master_14.1.3
Former-commit-id: 4b317062ce5c35823210cbbf023c0f0fc8051ef3
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
346bf852cd
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: df99fcb0a4be27d5f2d22935847fb55b8bfbbb58
|
2014-06-13 13:21:19 -04:00 |
|
David Friedman
|
b8542c1332
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: a3f4fd6537f3847011e199e0f043968d9f595937
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
f72380ad60
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
c1b3f9d180
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: b859032bcec187616adfd414dd1ce5fe27829e9e
|
2014-06-10 12:52:59 -04:00 |
|
Mike Duff
|
81ab64d7ff
|
ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: 7fe0dae041cb68aba968e22d5895cce22a210ee6
|
2014-06-06 16:03:14 -04:00 |
|
Michael Gamazaychikov
|
c07bcacbf8
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: a38308fa5a6efe9a07ecd84bd93662bea32afc94
|
2014-06-05 13:43:04 +01:00 |
|
Brian.Dyke
|
61b206be0b
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: 36fa86071fa492bd1d135b3ded6cde54d0567474
|
2014-06-04 07:46:16 -04:00 |
|
Kenneth Sperow
|
c302ef8967
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8
Former-commit-id: b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5
|
2014-06-03 20:55:29 -07:00 |
|
brian.dyke
|
79f866fb17
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2d4751c000176447d28b284337fb23a60cb19cd1
|
2014-06-03 16:14:16 -04:00 |
|
Zhidong.Hao
|
26c6801620
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 74597b2630ffd8d984b193f72126a9a5d0b3a942
|
2014-06-03 11:55:32 -04:00 |
|
Brian.Dyke
|
b8ba378862
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: dec7b6fa091cab098b89a51551fa46b9f28b959b
|
2014-06-02 07:01:37 -04:00 |
|
Brian.Dyke
|
a8737e18f0
|
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: 9d7a819489480e119b65cb5643520818adeb1ebf
|
2014-05-30 10:46:25 -04:00 |
|
brian.dyke
|
95c5dc49c1
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2e170e3e328804a56f65de7cec0f0e89d3f1aba4
|
2014-05-30 10:09:00 -04:00 |
|
Steve Harris
|
2c49d14c12
|
Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
Former-commit-id: 70398b6d6c43e8931d4d88660af2ba7a8b2668e2
|
2014-05-28 07:41:42 -05:00 |
|
Steve Harris
|
99bc6f990c
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 117fa26f537131552bbe51b2c5fe12405a26db32
|
2014-05-27 14:48:24 -04:00 |
|
Kenneth Sperow
|
8490f7ea33
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to 189e3cc1f2 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f
Former-commit-id: 41ee30cbe04bb6cba695f7480d6b1492aec4219c
|
2014-05-22 14:16:49 -07:00 |
|
Steve Harris
|
4899c4f56a
|
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
Former-commit-id: eae5c3e75061566e40194730c2cfb2003d952e62
|
2014-05-22 14:05:06 -05:00 |
|
brian.dyke
|
562f53874a
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6
|
2014-05-22 12:46:56 -04:00 |
|
Ron Anderson
|
52931af5ce
|
Issue #3194 Fix GeoTIFF import
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: 8082b27e6e7e0a0be372abb40b62c0a0224ee49c
|
2014-05-22 09:53:47 -05:00 |
|
Matthew Howard
|
95b9746871
|
Merge "ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button" into asm_14.3.1
Former-commit-id: 5893d06b990cec295338595b006a45bb762b4b73
|
2014-05-22 07:50:50 -05:00 |
|
Michael Gamazaychikov
|
63409ef272
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75
|
2014-05-21 15:12:08 +01:00 |
|
Zhidong.Hao
|
bcdb0dba95
|
ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button
Change-Id: I764436168339ce46ab01b27c9078455e6a543176
Former-commit-id: d4be1e866c561717a9a7697b3ff451efdd184fe6
|
2014-05-21 09:15:41 -04:00 |
|
Brian.Dyke
|
2fd18d14d6
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: ed430b59789d9a00e20bdaadc8d55b92a4a4064b
|
2014-05-20 14:35:34 -04:00 |
|
Ron Anderson
|
3b404f4083
|
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: b10be8ae235c4528c4ce83088daeccf8a0928933
|
2014-05-20 11:10:26 -05:00 |
|
Brian.Dyke
|
dbd3bb54e8
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: 19032f03b1d2166f4afd936bb2b56e0b4851d9f4
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
b29db01a59
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
94fea6748f
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 5880dcd0b727c3d473873b8382ace78955ab800b
|
2014-05-19 15:40:41 +01:00 |
|
brian.dyke
|
011d121e4b
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
|
2014-05-19 09:45:37 -04:00 |
|
Brian.Dyke
|
f8ed9c7944
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114
|
2014-05-19 07:55:42 -04:00 |
|
Brian.Dyke
|
627541512d
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: f7d6bee49c5777e5d63c724eba1242a1baf153ac
|
2014-05-14 16:08:16 -04:00 |
|
Qinglu.Lin
|
75c4b15e8e
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: 763641d787f7f8c79bf28456314dcc16786702ed
|
2014-05-14 15:30:16 -04:00 |
|
Bryan Kowal
|
3535340136
|
Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: 2b13221d7c644147f6eda1acb8b126667be00926
|
2014-05-13 14:43:04 -05:00 |
|
Brian.Dyke
|
e95bc87a19
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: 019c1405290753ed47cecd9a0bb26c220d78d010
|
2014-05-13 11:23:55 -04:00 |
|
Matthew Howard
|
5a20085f32
|
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
Former-commit-id: 2052df4ca5f68165b477994b21357c245ff73546
|
2014-05-13 07:49:18 -05:00 |
|
Steve Harris
|
cf62cf4a6e
|
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: a830db2a282e6a29d119fc0d3357c2223c48d175
|
2014-05-12 16:13:19 -05:00 |
|
Zhidong.Hao
|
d6cae51207
|
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: a48b81894fed165aba58a0097359bbd0f1931be5
|
2014-05-12 15:16:38 -04:00 |
|
Juliya Dynina
|
107b64a544
|
Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
Former-commit-id: 0c54c56efa1306d781d64621ccf7f62b3bf70997
|
2014-05-12 14:01:40 -05:00 |
|
Juliya Dynina
|
d7bea845fe
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 350448988d24fd2eb58812128b062e3a0f44b956
|
2014-05-12 14:01:07 -05:00 |
|
Ana Rivera
|
91715e7a3f
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: e71ef5db23122405fc6aab71526a9cc3ec3ad823
|
2014-05-12 18:55:06 +00:00 |
|
Matthew Howard
|
b807c877f4
|
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f
|
2014-05-12 13:52:12 -05:00 |
|
Loubna.Bousaidi
|
ec5bd7a2bb
|
ASM #527 update revision and shef_qual_code
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: 860ea4b3644a526ac10b4366f158824fe6cbdcb0
|
2014-05-12 18:42:12 +00:00 |
|
Zhidong.Hao
|
8d560036b1
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 62f8c0ab0e046fd4365bd37394f93e8bca4e642d
|
2014-05-12 14:33:25 -04:00 |
|
Brian.Dyke
|
386ec058e1
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
|
2014-05-12 14:07:11 -04:00 |
|
Matthew Howard
|
d40d9931db
|
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: 59fb75bdc025a3b2feb95d20d263060b55e87b28
|
2014-05-12 13:00:55 -05:00 |
|