Richard Peter
|
530b3bd588
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]
Former-commit-id: 60679a818a
|
2013-12-05 12:12:27 -06:00 |
|
Steve Harris
|
2c49ed51ac
|
14.1.1-10 baseline
Former-commit-id: 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304]
Former-commit-id: e35ec60f7e
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
1902ca9cfb
|
14.1.1-8 baseline
Former-commit-id: 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9]
Former-commit-id: b7ca6163e3
|
2013-11-13 12:32:17 -05:00 |
|
Richard Peter
|
aec254aac0
|
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 93c776022a [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4 [formerly 520dd57f02]
Former-commit-id: c97efbf656
|
2013-11-07 14:25:45 -06:00 |
|
Ben Steffensmeier
|
726d1728fd
|
Issue #2493 remove mesowest.
Former-commit-id: c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly 36916fedcd [formerly d0b7966458 [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]
Former-commit-id: 36916fedcd
Former-commit-id: 80b4ead107b43174bee5092e0af3bc24e421205f [formerly baebe37ba6]
Former-commit-id: 5d31aad5c2
|
2013-11-06 13:42:38 -06:00 |
|
Steve Harris
|
4d2f53ebc6
|
14.1.1-7 baseline
Former-commit-id: 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653]
Former-commit-id: b694612fe0
|
2013-11-06 14:16:14 -05:00 |
|
Roger Ferrel
|
31b3bb3645
|
Issue #2497 Change process root directory to /archive.
Change-Id: Ib5cecb7c0af0e844c4ee37b5dc7fb129023048dc
Former-commit-id: 0a1ed62dd1 [formerly 484549ce4a] [formerly acacd515a6] [formerly 2f8903478e [formerly acacd515a6 [formerly 6c932f08915704fcdf44b66ad396175ccd7f544f]]]
Former-commit-id: 2f8903478e
Former-commit-id: 72a1519ad0df774b7a58c9deccd83a584d643b55 [formerly 553e189b05]
Former-commit-id: aee4d90569
|
2013-11-05 12:45:37 -06:00 |
|
Roger Ferrel
|
91b64293fe
|
Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967
Former-commit-id: 8ddb8ca55b [formerly c959cedd99] [formerly 7f7064d457] [formerly 42705e4dfa [formerly 7f7064d457 [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 00c2406d52accdc4576d75bc6b343c8f99e96c0a [formerly 4c27adcc53]
Former-commit-id: 220769dab0
|
2013-10-03 12:33:26 -05:00 |
|
Roger Ferrel
|
a6316240e5
|
Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859
Former-commit-id: 0c9b15df71 [formerly 2ba7117d13] [formerly a76fc08e93] [formerly e65b8a9f6e [formerly a76fc08e93 [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: a2267cf171606a2eb1d0fafc1259f9998139b1a7 [formerly 71737f069d]
Former-commit-id: 34ea90f18a
|
2013-10-01 16:36:34 -05:00 |
|
Roger Ferrel
|
00d93b372f
|
Issue #2224 Unit test now handles different time types and configuation changes.
Change-Id: I7f082b55ae112b1835ebdb516da85b2267e546e7
Former-commit-id: 56a36ae7a6 [formerly a3b5774a41] [formerly c565c6e6be] [formerly 633baeb268 [formerly c565c6e6be [formerly a88d522a58297f399f2100195c01cf4c54b1f508]]]
Former-commit-id: 633baeb268
Former-commit-id: c25cdc7dd2dfc330008aff53e33c562c8a9e51f8 [formerly 0d3dbaf89b]
Former-commit-id: 43f09e1e2b
|
2013-09-12 11:50:23 -05:00 |
|
Roger Ferrel
|
78b3872882
|
Issue #2224 Bug fixes to pass unit test.
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00
Former-commit-id: 4ad10dd3c8 [formerly 8da461743f] [formerly 3569155bc0] [formerly ac538a0476 [formerly 3569155bc0 [formerly 3a7e798e473e90de6fe4e6f50c645ecce5a37c51]]]
Former-commit-id: ac538a0476
Former-commit-id: d06f670064335340c28b4e06adde6c367c8e30ed [formerly d7db78d9e8]
Former-commit-id: 5d3f410f14
|
2013-09-12 11:42:26 -05:00 |
|
Roger Ferrel
|
c11713b2cb
|
Issue #2224 Changes to have DataSet in configuration.
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8
Former-commit-id: cdc5ef03cc [formerly 4e9a6a73e3] [formerly 8110b6f450] [formerly ecef7234a5 [formerly 8110b6f450 [formerly 80b773eecdce3d80e35262f04d56f6ae37d369bb]]]
Former-commit-id: ecef7234a5
Former-commit-id: d7dd55f30e9686165356faedf415e08abb78ebf9 [formerly a08b099e8c]
Former-commit-id: c32aac47b1
|
2013-09-12 11:42:03 -05:00 |
|
Steve Harris
|
340e7bab60
|
13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]
Former-commit-id: a7d4c6274e
|
2013-07-26 09:02:34 -04:00 |
|
Greg Armendariz
|
f23d42e977
|
13.5.1-6 baseline
Former-commit-id: e375a74bc8 [formerly 5894853996] [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 760e0f04ffe2e9d265f85e7c8b4777777bcf64d5 [formerly 12a09f9aa7]
Former-commit-id: 93b71934c0
|
2013-07-10 10:04:22 -04:00 |
|
Steve Harris
|
43bb696901
|
13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]
Former-commit-id: 640b022e84
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
43b7a9b410
|
13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]
Former-commit-id: 0aab285b8a
|
2013-06-10 15:17:17 -04:00 |
|