Ana Rivera
063cb084fc
Merge "VLab Issue #11629:NamDNG changes; fixes #11629 " into field_16.2.2
...
Former-commit-id: 7bc352d786db1b38048ef5c92624a47a72c57627
2016-03-03 13:52:56 +00:00
Joshua Watson
226c8feb87
VLab Issue #11631:NAVGEM changes; fixes #11631
...
Change-Id: Ief86879960f137e5dbfdf5d56337b1e5e5d5d952
Former-commit-id: e61914b51f5dc6d5fca3bba2b9420ef3bdad48f1
2016-03-01 15:21:04 -05: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
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
Nathan Bowler
03f7c1d700
Omaha #5183 Add PWPF data.
...
Change-Id: Ib37670d67534f457dd15e9ac912f076f9093e7c9
Former-commit-id: 7aeb4ae1c85f837eef279e224cdf1323dadc0569
2016-01-21 16:34:59 -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
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
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
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
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
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
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
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
Steve Harris
9b3d8a8443
Merge tag 'OB_15.1.1-12' into omaha_16.1.1
...
15.1.1-12
Conflicts:
build/deploy.edex.awips2/esb/bin/setup.env
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.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
Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
David Gillingham
6754cf45a4
Omaha #4384 (and 4385): Fix volume browser menus for NWPS models, display vector arrows for all mag values greater than 1.0.
...
Change-Id: Ib3b5a7fcf060364c09fadf57bd5b7151a4f6828e
Former-commit-id: bc3abb1effa93ff76c8287f59b64dd73017f3ad8
2015-05-11 14:57:00 -05:00
Matthew Foster
4b06688205
VLab Issue #8088 - Volume Browser ensemble/SREF/Aviation menu file has incorrect contents; fixes #8088
...
Change-Id: Ia497e1aa8c1a954f1878283ebb527ec6233b48e7
Former-commit-id: 99a24163e22b46f20a4ec31e6f4d08c916e95152
2015-05-08 19:01:48 +00:00
Melissa Porricel
037427861a
ASM #7951 - Add RTMA menu items to Misc/Aviation VB menu
...
Change-Id: Idddde521d6c2403d8a76f3341e977d217b8469d6
Former-commit-id: 4f1ad3c4db5d5e8ec77870c34a9d66c440be2691
2015-05-08 12:51:59 -04: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
Slav Korolev
b2bcc8f79e
Omaha #4298 - Ingest and display National Blend of Global Models
...
Former-commit-id: ec1f5aa2da4c404b75eccf917845b653fd5eca4d
2015-04-21 14:35:05 -04:00
Ana Rivera
0f2e031c70
Merge branch 'master_15.1.1' into field_15.1.1
...
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml was removed.
"Visibility Anl Uncertainty" entry in .../fields/planview-timeseries/other.xml was added to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/misc.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
Change-Id: I4cac5e1ee29119569cb19c235ec5d1664eb08b8c
Former-commit-id: 4dad0cb77e2101fc8ec2d46924b6c64dcc0d12cb
2015-04-20 19:14:43 +00:00
Steve Harris
5932df4786
Merge tag 'OB_15.1.1-6' into omaha_16.1.1
...
15.1.1-5
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
Former-commit-id: 97efa605a593b2ce6c9a9a97192ecc5223511e88
2015-04-20 08:09:45 -05:00
