Steve Harris
|
2841134c60
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 3f2058a1ab [formerly 89606076ec] [formerly 3f2058a1ab [formerly 89606076ec] [formerly ddc6f2092a [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]
Former-commit-id: ddc6f2092a
Former-commit-id: 304d918a7c [formerly 1f033d22e6]
Former-commit-id: 323c240f59
|
2014-06-24 10:57:56 -05:00 |
|
steve.naples
|
3638879057
|
ASM #253 Update RadarBiasTableDialog to allow undo changes.
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: 2a49bbda2f [formerly efe877d82b] [formerly 2a49bbda2f [formerly efe877d82b] [formerly 90ed511478 [formerly fcd20d35abf3617701cc797baf9ba2b3984379c8]]]
Former-commit-id: 90ed511478
Former-commit-id: 2e77b74c44 [formerly 362e1ce880]
Former-commit-id: 5dcda5cabc
|
2014-06-24 15:52:23 +00:00 |
|
Nate Jensen
|
b1ab93a361
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: c7c0d9cb4b [formerly 51da67dd3f] [formerly c7c0d9cb4b [formerly 51da67dd3f] [formerly 97ef9fc343 [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]]
Former-commit-id: 97ef9fc343
Former-commit-id: 416e6fc85d [formerly a3c20eb98a]
Former-commit-id: 9a3a4d5bfd
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
196f53e609
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 419c5f4aba
Former-commit-id: af06c5a890 [formerly 66d30e59a3]
Former-commit-id: 935542914d
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
b602d29456
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: be589ceb9b [formerly 399c06820a] [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: e28febcf27 [formerly 9031f58d02]
Former-commit-id: 3e10995d87
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
03f8202ff2
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Merge branch 'master_14.1.3_merge' into master_14.1.3
Former-commit-id: 06c565d74f [formerly 30d8644fa5] [formerly 06c565d74f [formerly 30d8644fa5] [formerly 482f915b42 [formerly 4b317062ce5c35823210cbbf023c0f0fc8051ef3]]]
Former-commit-id: 482f915b42
Former-commit-id: c1bd7a0c55 [formerly 072a4a9d63]
Former-commit-id: ce9ebc90f5
|
2014-06-13 14:05:49 -04:00 |
|
Brian.Dyke
|
3da13f3d12
|
CM-MERGE:OB13.5.6-3 into 14.1.3
Former-commit-id: 5064d24e26 [formerly 346bf852cd] [formerly 5064d24e26 [formerly 346bf852cd] [formerly 81832d97e5 [formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]
Former-commit-id: 81832d97e5
Former-commit-id: 764b729546 [formerly 4bca0769fb]
Former-commit-id: 766974a05d
|
2014-06-13 13:21:19 -04:00 |
|
David Friedman
|
3b686ca052
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: 6d0d3f5ba5 [formerly b8542c1332] [formerly 6d0d3f5ba5 [formerly b8542c1332] [formerly 1c84c31e30 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]]
Former-commit-id: 1c84c31e30
Former-commit-id: 0ba91c6c28 [formerly 8c8f54994b]
Former-commit-id: d50646b479
|
2014-06-11 13:37:16 +00:00 |
|
Brian.Dyke
|
1ae1410e46
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 0f07e14bf1 [formerly f72380ad60] [formerly 0f07e14bf1 [formerly f72380ad60] [formerly 9ab17ddecb [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 816dcf74e4 [formerly 49cd9574d9]
Former-commit-id: a4b39dfca5
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
a39afc1dfa
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: ef5c74dece [formerly c1b3f9d180] [formerly ef5c74dece [formerly c1b3f9d180] [formerly 8874d41872 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]
Former-commit-id: 8874d41872
Former-commit-id: 4f0fc67b1f [formerly f568b5606a]
Former-commit-id: 81d732477e
|
2014-06-10 12:52:59 -04:00 |
|
Mike Duff
|
bb122607cc
|
ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: b876d9755a [formerly 81ab64d7ff] [formerly b876d9755a [formerly 81ab64d7ff] [formerly 39173c380c [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]]
Former-commit-id: 39173c380c
Former-commit-id: 60fe02137f [formerly b880d171d4]
Former-commit-id: 4b9f707a06
|
2014-06-06 16:03:14 -04:00 |
|
Michael Gamazaychikov
|
94595e6af4
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: e5a9fa0827 [formerly c07bcacbf8] [formerly e5a9fa0827 [formerly c07bcacbf8] [formerly 50ab77046b [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]
Former-commit-id: 50ab77046b
Former-commit-id: a2423cfadc [formerly 5efb82ea3e]
Former-commit-id: 29e197404f
|
2014-06-05 13:43:04 +01:00 |
|
Zhidong.Hao
|
33086a8085
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: ccbda4db4f [formerly 26c6801620] [formerly ccbda4db4f [formerly 26c6801620] [formerly 71ab6b9ed0 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: 9094e822e0 [formerly e5c47a51eb]
Former-commit-id: 3a9abec04b
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
974b796441
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: f405e8c89c [formerly 562f53874a] [formerly f405e8c89c [formerly 562f53874a] [formerly f74b1707f9 [formerly 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6]]]
Former-commit-id: f74b1707f9
Former-commit-id: ab985767bd [formerly 69a4d1e3b9]
Former-commit-id: 40660547cf
|
2014-05-22 12:46:56 -04:00 |
|
Michael Gamazaychikov
|
0217549622
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 8ae5d535de [formerly 63409ef272] [formerly 8ae5d535de [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: 0d38d04dad [formerly 134f486069]
Former-commit-id: 55d44735ef
|
2014-05-21 15:12:08 +01:00 |
|
Brian.Dyke
|
b0b377e811
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 822ad181bf [formerly 2fd18d14d6] [formerly 822ad181bf [formerly 2fd18d14d6] [formerly db68b80bbd [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]
Former-commit-id: db68b80bbd
Former-commit-id: 937b9bb9ce [formerly ebcaebb28d]
Former-commit-id: f42d40c3a3
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
3d35be33cb
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: c4b7b8dd74 [formerly dbd3bb54e8] [formerly c4b7b8dd74 [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f2885c9996 [formerly f30bd7d9ae]
Former-commit-id: 39d8bd9004
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
b65a3a3214
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 2eae2be646 [formerly b29db01a59] [formerly 2eae2be646 [formerly b29db01a59] [formerly 06c2478539 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]
Former-commit-id: 06c2478539
Former-commit-id: 3558d8f162 [formerly 9baa09f4bc]
Former-commit-id: c88e8d41b6
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
7cd2402325
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 6e034005e0 [formerly 94fea6748f] [formerly 6e034005e0 [formerly 94fea6748f] [formerly 9c1587b92d [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]]
Former-commit-id: 9c1587b92d
Former-commit-id: ec6053c3f7 [formerly baa1546e39]
Former-commit-id: b82d8bf6fb
|
2014-05-19 15:40:41 +01:00 |
|
Brian.Dyke
|
eefa4dbf96
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: 509616ba6a [formerly f8ed9c7944] [formerly 509616ba6a [formerly f8ed9c7944] [formerly e9bd17a21f [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]]
Former-commit-id: e9bd17a21f
Former-commit-id: e563eb3376 [formerly 409a48b907]
Former-commit-id: acf4cbbd78
|
2014-05-19 07:55:42 -04:00 |
|
Brian.Dyke
|
1d53f6d304
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: f38d0138e6 [formerly 627541512d] [formerly f38d0138e6 [formerly 627541512d] [formerly d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]
Former-commit-id: d3fa10028c
Former-commit-id: b0837b4905 [formerly 68f3a0169e]
Former-commit-id: f87775928f
|
2014-05-14 16:08:16 -04:00 |
|
Brian.Dyke
|
4cedfadd77
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: 5a2e0c7e1b [formerly e95bc87a19] [formerly 5a2e0c7e1b [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: f9474b087e [formerly 0311366ffb]
Former-commit-id: 3b7a2f1645
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
82045e2409
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
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/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: 848519177d [formerly cf62cf4a6e] [formerly 848519177d [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: 32f255cada [formerly 233922471a]
Former-commit-id: 74a325ce74
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
464cc1a479
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3aa2f7974b [formerly 386ec058e1] [formerly 3aa2f7974b [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]
Former-commit-id: 41ba5fc348
Former-commit-id: dc5bc1d2a4 [formerly 2f704c898d]
Former-commit-id: 82663c0ab6
|
2014-05-12 14:07:11 -04:00 |
|
Ben Steffensmeier
|
0d52351d27
|
Issue #3119 Optimize plot rendering.
Former-commit-id: a19a5bf986 [formerly d7cb05fd92] [formerly a19a5bf986 [formerly d7cb05fd92] [formerly 7274d01d64 [formerly 006df5b77f8f09e0b083b3c3e644744653f3d269]]]
Former-commit-id: 7274d01d64
Former-commit-id: bd08996223 [formerly 9701f68f40]
Former-commit-id: 9274027a7a
|
2014-05-07 13:27:48 -05:00 |
|
Brian.Dyke
|
0daec2c83b
|
Merged 13.5.5 -4 into 1412
Former-commit-id: 5a6425b6b0 [formerly f27d1b1efe] [formerly 5a6425b6b0 [formerly f27d1b1efe] [formerly 30bbd2d1cd [formerly 5644361dffaae25c63748a52c23506907210c741]]]
Former-commit-id: 30bbd2d1cd
Former-commit-id: 4155179c42 [formerly 8bf824a625]
Former-commit-id: e0cd200cee
|
2014-05-07 13:07:15 -04:00 |
|
Brian.Dyke
|
4f425f71e6
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 5461f75e41 [formerly 238e8f7ba1] [formerly 5461f75e41 [formerly 238e8f7ba1] [formerly e3b0b44b71 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]]
Former-commit-id: e3b0b44b71
Former-commit-id: 430543e848 [formerly 43cc1d0b91]
Former-commit-id: fe9aeb1961
|
2014-05-06 11:34:46 -04:00 |
|
Brian.Dyke
|
9d60a1030a
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: 0253aa5d7f [formerly 90fecdc71e] [formerly 0253aa5d7f [formerly 90fecdc71e] [formerly 04b8da6f73 [formerly 9adc24725f9bd3499d8f498990413df7718de83e]]]
Former-commit-id: 04b8da6f73
Former-commit-id: 695bf96cef [formerly 884a1d2f2b]
Former-commit-id: 8f6a58d5c5
|
2014-05-06 11:25:15 -04:00 |
|
Steve Harris
|
4fe84ba0fd
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 9e149df799 [formerly 6ef3b9f1e5] [formerly 9e149df799 [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 927a87b126 [formerly b797b4b1fa]
Former-commit-id: 17318b1870
|
2014-05-05 08:21:02 -05:00 |
|
David Gillingham
|
da652d1c4a
|
Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf
Former-commit-id: 850eecb1b9 [formerly aa78ed1b69] [formerly 850eecb1b9 [formerly aa78ed1b69] [formerly f368412ef2 [formerly 3d8a23e2e2802d19768de47c61cedb723ec53c8f]]]
Former-commit-id: f368412ef2
Former-commit-id: 3c4ee53300 [formerly b3a859fe39]
Former-commit-id: 64bd4b81dc
|
2014-05-01 16:19:51 -05:00 |
|
Ben Steffensmeier
|
887c707fa5
|
Issue #3100 Time match mosaics on data update.
Former-commit-id: ae1af14ccd [formerly d98bdd64d8] [formerly ae1af14ccd [formerly d98bdd64d8] [formerly 897f67301c [formerly 3655558c91224a57a31cfb25389cee33258e0227]]]
Former-commit-id: 897f67301c
Former-commit-id: c7343cad6b [formerly f4f158f228]
Former-commit-id: cfc21e1717
|
2014-05-01 14:17:33 -05:00 |
|
Qinglu.Lin
|
f8c13f1d3b
|
ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: b51bdd9107 [formerly e489658072] [formerly b51bdd9107 [formerly e489658072] [formerly 13c81f9468 [formerly 108895dccefb42c71d0f47b13bfd64591e8dca98]]]
Former-commit-id: 13c81f9468
Former-commit-id: 895a652b4c [formerly caf57dbabe]
Former-commit-id: 1bdf714eba
|
2014-05-01 14:49:27 -04:00 |
|
Ron Anderson
|
6fe1a0d1b7
|
Issue #3097 Fix return type for SmartScript.getGrids()
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0
Former-commit-id: fcfd6e4c00 [formerly 374e8224f1] [formerly fcfd6e4c00 [formerly 374e8224f1] [formerly 613aa1e94a [formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]]]
Former-commit-id: 613aa1e94a
Former-commit-id: 9bcd5d3f4a [formerly 8ba17da4df]
Former-commit-id: 453065268c
|
2014-04-30 17:26:57 +00:00 |
|
Brian.Dyke
|
1aec51b7c4
|
Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: c5e29cc46a [formerly 35b637c3e2] [formerly c5e29cc46a [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: f8c3dca497 [formerly 59f34e3108]
Former-commit-id: 85bf52ef22
|
2014-04-29 12:07:21 -04:00 |
|
brian.dyke
|
72895ea055
|
Merge branch 'master_14.2.1' into asm_14.2.1
Merge (master_14.2.1-21) into asm_14.2.1
Former-commit-id: ddfc734c26 [formerly 6cc1c166f9] [formerly ddfc734c26 [formerly 6cc1c166f9] [formerly cbe7b3ec72 [formerly 2cd6c57e232b4f4a2a24c54d74e7ce9f08351b79]]]
Former-commit-id: cbe7b3ec72
Former-commit-id: 40615bd734 [formerly 149058069f]
Former-commit-id: 3df3d28a8b
|
2014-04-28 14:06:15 -04:00 |
|
Shawn.Hooper
|
b8a3b168d2
|
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: 9182d8428a [formerly a3e52e8cea] [formerly 9182d8428a [formerly a3e52e8cea] [formerly b4597dc021 [formerly 968a136e81b6247a03af9b78643c388d21a4218b]]]
Former-commit-id: b4597dc021
Former-commit-id: 1e4aeb5842 [formerly eeaba5539f]
Former-commit-id: 947b31eb6e
|
2014-04-25 10:40:43 -04:00 |
|
Brian.Dyke
|
378332d8bb
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: eff27f5504 [formerly a19f01c620] [formerly eff27f5504 [formerly a19f01c620] [formerly e82fc8f89c [formerly 4e921dbeab89e61635144b441ae0015155376c59]]]
Former-commit-id: e82fc8f89c
Former-commit-id: af2d8f5bad [formerly df6f06bef5]
Former-commit-id: 0fa669acce
|
2014-04-24 13:01:50 -04:00 |
|
Brian.Dyke
|
2161c569ea
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 88d44a3129 [formerly 2a4fe3dbae] [formerly 88d44a3129 [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 953236aad8 [formerly 911c0c6c17]
Former-commit-id: 26cb172a04
|
2014-04-23 14:05:50 -04:00 |
|
Dave Hladky
|
4ce5dfcd92
|
Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 91bd735d47 [formerly 61fc2fea51] [formerly 91bd735d47 [formerly 61fc2fea51] [formerly 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]
Former-commit-id: 45059e722a
Former-commit-id: 117a3953af [formerly ae84d2991e]
Former-commit-id: 6c83fd0929
|
2014-04-21 12:26:47 -05:00 |
|
Brian.Dyke
|
8275f3907f
|
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 53ce26a9b6 [formerly 1aec3b3698] [formerly 53ce26a9b6 [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]
Former-commit-id: 645fe64a4a
Former-commit-id: 66974e17b9 [formerly 4eb3317f80]
Former-commit-id: 59cbfdf093
|
2014-04-17 14:42:44 -04:00 |
|
Brian.Dyke
|
de500c093f
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 9df6fb2d4d [formerly 12a482e1d7] [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 6f35818917 [formerly 0ea7c51ad7]
Former-commit-id: a925ba6219
|
2014-04-17 14:42:35 -04:00 |
|
Nate Jensen
|
f607630d72
|
Issue #3018 addressing code review comments
Former-commit-id: 54951100af [formerly e327f5e0bf] [formerly 54951100af [formerly e327f5e0bf] [formerly 8ba6b2722d [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: 81f8f6f328 [formerly 8b6650c898]
Former-commit-id: 3737ad85b6
|
2014-04-17 09:28:47 -05:00 |
|
Ron Anderson
|
d704f90445
|
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: 85a1f55ea0 [formerly f9a393172f] [formerly 85a1f55ea0 [formerly f9a393172f] [formerly 1ba72371be [formerly 6813b32786289503950322c02e32803299566c5d]]]
Former-commit-id: 1ba72371be
Former-commit-id: 2139c2308e [formerly 7d09397faa]
Former-commit-id: 94f852cda7
|
2014-04-16 18:02:11 -05:00 |
|
Nate Jensen
|
de32624fdf
|
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: 781ec3ecd6 [formerly a085b71c81] [formerly 781ec3ecd6 [formerly a085b71c81] [formerly c362af04f3 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]]
Former-commit-id: c362af04f3
Former-commit-id: 1a40bc4824 [formerly e1caa66625]
Former-commit-id: e4aeb8394d
|
2014-04-16 17:25:09 -05:00 |
|
Nate Jensen
|
64e7ac4225
|
Issue #3039 fix ifpImage class cast exception
Former-commit-id: a5edace073 [formerly 2b6db445c0] [formerly a5edace073 [formerly 2b6db445c0] [formerly 31fb61e824 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]
Former-commit-id: 31fb61e824
Former-commit-id: 19f0be6afc [formerly a1dd7f24fa]
Former-commit-id: 7e7bbfd784
|
2014-04-16 16:17:05 -05:00 |
|
Brian.Dyke
|
73efa466f9
|
Merged 13.5.5-1 into 1412
Former-commit-id: 65ad515a6e [formerly 188d84cc87] [formerly 65ad515a6e [formerly 188d84cc87] [formerly 35ad867281 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]]
Former-commit-id: 35ad867281
Former-commit-id: c0266e8988 [formerly 72618c4214]
Former-commit-id: 737283b94a
|
2014-04-16 12:09:12 -04:00 |
|
Ron Anderson
|
072102dff0
|
Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: 2a68e875a5 [formerly 6e0147169f] [formerly 2a68e875a5 [formerly 6e0147169f] [formerly 9f085a0856 [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]
Former-commit-id: 9f085a0856
Former-commit-id: a6fa60f40d [formerly 4622ad9b8a]
Former-commit-id: 56a1b8b682
|
2014-04-15 17:22:12 -05:00 |
|
brian.dyke
|
f299a28f9b
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: 6a9ccba393 [formerly 6575f77fe3] [formerly 6a9ccba393 [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]
Former-commit-id: a8d6d58f31
Former-commit-id: 88ddd667b6 [formerly ad63114f16]
Former-commit-id: 1c4e02168c
|
2014-04-11 10:58:48 -04:00 |
|
Brian.Dyke
|
fbefee3e1d
|
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: 73be1016c0 [formerly 8c2f601b59] [formerly 73be1016c0 [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: afc1da9015 [formerly ff51498036]
Former-commit-id: f051b95a7a
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
421b2716a4
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 5676090443 [formerly 95eba8dcf6] [formerly 5676090443 [formerly 95eba8dcf6] [formerly b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]
Former-commit-id: b15d288530
Former-commit-id: f1b85f6964 [formerly 73aab15d85]
Former-commit-id: b667e0509f
|
2014-04-09 16:00:54 -05:00 |
|