Shawn.Hooper
|
90220c0fd7
|
ASM #18748 - Updates to allow for proper storage and display of some PQPF/PPQPF data
Change-Id: Ia566f84a2311ee54b06f1101ce2fb47dfc76c9d8
Former-commit-id: 4fb2feee8ca09f499fecf0df047c63a0ea280c92
|
2016-03-22 16:15:24 -04:00 |
|
Shawn.Hooper
|
fa274710fd
|
ASM #18695 - Add 72 hour Percentile PQPF data to the Volume Browser
Change-Id: I5cff8f37a163f1521fbe85db74faf8a94a5f9cd6
Former-commit-id: 98b2da26e07a024ee6e44184d13274eb2cf7da35
|
2016-02-24 16:19:18 -05:00 |
|
Shawn.Hooper
|
12fc325051
|
Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 38a3f56c751b61b312e3f031d00f07cc9b9d420d
|
2016-01-27 17:13:38 -05:00 |
|
Shawn.Hooper
|
3f05c3da44
|
Merge remote-tracking branch 'vlab/field_16.2.1' into master_16.2.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I279d046dc8a054563c9ddabd92350f8d97222355
Former-commit-id: f9ff90f121eff9ae632b8bcc47c3500d9f647d00
|
2016-01-20 16:49:53 -05:00 |
|
Steve Harris
|
dfcc52e766
|
Merge tag 'OB_16.2.1-6' into omaha_16.2.1
16.2.1-6
Former-commit-id: 29a43c58b69086667c47e86c4a0bb1c849ad4367
|
2016-01-20 13:29:19 -06:00 |
|
Ben Steffensmeier
|
8b1291798a
|
Omaha #5246 Fix blank graph panels.
Former-commit-id: da4a78cf8302da5679776c8021871b91e27ab5c1
|
2016-01-13 13:45:54 -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 |
|
Ana Rivera
|
f62d233a83
|
VLab Issue #13368 -DR17879 Add Ensemble Button to baseline Volume Browser Sources list; fixes #13368
Change-Id: I23ac1b351882d5f930e1ac0789f372268993c168
Former-commit-id: 5dddeb9fb69231940d8064c11b607df5c41a3148
|
2015-11-23 15:17:33 +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 |
|
Ben Steffensmeier
|
a45b6cbfa1
|
Omaha #4970 Add Support for ldadmesonet to volume browser.
Former-commit-id: 926231498ddfda02185de9f571f5e1029cc57235
|
2015-10-22 13:29:55 -05:00 |
|
Steve Harris
|
56131ac305
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/GageData.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: fa9ad9b8a3900bd5f94017f27bec9a5673ecb881
|
2015-10-21 09:22:00 -05:00 |
|
Ben Steffensmeier
|
52607323c3
|
Omaha #3861 Fix vb resources initializing too early.
Former-commit-id: 83eba19a9ad65c25e37e71572acb9941daa03f4f
|
2015-10-19 15:39:21 -05:00 |
|
Kiran.Shrestha
|
1914a40b5e
|
ASM #13456 NamDNG5 not available in Volume Browser
Change-Id: Id8b3d884ca9ba9979526705f59da765b85bc3f3c
Former-commit-id: 50fa47c3914bc07e7d70a7ed63026afdabb3be42
|
2015-10-13 18:00:03 +00:00 |
|
Ben Steffensmeier
|
14128e97c9
|
Omaha #3861 Show VB data types that cannot create products as unavailable.
Former-commit-id: dd1beae239fbe9424bfb881c5427deccd5c98d30
|
2015-10-05 17:43:57 -05: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 |
|
Roger Ferrel
|
69f5eac314
|
Omaha #4819 Changes for browsers and GFE to add HWRF.
Change-Id: Icdb2ad322a57d19e8fe4f5745785fe114c50c8fd
Former-commit-id: 2af405298fd751a3f9282a24fb4310216bb84acd
|
2015-09-21 07:00:31 -05:00 |
|
Nathan Bowler
|
b7d04e85b3
|
Omaha #4696 Moved everything to grid.netcdf plugin. NOS is all configs. Rename viz.grib.feature to uf.viz.grid.feature.
Change-Id: Ib2590c2c8d1df8c087c28d8adea3fce21e6135d4
Former-commit-id: 3ed99a6aea1602cf26fe7ed0fe7f2d1d306f4948
|
2015-09-17 14:47:30 -04:00 |
|
Benjamin Phillippe
|
b9a40125a3
|
Omaha #4870 Fixed Total Precip display issue
Former-commit-id: 7b820b3ea53b55c6495d10613d92cfaa80693a38
|
2015-09-17 11:52:45 -05:00 |
|
Nathan Bowler
|
bd345bd6ab
|
Omaha #4696 Add POES/GOES Blended SST and NCOM ingest/display. Extracted/refactored netcdf description classes.
Change-Id: Id8162ecbbf2a9cf7b74769a1f5a2faa1c14e1461
Former-commit-id: 75412f6830c178427e1394ad55eefe6c23a40fdc
|
2015-09-08 17:07:27 -04:00 |
|
Steve Harris
|
4bb1dfd213
|
Merge tag 'OB_16.1.1-9' into omaha_16.2.1
16.1.1-9
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
Former-commit-id: 4ff4f4722a0fd37cf6ec75c701acd43d778ce7c2
|
2015-09-01 16:06:40 -05:00 |
|
Nate Jensen
|
2b851d8907
|
Omaha #4785 fix alter bundle of some point sources
Change-Id: I76144eeae0039bcc84e661406133e7824f556642
Former-commit-id: f12ab980a75faedd7f26b41631b559388d6c56f4
|
2015-08-25 17:58:09 -05:00 |
|
Shawn.Hooper
|
5759470634
|
Merge tag 'OB_15.1.1-32' into master_16.1.1
15.1.1-32
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MakeHazard.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.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
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
Former-commit-id: f925ff11b783389e5ca32a2d7cd1ec5edfa835db
|
2015-08-19 14:58:31 -04:00 |
|
Ben Steffensmeier
|
23bfac5d4c
|
Omaha #3861 Separate product creation from the main vb plugin.
Former-commit-id: 00e617e97a2979f756de4e58ff602b707a0cc509
|
2015-08-04 14:09:04 -05:00 |
|
Steve Harris
|
716970c597
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: 2c28db21de36edb64a6a741e93803b3423f5c22c
|
2015-08-04 13:41:21 -05:00 |
|
Steve Harris
|
f696d5731d
|
Merge tag 'OB_16.1.1-2' into omaha_16.2.1
16.1.1-2
Conflicts:
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.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java
Former-commit-id: 8053621c46adc8813128ecfa81c0834f670db64f
|
2015-08-03 17:06:31 -05:00 |
|
Fay.Liang
|
5c5bc3a5b5
|
Merge branch 'field_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
Former-commit-id: 061ce49506ae6b538dad609a3be711aec3efae80
|
2015-07-31 16:53:30 -04:00 |
|
Fay.Liang
|
e0b8b2f813
|
Merge remote-tracking branch 'origin/master_14.4.2' into master_15.1.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: 39babf90e69c4b8d3319cc385bb6a19bb3f93aad
|
2015-07-31 09:56:36 -04: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 |
|
Ana Rivera
|
9a33597d6e
|
Merge branch 'omaha_16.1.1' into field_16.1.1
Change-Id: I9da773e70da7bb8d62253093f20aebd8aea328f6
Former-commit-id: 0c909272ebdaf4ce94195b54a021a38c1e174ff3
|
2015-07-20 15:56:51 +00:00 |
|
Ana Rivera
|
d6196390e2
|
Merge branch 'master_15.1.1'(OB_15.1.1-24) into field_16.1.1
Change-Id: I859c9a2d9be2076e9eac89b4a5a877f37ca54074
Former-commit-id: d6f0e355d72c9be4d55c5e161331e55367bdb7b8
|
2015-07-20 15:46:28 +00:00 |
|
Steve Harris
|
815bef5003
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: d28fab431fd182b66035176003e2f6704a97506e
|
2015-07-14 08:04:29 -05:00 |
|
Steve Harris
|
55b82a66ff
|
Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java
Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
|
2015-07-13 18:39:29 -05:00 |
|
Mark Peters
|
a7059ba80c
|
Omaha #4641 Volume browser sources sorting and null checks
Change-Id: Iabd25162a4ea115d7cf54145fb6c2496241a20e4
Former-commit-id: d1a484d56a9351c5b75c851435fc3d72d987ee5d
|
2015-07-13 11:48:17 -05:00 |
|
Mark Peters
|
0c8f6a7f9c
|
Omaha #4641 14.4.1: Volume Browser sometimes fails to load, throws error when launched
Change-Id: Ia426360e75f898fb010a327cccae46f922605bc0
Former-commit-id: fffd9245ef0141587063c034ad3153af1449b3c9
|
2015-07-09 17:03:14 -05:00 |
|
David Gillingham
|
c35669279e
|
Omaha #4543: Add support for new bufrmos LAMP lightning and convective parameters.
Change-Id: Id95b8b103c356ded0a22097f042b1b67d2cb80f3
Former-commit-id: b03aaec814cb264d9abb9510c357405bde8ae894
|
2015-07-09 13:27:44 -05:00 |
|
Ana Rivera
|
e075f22bf7
|
Merge branch 'omaha_16.1.1' into field_16.1.1
Entry for NTAT missing from omaha_16.1.1's LevelMappingFile.xml.
Change-Id: I39893e6aa748f7dfeb30bd23bcfca3853fa51e17
Former-commit-id: cc1e4ea67074c41be411c99ce979124a63c7c743
|
2015-07-07 19:41:48 +00:00 |
|
Roger Ferrel
|
17a2e9a0d8
|
Omaha #4537 Put back needed NTAT changes removed in 4422.
Former-commit-id: e2c311dc18c48d1e681c2d53aa606abc5182bd27
|
2015-07-06 10:22:29 -05:00 |
|
David Gillingham
|
79da33d7a8
|
Omaha #4422: Revert "Support ingest and display of NAM12 simulated satellite data in D2D and GFE."
This reverts commit bbcff29843 [formerly 0e5a00548514123df7e2439e51878e492cdf3a6f].
Change-Id: I36995a9c432f6d6462d29d3c3aea5c45d69dfcd6
Former-commit-id: 72a841a8c93a66ac8c8c768fe230b81960efa733
|
2015-07-02 10:12:20 -05:00 |
|
Kiran.Shrestha
|
ae96fff89b
|
ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I.
Change-Id: Ide922832e9baf7382a7245e6a435fa14fc7215a6
Former-commit-id: a5f75df66ab88725c1f92f9a917f083cdc58fa5e
|
2015-06-30 18:28:58 +00:00 |
|
Darrel Kingfield
|
be322dafdb
|
VLab Issue #6772 - MRMS All-Tilts Activation for 16.1.1 v2; fixes #6772
Change-Id: I0d0aabbcfc61d4541696cc181c8a58de585f0276
Former-commit-id: 062acfed99fd022e0a8ca6791d0c0099551de6a8
|
2015-06-29 12:12:16 -05:00 |
|
Matthew Foster
|
aeca09eae2
|
VLab Issue #8856 - Fixes for Baumgardt additions; fixes #8856
Change-Id: I17afbe07047e4e07fa520ab8dff899b58796f53f
Former-commit-id: 64fde808f4648dd846e156baf052a65ab11ebc90
|
2015-06-23 16:50:21 +00:00 |
|
Joshua Watson
|
f6d61cc1e6
|
VLab Issue #8489 - Add ESTOFS Pacific basin data; fixes #8489
Change-Id: I033bcc8116f7d4bef4aa017fd62ea8f049372ca4
Former-commit-id: 694cbaad0bad4aae7c2e67c44ca3106a73b97d77
|
2015-06-22 14:37:43 -04:00 |
|
Richard Peter
|
5d1d0d66b5
|
Merge "Omaha #4422: Support ingest and display of NAM12 simulated satellite data in D2D and GFE." into omaha_16.1.1
Former-commit-id: d5ad5d6ecdc3a4ca6b2b63a2e23aab24fbea806c
|
2015-06-15 17:17:52 -05:00 |
|
David Gillingham
|
bbcff29843
|
Omaha #4422: Support ingest and display of NAM12 simulated satellite data in D2D and GFE.
Change-Id: Ic2afdc7d0d3487b5f9ee8faa4e44a0341c24eb88
Former-commit-id: 0e5a00548514123df7e2439e51878e492cdf3a6f
|
2015-06-15 17:02:01 -05:00 |
|
Benjamin Phillippe
|
187626a1e2
|
Omaha #4542 Added ingest/display support for PPQPF grib products
Change-Id: Idd68fee783e509d1095504f72975bd5bb62969f6
Former-commit-id: a29d74f03c93568683d8b1d1f49318253aa6bfdd
|
2015-06-11 17:12:38 -05:00 |
|
David Gillingham
|
cb3d76f7ae
|
Omaha #4421: Add GEFS to Volume Browser Volume sources menu.
Change-Id: I084300b8b5a725331de6a1498b48e216a637d015
Former-commit-id: 682cf00626328a5296e69c5356a8740e25656a22
|
2015-06-11 12:24:25 -05:00 |
|
Steve Harris
|
4de63454fc
|
Merge tag 'OB_15.1.1-16' into omaha_16.1.1
15.1.1-16
Conflicts:
cave/com.raytheon.viz.gfe/build.properties
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
|
2015-06-05 15:38:00 -05:00 |
|
Fay.Liang
|
c9e484c311
|
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into int_15.1.1
Former-commit-id: f2b3a2fc2c1a5362673fed5b4841cd6d5d86ea5d
|
2015-05-29 15:43:59 -04:00 |
|
Fay.Liang
|
31496dac17
|
Merge tag 'OB_14.4.1-47' into int_15.1.1
14.4.1-47
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
|
2015-05-29 15:42:40 -04:00 |
|
Ana Rivera
|
d5da5dfff6
|
Merge branch 'master_15.1.1'(master_15.1.1-12) into field_15.1.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9c737b735af5d1066448c71e1ffc09a1129f7435
Former-commit-id: 1f5ab00d137a3e5e75a20b15a65c4b34596a9b38
|
2015-05-21 13:39:59 +00:00 |
|