mjames-upc
|
65ea1370ad
|
/data_store->/awips2/data_store; EDEX raw data purge every hour; incl. hydroapps linux32 libs in RPM build; other pkg updates
|
2016-07-28 14:04:15 -06:00 |
|
mjames-upc
|
2866fa9af2
|
UCAR build and install scripts, RPM specs, edex deploy, p2 build
Former-commit-id: 739d54f31d5ac3032218e30f9298001a9c3a15bd
|
2016-06-27 14:17:07 -05:00 |
|
Sean.Webb
|
c3e84067ec
|
ASM #19095 - Changed radar storage pattern
Change-Id: I21297f461c1fb786988bd9487f05e5bca1833653
Former-commit-id: 73247fa7cce2f0ae22c86878fd6724eebce17901
|
2016-06-07 05:30:04 -04:00 |
|
Matthew Foster
|
d9ca3c9662
|
VLab Issue #18010 - Add radar entries to pqact.conf.tempalte for DCS 18425; fixes #18010
Change-Id: I91e7a1db4ca3632f6fcf7c309809977212ef585d
Former-commit-id: db167c3ec7518a1ce870580fadcd3bf456d81096
|
2016-04-21 16:11:53 +00:00 |
|
Shawn.Hooper
|
0c2ce7faae
|
Merge remote-tracking branch 'vlab/field_16.2.2' into master_16.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I0c91cd064aff06397abc6445837ef1be2610d740
Former-commit-id: 1f5a13ead40804f458617b9506236d819d97d54f
|
2016-04-07 16:01:19 -04:00 |
|
Shawn.Hooper
|
850ec358bf
|
ASM #18528 - "Merge tag 'OB_16.2.2-1' into DCS-18528"
16.2.2-1
Change-Id: I7ac65cae4efe4e38b2c059aec6d4808f97f1bf77
Former-commit-id: 8173420a5e472738d4c9255d2ed32e55927c8d07
|
2016-03-28 15:47:44 -04:00 |
|
Brian Rapp
|
3c10e7d354
|
ASM #18765 - Increased retrans table arrays sizes in retrans.h
Change-Id: Icc29fc74b82a2c31b1bbac57474ea6185e9689fe
Former-commit-id: 314380a01ec11e0fd0f429c721715b058a0e4e54
|
2016-03-28 11:59:14 -04:00 |
|
Steve Harris
|
c2b471a870
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/TCVDictionary.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a7340c2bf23cbc3d27ca52fbf2ccd9c7d1cb09c2
|
2016-02-29 13:39:42 -06:00 |
|
Joshua Watson
|
b273056afb
|
VLab Issue #11629:NamDNG changes; fixes #11629
Change-Id: Iba3b15ba77612411e09f2f2a5dcb66461f08f31e
Former-commit-id: 2f78a8716f90ed6525455533d4b5a4d23f58a5f8
|
2016-02-25 09:41:07 -05:00 |
|
Ana Rivera
|
9b97d8e4c3
|
Merge branch 'omaha_16.2.2' into field_16.2.2
Change-Id: Iaa9a1a801ee2059f5ffa5473a407ac8a7c1a4200
Former-commit-id: eb7beb890676babbbd203fc1721d48ceb067aba1
|
2016-02-22 20:35:27 +00:00 |
|
Ana Rivera
|
8760fef091
|
Merge branch 'master_16.2.1'(OB_16.2.1-12) into field_16.2.2
Change-Id: I5d1312be2647fcd892f72a75a93840bc6e112f7c
Former-commit-id: d1c7c5037a667194962d312300d1e2b60b6c5507
|
2016-02-22 16:23:58 +00:00 |
|
Shawn.Hooper
|
663c44637f
|
Merge tag 'OB_16.1.2-20' into asm_16.2.1
16.1.2-20
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9ed1c12896ffa710e7995f9682b4be1de88fa077
Former-commit-id: 9e3470f2b741592182dfae3e873503eb22df4f18
|
2016-02-22 11:13:16 -05:00 |
|
Sean.Webb
|
6e57e032cc
|
ASM #18637 - Added PQPF pattern
Change-Id: Ie3feb4353764d801c735c7ce49a30b859933b7c0
Former-commit-id: a14e36d814505675bfc0d3d7419a16f33f8f09ad
|
2016-02-19 04:00:57 -05:00 |
|
Sean.Webb
|
a79ebb26ee
|
ASM #18644 - Added pattern for GHE data move to grib2
Change-Id: Ic6c9dfbb005b033095c723e239afa03efb372c81
Former-commit-id: f99f1a6e228485772bdd8daaa2be6d918ae7718a
|
2016-02-16 04:45:48 -05:00 |
|
Steve Harris
|
4ba488bd0a
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Former-commit-id: 27f7e431d04f99ec48723c71413e9633c0d1996e
|
2016-02-15 10:15:20 -06:00 |
|
Matthew Foster
|
a6a90205b3
|
VLab Issue #14581 - DCS18425 National Radar Display; fixes #14581
Change-Id: I13baf525ba7b6162beddfcfd273ec67e9b893c95
Former-commit-id: 9033a963a6dadf03de3a2b98ff7e0c851cc838a3
|
2016-02-02 17:50:17 +00:00 |
|
Steve Harris
|
85055fcc53
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8
|
2016-02-01 11:57:52 -06:00 |
|
Nathan Bowler
|
5412705591
|
Omaha #5183 Fix PWPF parameters, off by 0.5-1 error in colormap, and add to ingest.
Change-Id: I1cff6aa2138bd4d3234a7133cdf10470236dce1c
Former-commit-id: 8674b01f48fd4b5069778e7026919041f67e7011
|
2016-01-29 14:27:15 -05:00 |
|
Sean.Webb
|
36338bb1b1
|
ASM #18472 - Made a change to try to fix pax extraction issue
Change-Id: I9daeb16b8f17a6028d9afa88e1763b367837ff82
Former-commit-id: 4be656bf32eadaa0b3311853d7355ce595145b11
|
2016-01-28 14:16:36 -05:00 |
|
Steve Harris
|
11a5db155d
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
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/gis/GeospatialFactory.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java
Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
|
2016-01-20 15:23:43 -06:00 |
|
Shawn.Hooper
|
94eba993a6
|
Merge branch 'master_16.2.1' into asm_16.2.1
Former-commit-id: 10740febfd3631d4c31312c9427a172cd29c9e62
|
2016-01-14 16:10:45 -05:00 |
|
Steve Harris
|
25cee1be8c
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 58b1a82b5cf59525bf266416bc8c3ca6c0dea4ad
|
2016-01-13 09:20:51 -06:00 |
|
Shawn.Hooper
|
bd27f40c6d
|
Merge tag 'OB_16.1.2-9' into master_16.2.1
16.1.2-9
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
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
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c
Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
|
2016-01-12 15:10:02 -05:00 |
|
Sathya Sankarasubbu
|
04abe1e731
|
ASM #18472 - Fix LDM GOES memory leak and installation issues
Change-Id: I4bbdc776bc5b39594261858cf628cb3780dbf9cd
Former-commit-id: 151718a772a3909e62c9f0ef098a97ff4169e747
|
2016-01-11 19:03:20 +00:00 |
|
Steve Harris
|
8a07970ba6
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
|
2016-01-06 11:55:00 -06:00 |
|
Shawn.Hooper
|
f3fafae42e
|
Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: Ie67d751b1c68099a98826e6542ebff4cf0aae7e5
Former-commit-id: b9b551d68ed55536b2480b60ef1269bcf5402004
|
2016-01-04 16:47:59 -05:00 |
|
Sean.Webb
|
5e31e4ba9b
|
ASM #14308 - Fixed KMSR pattern to handle grib2 products
Change-Id: If225bc33c9739c3fd72999a4c3ef3d4a2d99b979
Former-commit-id: 8d1eb0cda2ceef99b511d9e87a19c9bbb85467bd
|
2015-12-18 09:21:00 -05:00 |
|
Sean.Webb
|
15d547da5c
|
ASM #18385 - Added stripped down NationalBlend pattern
Change-Id: Iadc5596fc140e308837cb5531e10cd1f1cb4e1e3
Former-commit-id: e78a8f462e2608982d9c896a9dece5d7a8769872
|
2015-12-08 11:05:35 -05:00 |
|
David Lovely
|
e5bc0428b7
|
Omaha #4986 Added build site to RPM package info.
Former-commit-id: 6f7adfbc746e295a848522acd9fa346d250af998
|
2015-12-03 09:59:15 -06:00 |
|
Shawn.Hooper
|
e93839673c
|
Merge branch 'asm_16.2.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.2.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
Former-commit-id: 0d5c4caf82d74459f9412800955d6cb9da18f3fb
|
2015-11-25 14:31:20 -05:00 |
|
David Lovely
|
f1c6ef00e9
|
Omaha #4738 WA12.6 Updated SPEC files.
Former-commit-id: d5dac85650053efa4af8611d56ddc8cae1aa030a
|
2015-11-19 13:21:11 -06:00 |
|
Melissa Porricel
|
835eb2bfc4
|
ASM #18194 - Display GTG Clear Air Turbulence in D-2D
Change-Id: Ie36d8dbaa1093528f6e879a2aa0fbe0babfd9c4a
Former-commit-id: a9af17c306f2955f23f0d702d00a9e05a305cf67
|
2015-11-17 14:07:59 -05:00 |
|
sathya.sankarasubbu
|
24ef4f1a43
|
ASM #18048 - Add AWIPS I missing frame and decompression processing to LDM for GOES imagery
Change-Id: I3d470dbffdb965d60d71f6aabeef80ff2a91efba
Former-commit-id: 3af33d8d90627e9114efbe279e86c9f6e9f31ee7
|
2015-11-17 02:41:40 +00:00 |
|
sathya.sankarasubbu
|
419d93b471
|
ASM #18048 - Add AWIPS I missing frame and decompression processing to LDM for GOES imagery
Change-Id: I081284e23dace65c0006be984ff8bafa494e9fa8
Former-commit-id: f8cf8ec1e038f66dd94ca0e905079a5d06dc44f9
|
2015-11-17 02:40:51 +00:00 |
|
sathya.sankarasubbu
|
9084958498
|
ASM #18048 - Add AWIPS I missing frame and decompression processing to LDM for GOES imagery
Change-Id: I7630ddbc518f65acad00c195dedd63c9ee73d2ce
Former-commit-id: c30777e8f867760ed7aa8fa327c0f01562dcfbd5
|
2015-11-16 16:47:08 +00:00 |
|
Melissa Porricel
|
20c182de48
|
ASM #18194 - Display GTG Clear Air Turbulence in D-2D
Change-Id: I628894d4bf7f9f813d660e36f07e0bd4979b6bb1
Former-commit-id: ade0a71ef80e63e11190b078cc3d5f5532e06ffc
|
2015-11-04 11:36:14 -05:00 |
|
Joshua Watson
|
a78748b0ef
|
VLab Issue #11628: Add entries for Day 8-11 Alaska Gridded MOS; fixes #11628
Change-Id: I89ff4357765422045600ff88cfd1f7bf1e1a9e34
Former-commit-id: 06f55ac8a2fcf34b5a52a8a54b10b8889912a6ee
|
2015-10-30 11:08:44 -04:00 |
|
David Gillingham
|
459011ed48
|
Omaha #4958: Add support for viewing raw NationalBlend model data to GFE.
Change-Id: I1e8f43459cf0582fdd40aecb64ea98c9986611fb
(cherry picked from commit 75ef14640b [formerly 1856ec86534f5ab6a3be8a0ac8bdd11da5efff20])
Former-commit-id: eba45fd796d991ecb25d86108b9e5e98a1f73cc2
|
2015-10-21 14:09:29 -04:00 |
|
Ana Rivera
|
0623faeae6
|
Merge branch 'omaha_16.2.1' into field_16.2.1
Change-Id: I0cd108e629201a90dce035c36213b8d2f21df1dc
Former-commit-id: a276f099c734de6a40b5cc0b747b2e43f15f4f4d
|
2015-10-16 13:06:26 +00:00 |
|
Ron Anderson
|
d126af0f85
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/FormatterlauncherAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowPublishDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSendIscGridsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/ingest/LocationTablesIngest.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ie790e3a9a0c3829655a5a798a2c8b6740d02be6c
Former-commit-id: 691ca66a6f15c3cfae1bd1c8990644951d68a46f
|
2015-10-14 16:31:41 -05:00 |
|
David Gillingham
|
75ef14640b
|
Omaha #4958: Add support for viewing raw NationalBlend model data to GFE.
Change-Id: I1e8f43459cf0582fdd40aecb64ea98c9986611fb
Former-commit-id: 1856ec86534f5ab6a3be8a0ac8bdd11da5efff20
|
2015-10-09 11:09:08 -05:00 |
|
Ana Rivera
|
01642046f1
|
Merge branch 'omaha_16.2.1' into field_16.2.1
Change-Id: I78cabd110bc1ad00b5b94aec1cbe991014fab603
Former-commit-id: 4c2de56c416dee6a4b1b0876c91b72d014bd9f44
|
2015-10-06 17:26:20 +00:00 |
|
Roger Ferrel
|
a5bb945d94
|
Omaha #4930 Corrected intlsigmets entries.
Former-commit-id: 6811ada63c8a7270a96580d884645e0485a10ac9
|
2015-09-30 14:26:25 -05:00 |
|
Ana Rivera
|
465c40d290
|
Merge branch 'omaha_16.2.1' into field_16.2.1
Change-Id: Ic499fe14405db74db73740a60613d433260c88e6
Former-commit-id: 6438345d95267bdfc06788899bad16b28f6b54c6
|
2015-09-24 15:57:14 +00:00 |
|
Ana Rivera
|
072800cc64
|
Merge branch 'omaha_16.2.1'(includes OB_16.1.1-11) into field_16.2.1
Change-Id: I4aa21aae9b4c44fa4d94719ac0893bf85cbc9ca7
Former-commit-id: 39ff0a7faa7cb20db7526dc0f1ba539126add3c0
|
2015-09-23 12:47:14 +00:00 |
|
Steve Harris
|
bc84d97750
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterScriptFactory.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
Former-commit-id: 3ba87373d75582c47288fe39e8f72aa404de0a94
|
2015-09-22 15:57:39 -05:00 |
|
Greg Armendariz
|
821b67838c
|
Omaha #4895 - Replace pqact.conf.dev with OAX local plus additional radar sites
Change-Id: I726ddb80ab237e33c5c492809bc28b4121d82501
Former-commit-id: 0e279eac1d444d5ae3ebc36761ad11d03101d992
|
2015-09-22 08:41:23 -05:00 |
|
Greg Armendariz
|
558bdf97e5
|
Omaha #4895 - Replace pqact.conf.dev with OAX local plus additional radar sites
Change-Id: Id092a6dfef8ce5e229a0a6c3f7da4755efa60218
Former-commit-id: 2e87be9818e10c13c9624f491ddb3e648cbdaa7d
|
2015-09-21 14:10:47 -05:00 |
|
Shawn.Hooper
|
bda1720de0
|
Merge tag 'OB_15.1.2-4' into master_16.1.1
15.1.2-4
Former-commit-id: 16cef2c4e589eb7e711958b86993a5091041c663
|
2015-09-18 14:56:50 -04:00 |
|
Steve Harris
|
fbdce3bede
|
Merge tag 'OB_16.1.1-11' into omaha_16.2.1
16.1.1-11
Conflicts:
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 3104ad23039ebe9333df058e004e3c9a6cdb1a11
|
2015-09-15 15:43:10 -05:00 |
|