Ron Anderson
db6bbf673b
Omaha #5225 Fix mixed case issue with multiple text editors
...
Change-Id: I7f5b3eb7bc82bfe5da906c6d6e870f8a1ed8ccf4
Former-commit-id: 438ecd50ac2bac2ffd190660e973953fd95324c0
2016-01-06 16:13:52 -06:00
Ron Anderson
fd19655b86
Omaha #5206 Remove substitution of commas with ellipses in GFE and limit to WarnGen products in TextWS
...
Change-Id: Ie110bdb8cf1a51882d4431a727956671910590d9
Former-commit-id: 4eb9482b75a54e11ab86ad0a16cf533fdc332424
2015-12-10 11:16:43 -06:00
Ron Anderson
4baa875e3b
Omaha #5141 Replace commas with ellipses when forcing productst to upper case.
...
Change-Id: I9754cf0e22f8e3ce7d92df06456dab2c3c7451ba
Former-commit-id: fd411ce15a628efc30b63828ef5c1de1c2fce670
2015-11-19 14:56:00 -06:00
Shawn.Hooper
90badd7a3e
Merge tag 'OB_15.1.2-9' into master_16.1.1
...
15.1.2-9
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/ContactsDataManager.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/DescriptionDataManager.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/LocationAreaManager.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: e9e9660925d0afc016f88ec73182f9eae6ab0c18
2015-10-15 17:10:19 -04:00
Shawn.Hooper
026bfbbc72
Merge branch 'asm_15.1.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.2
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: a9f1a28c4b9b8ce19d110fb26864268a89085481
2015-10-08 13:14:29 -04:00
David Friedman
6536afe67e
ASM #18132 - Text Workstation incorrectly reassigns ETN of TCV products
...
Change-Id: I19db78aa384a12f238a3be1375c276f7ff0f601f
Former-commit-id: 69492727ae30b793cf26a9431350b019f7eb6dd8
2015-10-07 16:01:38 +00:00
Roger Ferrel
9c7321a9a5
Omaha #4899 Checks to prevent sending product while in operational mode and simulated time.
...
Former-commit-id: 8f422c4fe573ab1d1391d4d975f6b245ed933938
2015-10-01 16:14:51 -05:00
David Friedman
a0c82a85ae
ASM #17843 - UHELE when closing Text WS while "No product..." banner is displayed
...
Change-Id: I50e45c01e3d454d2278248ba073bd09b39ad7f46
Former-commit-id: 90fddd16408d7e45850dad5c1f4c4d3a27d64ea0
2015-08-07 14:00:05 +00:00
David Friedman
4bdfeb8da8
Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
...
Conflicts:
cave/build/static/linux/alertviz/alertviz.sh
cave/build/static/linux/cave/cave.sh
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226
Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
David Friedman
876ed4837a
ASM #17534 - TextWS "No product" message box prevents WarnGen scratch products from being edited
...
Change-Id: Id7ae458cb978f2e0cf644eca82fb17b65cf0eb38
Former-commit-id: f47ecc5c2f83f890431a70464ce08c8303c69033
2015-07-22 15:37:40 +00:00
Daniel.Huffman
2bc03d1bf4
ASM #15044 Implemented tabbing and tabs to spaces in Text Workstation
...
Change-Id: I9707994490ff80d29a7e45dec0a2e7ffb47bf8e7
Former-commit-id: 38480f629c04003db315f0e439ce556084909bb2
2015-07-10 13:09:50 +00:00
Ron Anderson
dfffdececc
Omaha #4441 Fix UGC count error for Baltimore City
...
Change-Id: I8627d6835dccae8180ca608034375cf646cd30b4
Former-commit-id: b8b694cdd9a71d1054a019c8e627f89abc983b27
2015-07-09 13:34:30 -05:00
Ron Anderson
ba9cfeb66a
Omaha #4441 Fix QC issues in WarnGen
...
Change-Id: I0e4cce76063b164916f876aaf4615b939e79adf9
Former-commit-id: a527e014887319629977747349e2bf170e474477
2015-06-22 16:37:53 -05:00
Ron Anderson
d6c45829d7
Omaha #4442 and #4441 Fix QC and locking issues in SWS follow up.
...
Change-Id: Ie8aa0bb350d98296855e4a5c66ce16e83ab8c39b
Former-commit-id: 5d1bcc495e1b589ac8145523a2d965394c1744e2
2015-06-10 11:58:51 -05:00
Ron Anderson
15dfb5afef
Omaha #4441 and #4442 Fix WarnGen QC and locking issues with mixed case.
...
Change-Id: I95705831aa37e0774b09a0d2acee42c86d361368
Former-commit-id: ac3c7983f3c287cad4e0f38b0231b64ad69a60a6
2015-06-08 08:27:41 -05:00
David Lovely
80dc4c85d9
Omaha #4146 Bundled class files in a jar when unpacked.
...
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Nate Jensen
adc53a4b48
Merge "Omaha #4259 avnfps, textws, uengine, handleOUP, qc changes for jep 3.3" into omaha_16.1.1
...
Former-commit-id: adc93b14a7222cabc8d2f6e17392eba9b2af94be
2015-05-07 08:42:44 -05:00
Steve Harris
23cb520937
Merge tag 'OB_15.1.1-8' into omaha_16.1.1
...
15.1.1-7
Conflicts (these files were moved to AWIPS2_baseline):
rpms/awips2.core/Installer.java/build.sh
rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh
Former-commit-id: df806c9479cb29a5f47f1511ad70e140b2bbf8ec
2015-05-05 15:24:22 -05:00
Steve Harris
0a7e5a4474
Merge tag 'OB_15.1.1-8' into omaha_15.1.1
...
15.1.1-7
Former-commit-id: 56bb5952e20c8ff817d1ca05b68bf9a8424f6df9
2015-05-05 13:33:32 -05:00
Steve Harris
815a30871b
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
Former-commit-id: c6156764c2c4fb068f994cbb17d1f373d75f7070
2015-05-05 09:19:28 -05:00
Nate Jensen
7df44931e7
Omaha #4259 avnfps, textws, uengine, handleOUP, qc changes for jep 3.3
...
Change-Id: I409f6743f4d901fd7dbce250d277a693e00329ad
Former-commit-id: f5ad526339c73623da4ccc7aee9c6b0fd2f387b0
2015-04-30 14:41:13 -05:00
Ron Anderson
551d1bee91
Omaha #4027 More changes for Mixed Case
...
Change-Id: Id47f1c68877e8df0cbf84df09bdaa000a41a863e
Former-commit-id: 0e48bfe4de5c227ebf96b0b59f9c7a9c39415f2e
2015-04-29 13:18:27 -05:00
Fay.Liang
ff11d4f55a
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: efff4511cb01552b757678fb2ac64dca2da6f9c0
2015-04-20 15:38:33 -04:00
Steve Harris
7ec7cdf232
Merge tag 'OB_15.1.1-4' into omaha_16.1.1
...
15.1.1-4
Former-commit-id: c9f9bc2c612dae6d355fb3c5de313aa7274adc8b
2015-04-13 12:22:22 -05:00
Fay.Liang
1579e023ea
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 6608975224ad22f454a243c919d498a5a2369e32
2015-04-08 12:24:58 -04:00
Michael Gamazaychikov
06506f01c4
ASM #14968 - TextWS: Problems inserting text into pathcast section.
...
Change-Id: I9a9bc6c91b6d15087acf0e08c9168211745dfa88
Former-commit-id: 9f42d943954adc1f3e9c365381f46d4c5a375d71
2015-04-06 10:08:28 -04:00
Kiran.Shrestha
8f981c5fa4
ASM #15025 WRK product changes header to alternate- long-line pil in header block.
...
Change-Id: If5776bbddbf8b5eddf8dff85d913ce8a4862bd12
Former-commit-id: 3ab4df17a7fd40f93de6cb32798ee5a2385f4814
2015-04-03 18:43:24 +00:00
Steve Harris
f7af8ee606
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: cf70a7888a39667c54b344274c76d5106927fa30
2015-04-01 17:22:45 -05:00
David Gillingham
6569868378
Omaha #4320 : fix grammar error in javadoc.
...
Change-Id: I16dc49753d31f6510d883a4b48421e44d113b428
Former-commit-id: e9f57c24bb73378eef489c56dadf8661979bfdc9
2015-03-26 09:54:49 -05:00
David Gillingham
0e07177b94
Omaha #4320 : Add QC check to warngen products to test that product passes through WarningDecoder without error.
...
Change-Id: I1b5ccfafa9701cc9387a7f29459df02367c2c249
Former-commit-id: e08bcbfbd25286e547dccafbf00269c41392fccb
2015-03-25 23:14:18 -05:00
Fay.Liang
86a8041062
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Kiran.Shrestha
01dc0567ad
ASM #14866 -TextWS: QC GUI pops up for products that did not have GUI in AWIPS 1
...
Change-Id: Ic14667386eeaef84f6849193c60b8199f8b07ed5
Former-commit-id: 1aea5a4cd3d6a9476dc6dd3b590a15170b0e4031
2015-03-10 13:51:56 +00:00
Kiran.Shrestha
25608f610c
ASM #15025 - WRK product changes header to alternate- long-line pil in header block
...
Change-Id: I34b571406ceac8888b744064b75b6dcb7000757a
Former-commit-id: d5564b8ffaeff4a24468b45cb64f15a45b2321ca
2015-03-05 18:54:20 +00:00
Steve Harris
118f52263f
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: ffee274d844442a36d633deda5776c09a758cb38
2015-02-12 12:48:29 -06:00
Nate Jensen
fa547ac3dd
Omaha #4086 resurrect undead textws scripting code and make it work with
...
TextDBQuery
Change-Id: I33ddf04b2f02ee088f7b8956c5c31e874747ddf8
Former-commit-id: 9cdf82d433bd07289002c1f4df9f5242dce0de7e
2015-02-04 16:46:21 -06:00
Steve Harris
9234ceb485
Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)
Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
2015-01-23 09:32:44 -06:00
David Gillingham
c5961ac23e
Omaha #4001 : Ensure WarnGen sends properly populated SendPracticeProductRequest objects when transmitting in practice mode, create delta script for hazard services db changes.
...
Change-Id: I1debd8c239362a25cde641207ec57d7fc4c9cfd7
Former-commit-id: f1984e0a25c68fc21c1a9af833d1de2634bb489d
2015-01-15 14:42:35 -06:00
Fay.Liang
eed6737801
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
...
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Nathan Bowler
06c94a25b7
Omaha #1231 Fix selecting AWIPS ID
...
Change-Id: I657d723b45b9374523307a8fdbdfc21f2f31f35e
Former-commit-id: 68e6a2fd48a062e0ca66b52098f2781a30926a80
2014-12-08 13:07:14 -05:00
David Friedman
5164b85f2f
ASM #16829 - TextWS: Problem with AlarmAlertFunctions static class initialization
...
Change-Id: I8e2cbe627942570a9544d21cd41b09701d65fccf
Former-commit-id: e2ab243f69cc96248284f78bbcd3c83f57f23b6d
2014-12-03 15:55:20 +00:00
Michael Gamazaychikov
0444ccbb17
ASM #643 - Text Workstation mishandles editing WRK products with numbers in PIL.
...
Change-Id: I493c457a45640a820fabaa5c8a4aa0ecc3e23e53
Former-commit-id: 4c2f49e3cc961ff8d02a42bac0f31f9c31973782
2014-12-02 13:35:39 -05:00
Ron Anderson
5d07d13aa0
Omaha #3685 Add support for sending specific products in mixed case
...
Change-Id: I3c7e8bfe285ce7344ddfccf28173a68f3396b126
Former-commit-id: 18d4fc13ebbd77b3a476bc70252fae1322d631c6
2014-10-22 14:29:30 -05:00
Steve Harris
3b6a8a1447
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
2014-09-29 12:58:56 -05:00
Steve Harris
b979960b7b
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
2014-09-23 11:41:10 -05:00
Brian.Dyke
8d665b93b5
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 8d5d8cdfd272f8000a6a21a4128998889eb2ab30
2014-09-19 16:56:50 -04:00
Steve Harris
4c56844e29
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
2014-09-19 10:28:57 -05:00
Brian.Dyke
57a361073d
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f
2014-09-17 15:50:13 -04:00
Michael Gamazaychikov
0b245d40ae
ASM #529 Invalid QC message for Areal Flood Advisory
...
Change-Id: I392d32b4d7ccc94c88404a85f22f2f306d34ee33
Former-commit-id: d3247df563831f017f69faf1edbde5aea3c2a507
2014-09-16 09:12:06 -04:00
Mark Peters
b8dc6d37d8
Omaha #3580 Replace or remove Text Workstation calls to SerializationUtil's JAXB support
...
Change-Id: Id12d02ebf40cd7c7a1236d88a3776b6a3ee1df3c
Former-commit-id: 4d5b0516d227eb7b892850753c6bb94f67f01a2d
2014-09-12 13:23:40 -05:00
Brian.Dyke
01dfe503f5
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
2014-09-09 11:44:30 -04:00
