Zhidong.Hao
|
e842be1d53
|
ASM #106 - AvnFPS Monitor TAF valid time display different from A1
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325
Former-commit-id: 43e1a5a909 [formerly ccbda4db4f] [formerly 26c6801620] [formerly 43e1a5a909 [formerly ccbda4db4f] [formerly 26c6801620] [formerly 71ab6b9ed0 [formerly 26c6801620 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: 460b543c6d [formerly 9094e822e0] [formerly c17aa2176430d3a612529390ab4b68f86ac03181 [formerly e5c47a51eb]]
Former-commit-id: 16d700e0af2365b3ff5388b53260c131a361d620 [formerly 3a9abec04b]
Former-commit-id: 33086a8085
|
2014-06-03 11:55:32 -04:00 |
|
brian.dyke
|
baa0b53942
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: ed62e77a57 [formerly f405e8c89c] [formerly 562f53874a] [formerly ed62e77a57 [formerly f405e8c89c] [formerly 562f53874a] [formerly f74b1707f9 [formerly 562f53874a [formerly 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6]]]]
Former-commit-id: f74b1707f9
Former-commit-id: a4ade097f7 [formerly ab985767bd] [formerly 3a90970de36c174b3d02e2cc523d82dcac4a7768 [formerly 69a4d1e3b9]]
Former-commit-id: 72a2e2d8091afbd8fc3249fa01ea9e8ae03904a5 [formerly 40660547cf]
Former-commit-id: 974b796441
|
2014-05-22 12:46:56 -04:00 |
|
Michael Gamazaychikov
|
a8672786bf
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: b3d76892d1 [formerly 8ae5d535de] [formerly 63409ef272] [formerly b3d76892d1 [formerly 8ae5d535de] [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: b499ee2828 [formerly 0d38d04dad] [formerly 3f60fc9aefaa49ce841bebfd87ef42af677038af [formerly 134f486069]]
Former-commit-id: de7589ac82c2fe4ab8fce61c3a0e6a30b30502d2 [formerly 55d44735ef]
Former-commit-id: 0217549622
|
2014-05-21 15:12:08 +01:00 |
|
Brian.Dyke
|
4671c25ea4
|
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: 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]]
Former-commit-id: db68b80bbd
Former-commit-id: 5a07e9c984 [formerly 937b9bb9ce] [formerly 6fbbfc0267046011d5fd8ba4c15aa6b2ab182188 [formerly ebcaebb28d]]
Former-commit-id: 6e138f1746a6c0aa092e3c298cd91ece951e39d3 [formerly f42d40c3a3]
Former-commit-id: b0b377e811
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
be5e377068
|
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: 432e5f15a5 [formerly c4b7b8dd74] [formerly dbd3bb54e8] [formerly 432e5f15a5 [formerly c4b7b8dd74] [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly dbd3bb54e8 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f113398a16 [formerly f2885c9996] [formerly 9eb0d56ad4743d868045273e945e80f0d2e0674f [formerly f30bd7d9ae]]
Former-commit-id: b203c0e47900941c64b4992284bdc8701c374b29 [formerly 39d8bd9004]
Former-commit-id: 3d35be33cb
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
be2b29e0f3
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 75f7d77c45 [formerly 2eae2be646] [formerly b29db01a59] [formerly 75f7d77c45 [formerly 2eae2be646] [formerly b29db01a59] [formerly 06c2478539 [formerly b29db01a59 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]]
Former-commit-id: 06c2478539
Former-commit-id: 534d211494 [formerly 3558d8f162] [formerly 8d732a149cd7483006dfc9f0e4e9c03c2adcc03f [formerly 9baa09f4bc]]
Former-commit-id: 976e0f4a32e004b04954001cee7a9831fc35972a [formerly c88e8d41b6]
Former-commit-id: b65a3a3214
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
f029bd627d
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 98e50ae694 [formerly 6e034005e0] [formerly 94fea6748f] [formerly 98e50ae694 [formerly 6e034005e0] [formerly 94fea6748f] [formerly 9c1587b92d [formerly 94fea6748f [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]]]
Former-commit-id: 9c1587b92d
Former-commit-id: 03dfdaffd4 [formerly ec6053c3f7] [formerly cf5b27d037d8ebdd2e427efe07f404e425a82240 [formerly baa1546e39]]
Former-commit-id: b3045b8c7359818619329a1fdacbf426709f3318 [formerly b82d8bf6fb]
Former-commit-id: 7cd2402325
|
2014-05-19 15:40:41 +01:00 |
|
Brian.Dyke
|
0545cfd2f6
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: a9f2fdb086 [formerly 509616ba6a] [formerly f8ed9c7944] [formerly a9f2fdb086 [formerly 509616ba6a] [formerly f8ed9c7944] [formerly e9bd17a21f [formerly f8ed9c7944 [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]]]
Former-commit-id: e9bd17a21f
Former-commit-id: 3772c8d2bf [formerly e563eb3376] [formerly d77fe7357769ccd29689730a70de23400e90fee7 [formerly 409a48b907]]
Former-commit-id: ffcdc5842385a946631a64cb44a2f992361237b3 [formerly acf4cbbd78]
Former-commit-id: eefa4dbf96
|
2014-05-19 07:55:42 -04:00 |
|
Brian.Dyke
|
0febfec9e7
|
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: 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: a6b42a776b [formerly b0837b4905] [formerly 91d88625eae6852df94fbb04133d89826c605aad [formerly 68f3a0169e]]
Former-commit-id: c54c6441e46c95271889db670ff46e1bedce8459 [formerly f87775928f]
Former-commit-id: 1d53f6d304
|
2014-05-14 16:08:16 -04:00 |
|
Brian.Dyke
|
db6b79a08f
|
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: e705786d12 [formerly 5a2e0c7e1b] [formerly e95bc87a19] [formerly e705786d12 [formerly 5a2e0c7e1b] [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: bdbb6ec0fe [formerly f9474b087e] [formerly adafd612a1e8c387205bf9a2e7dcfd2a03d117c9 [formerly 0311366ffb]]
Former-commit-id: 4d9e420076ab9a3d2cb731f4d97896138289b45b [formerly 3b7a2f1645]
Former-commit-id: 4cedfadd77
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
24df80c520
|
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: 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74]
Former-commit-id: 82045e2409
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
9bc1055c87
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 4004b627e2 [formerly dc5bc1d2a4] [formerly 3193dce8b50276edb5c6e0829236339aa91b9172 [formerly 2f704c898d]]
Former-commit-id: 4b5ff1e5a8372daadb66b3b58132714ed0a54eae [formerly 82663c0ab6]
Former-commit-id: 464cc1a479
|
2014-05-12 14:07:11 -04:00 |
|
Ben Steffensmeier
|
0400944d82
|
Issue #3119 Optimize plot rendering.
Former-commit-id: 4ae6884a41 [formerly a19a5bf986] [formerly d7cb05fd92] [formerly 4ae6884a41 [formerly a19a5bf986] [formerly d7cb05fd92] [formerly 7274d01d64 [formerly d7cb05fd92 [formerly 006df5b77f8f09e0b083b3c3e644744653f3d269]]]]
Former-commit-id: 7274d01d64
Former-commit-id: 00d70af6ef [formerly bd08996223] [formerly 60fa5670414d35cc5d89b6666c6faf0458710ed9 [formerly 9701f68f40]]
Former-commit-id: dc49dfe6a957d46ddf6224c15de152ff236e8ef8 [formerly 9274027a7a]
Former-commit-id: 0d52351d27
|
2014-05-07 13:27:48 -05:00 |
|
Brian.Dyke
|
1610b63c31
|
Merged 13.5.5 -4 into 1412
Former-commit-id: dd9f977f4f [formerly 5a6425b6b0] [formerly f27d1b1efe] [formerly dd9f977f4f [formerly 5a6425b6b0] [formerly f27d1b1efe] [formerly 30bbd2d1cd [formerly f27d1b1efe [formerly 5644361dffaae25c63748a52c23506907210c741]]]]
Former-commit-id: 30bbd2d1cd
Former-commit-id: 2f197353c2 [formerly 4155179c42] [formerly 7b5d2a80fe03ddd0ccf8f85a382a8463781d3d7d [formerly 8bf824a625]]
Former-commit-id: db8866e8f93d4899a510e08b96239c6082e50aa5 [formerly e0cd200cee]
Former-commit-id: 0daec2c83b
|
2014-05-07 13:07:15 -04:00 |
|
Brian.Dyke
|
498d65cf2b
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 341e5c86c6 [formerly 5461f75e41] [formerly 238e8f7ba1] [formerly 341e5c86c6 [formerly 5461f75e41] [formerly 238e8f7ba1] [formerly e3b0b44b71 [formerly 238e8f7ba1 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]]]
Former-commit-id: e3b0b44b71
Former-commit-id: ec78d8eaa6 [formerly 430543e848] [formerly 3127e516c70af6d10210a6ef7215b4867cdcea5c [formerly 43cc1d0b91]]
Former-commit-id: f87a93c760bf92376069fe122ffd646b7e7f003e [formerly fe9aeb1961]
Former-commit-id: 4f425f71e6
|
2014-05-06 11:34:46 -04:00 |
|
Brian.Dyke
|
a3f44717e0
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: c6f84d017a [formerly 0253aa5d7f] [formerly 90fecdc71e] [formerly c6f84d017a [formerly 0253aa5d7f] [formerly 90fecdc71e] [formerly 04b8da6f73 [formerly 90fecdc71e [formerly 9adc24725f9bd3499d8f498990413df7718de83e]]]]
Former-commit-id: 04b8da6f73
Former-commit-id: 78c2b4f651 [formerly 695bf96cef] [formerly 146541251c06fef81900f918bd9602e7baa95fbd [formerly 884a1d2f2b]]
Former-commit-id: d3a0335dc82bbdb40b9bc447f09fb2583a945b21 [formerly 8f6a58d5c5]
Former-commit-id: 9d60a1030a
|
2014-05-06 11:25:15 -04:00 |
|
Steve Harris
|
55644af2ca
|
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: 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 4b54c0498e [formerly 927a87b126] [formerly b9b41ab717fa5a9d55725f89e087b2c62f5811fa [formerly b797b4b1fa]]
Former-commit-id: 66b0c211b5eee3caba67b313d56f7fda8fa60cc9 [formerly 17318b1870]
Former-commit-id: 4fe84ba0fd
|
2014-05-05 08:21:02 -05:00 |
|
David Gillingham
|
0de3daedfb
|
Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf
Former-commit-id: f8e5a17f3f [formerly 850eecb1b9] [formerly aa78ed1b69] [formerly f8e5a17f3f [formerly 850eecb1b9] [formerly aa78ed1b69] [formerly f368412ef2 [formerly aa78ed1b69 [formerly 3d8a23e2e2802d19768de47c61cedb723ec53c8f]]]]
Former-commit-id: f368412ef2
Former-commit-id: 2f1d7aeecd [formerly 3c4ee53300] [formerly f5f983e70edc8e09841a2c25cb10ec9abc9bffb2 [formerly b3a859fe39]]
Former-commit-id: 50c20dae3ab7e945eaa90db92077559d66ce1ed0 [formerly 64bd4b81dc]
Former-commit-id: da652d1c4a
|
2014-05-01 16:19:51 -05:00 |
|
Ben Steffensmeier
|
2ccf1ad701
|
Issue #3100 Time match mosaics on data update.
Former-commit-id: e712f37076 [formerly ae1af14ccd] [formerly d98bdd64d8] [formerly e712f37076 [formerly ae1af14ccd] [formerly d98bdd64d8] [formerly 897f67301c [formerly d98bdd64d8 [formerly 3655558c91224a57a31cfb25389cee33258e0227]]]]
Former-commit-id: 897f67301c
Former-commit-id: c6ccfcb8d9 [formerly c7343cad6b] [formerly 81232ce60daba55d6cd98c3aa21f06a4b18435e1 [formerly f4f158f228]]
Former-commit-id: 7c15a67fe97be00253b004e54a15057a9e69cc36 [formerly cfc21e1717]
Former-commit-id: 887c707fa5
|
2014-05-01 14:17:33 -05:00 |
|
Qinglu.Lin
|
15a8bc45e2
|
ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: deb29531b6 [formerly b51bdd9107] [formerly e489658072] [formerly deb29531b6 [formerly b51bdd9107] [formerly e489658072] [formerly 13c81f9468 [formerly e489658072 [formerly 108895dccefb42c71d0f47b13bfd64591e8dca98]]]]
Former-commit-id: 13c81f9468
Former-commit-id: 4c45207ae2 [formerly 895a652b4c] [formerly 5ecbbfe3f8d1edb9f4ce416b7a69ea39fbcab9d6 [formerly caf57dbabe]]
Former-commit-id: 27c17eceadf15fc08fbb4e8aeb1d2ee2b1ce1da9 [formerly 1bdf714eba]
Former-commit-id: f8c13f1d3b
|
2014-05-01 14:49:27 -04:00 |
|
Ron Anderson
|
70dacd1553
|
Issue #3097 Fix return type for SmartScript.getGrids()
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0
Former-commit-id: fa1c34691c [formerly fcfd6e4c00] [formerly 374e8224f1] [formerly fa1c34691c [formerly fcfd6e4c00] [formerly 374e8224f1] [formerly 613aa1e94a [formerly 374e8224f1 [formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]]]]
Former-commit-id: 613aa1e94a
Former-commit-id: 5954a74787 [formerly 9bcd5d3f4a] [formerly 6210770d82431a108e71b3e2243051996167dc6d [formerly 8ba17da4df]]
Former-commit-id: 52d4a5cb088bfe7fe78ec51c870946dd048722c1 [formerly 453065268c]
Former-commit-id: 6fe1a0d1b7
|
2014-04-30 17:26:57 +00:00 |
|
Brian.Dyke
|
2e187af9e4
|
Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 35b637c3e2 [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: fba8753c81 [formerly f8c3dca497] [formerly 864697ab3fb4d67896d81f6bc98951da3ad837df [formerly 59f34e3108]]
Former-commit-id: 756d936948a5f4a794262ababc0423b3b1e3dbfe [formerly 85bf52ef22]
Former-commit-id: 1aec51b7c4
|
2014-04-29 12:07:21 -04:00 |
|
brian.dyke
|
e072c40536
|
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: 7194790129 [formerly ddfc734c26] [formerly 6cc1c166f9] [formerly 7194790129 [formerly ddfc734c26] [formerly 6cc1c166f9] [formerly cbe7b3ec72 [formerly 6cc1c166f9 [formerly 2cd6c57e232b4f4a2a24c54d74e7ce9f08351b79]]]]
Former-commit-id: cbe7b3ec72
Former-commit-id: 9cdf23b9e6 [formerly 40615bd734] [formerly 40f4736cbb836af409e19682b10e140fd2b58eba [formerly 149058069f]]
Former-commit-id: 619db0a52042739daa9a586adda61d5396abea68 [formerly 3df3d28a8b]
Former-commit-id: 72895ea055
|
2014-04-28 14:06:15 -04:00 |
|
Shawn.Hooper
|
2490ae23eb
|
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: 5f03948ff5 [formerly 9182d8428a] [formerly a3e52e8cea] [formerly 5f03948ff5 [formerly 9182d8428a] [formerly a3e52e8cea] [formerly b4597dc021 [formerly a3e52e8cea [formerly 968a136e81b6247a03af9b78643c388d21a4218b]]]]
Former-commit-id: b4597dc021
Former-commit-id: a18261fed2 [formerly 1e4aeb5842] [formerly a33e6c43b4f06a881d7c8dd2482f3b36b99ffad5 [formerly eeaba5539f]]
Former-commit-id: b7ce6a6c977382c082a9531f683d1cb8e9dab4e7 [formerly 947b31eb6e]
Former-commit-id: b8a3b168d2
|
2014-04-25 10:40:43 -04:00 |
|
Brian.Dyke
|
f2993215f3
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: 81d39113fe [formerly eff27f5504] [formerly a19f01c620] [formerly 81d39113fe [formerly eff27f5504] [formerly a19f01c620] [formerly e82fc8f89c [formerly a19f01c620 [formerly 4e921dbeab89e61635144b441ae0015155376c59]]]]
Former-commit-id: e82fc8f89c
Former-commit-id: f1ebebbac1 [formerly af2d8f5bad] [formerly 57b2a8a44845dea3266c201818f90765ddf026ee [formerly df6f06bef5]]
Former-commit-id: 43839e21018da6e40c7fe75ced0db2714eff9e66 [formerly 0fa669acce]
Former-commit-id: 378332d8bb
|
2014-04-24 13:01:50 -04:00 |
|
Brian.Dyke
|
83dce492e5
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 4938304674 [formerly 88d44a3129] [formerly 2a4fe3dbae] [formerly 4938304674 [formerly 88d44a3129] [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 2a4fe3dbae [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 05c0e1ad1c [formerly 953236aad8] [formerly cccb3fd90675126650244cd85cd8a3341749bad8 [formerly 911c0c6c17]]
Former-commit-id: 76c73f256e229c073a4ca79c01bc6c9e1abe965a [formerly 26cb172a04]
Former-commit-id: 2161c569ea
|
2014-04-23 14:05:50 -04:00 |
|
Dave Hladky
|
13137a0a9a
|
Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 45059e722a [formerly 61fc2fea51 [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]]
Former-commit-id: 45059e722a
Former-commit-id: 883febe498 [formerly 117a3953af] [formerly 28cb7341b151f55976a91b298b2eaf8e4e117a17 [formerly ae84d2991e]]
Former-commit-id: 5061f97fcc5146801882be2758be31c8f5835bed [formerly 6c83fd0929]
Former-commit-id: 4ce5dfcd92
|
2014-04-21 12:26:47 -05:00 |
|
Brian.Dyke
|
abdefb3233
|
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 55d7d8dadb [formerly 53ce26a9b6] [formerly 1aec3b3698] [formerly 55d7d8dadb [formerly 53ce26a9b6] [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 1aec3b3698 [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]]
Former-commit-id: 645fe64a4a
Former-commit-id: ec3c3b4bbe [formerly 66974e17b9] [formerly 02f862c461e30bc6f080ca3c5fa4bbbfae2b54a2 [formerly 4eb3317f80]]
Former-commit-id: 8defec1e49367a8a6ccd9f240a592024a450e538 [formerly 59cbfdf093]
Former-commit-id: 8275f3907f
|
2014-04-17 14:42:44 -04:00 |
|
Brian.Dyke
|
143d9a143a
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]]
Former-commit-id: b8829139a2
Former-commit-id: 9c4385efbe [formerly 6f35818917] [formerly 007cb5daf20362de356dbfbefce51ee972d9ab3a [formerly 0ea7c51ad7]]
Former-commit-id: 286e1b30c773c91540e1e54ed0825014dadb3b10 [formerly a925ba6219]
Former-commit-id: de500c093f
|
2014-04-17 14:42:35 -04:00 |
|
Nate Jensen
|
7c83f534f0
|
Issue #3018 addressing code review comments
Former-commit-id: f8f47a8bf7 [formerly 54951100af] [formerly e327f5e0bf] [formerly f8f47a8bf7 [formerly 54951100af] [formerly e327f5e0bf] [formerly 8ba6b2722d [formerly e327f5e0bf [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: 88231d9166 [formerly 81f8f6f328] [formerly febf7868548bff0878f5de8197de931a5e194ca9 [formerly 8b6650c898]]
Former-commit-id: 04508ffd1ec150ee6f778136f2f7c1f5cffc1632 [formerly 3737ad85b6]
Former-commit-id: f607630d72
|
2014-04-17 09:28:47 -05:00 |
|
Ron Anderson
|
3c27a1e1ab
|
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
Former-commit-id: ef02928b92 [formerly 85a1f55ea0] [formerly f9a393172f] [formerly ef02928b92 [formerly 85a1f55ea0] [formerly f9a393172f] [formerly 1ba72371be [formerly f9a393172f [formerly 6813b32786289503950322c02e32803299566c5d]]]]
Former-commit-id: 1ba72371be
Former-commit-id: 8851b335fc [formerly 2139c2308e] [formerly 502045c662b12074a1036d22f9c1951ee22f1f8b [formerly 7d09397faa]]
Former-commit-id: 79b374e8ea7c63223f6f6f0f65a1234cdf694b0c [formerly 94f852cda7]
Former-commit-id: d704f90445
|
2014-04-16 18:02:11 -05:00 |
|
Nate Jensen
|
5e855a156a
|
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
Former-commit-id: 97c48103d7 [formerly 781ec3ecd6] [formerly a085b71c81] [formerly 97c48103d7 [formerly 781ec3ecd6] [formerly a085b71c81] [formerly c362af04f3 [formerly a085b71c81 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]]]
Former-commit-id: c362af04f3
Former-commit-id: e4b0a48ace [formerly 1a40bc4824] [formerly 93fd911a8ce5140273cf8b6b105888dd69b75fea [formerly e1caa66625]]
Former-commit-id: caf2c5d766cd237a3542238be6f9bfec14088db0 [formerly e4aeb8394d]
Former-commit-id: de32624fdf
|
2014-04-16 17:25:09 -05:00 |
|
Nate Jensen
|
0382243dfe
|
Issue #3039 fix ifpImage class cast exception
Former-commit-id: 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 31fb61e824 [formerly 2b6db445c0 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]]
Former-commit-id: 31fb61e824
Former-commit-id: 17544a32ba [formerly 19f0be6afc] [formerly ab6962b9080189e0cbac802398d99762ae5982e2 [formerly a1dd7f24fa]]
Former-commit-id: 59458bd25850cd5eb277eabb12c6fc5b515b5cb1 [formerly 7e7bbfd784]
Former-commit-id: 64e7ac4225
|
2014-04-16 16:17:05 -05:00 |
|
Brian.Dyke
|
d2d085aa39
|
Merged 13.5.5-1 into 1412
Former-commit-id: 9075808d0a [formerly 65ad515a6e] [formerly 188d84cc87] [formerly 9075808d0a [formerly 65ad515a6e] [formerly 188d84cc87] [formerly 35ad867281 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]]]
Former-commit-id: 35ad867281
Former-commit-id: 4808bb32bb [formerly c0266e8988] [formerly 8837283d998164da174b3d8f18d42dbebeeb1257 [formerly 72618c4214]]
Former-commit-id: 856567af7814ca29ea4e90337f3ec6c13981ce04 [formerly 737283b94a]
Former-commit-id: 73efa466f9
|
2014-04-16 12:09:12 -04:00 |
|
Ron Anderson
|
861aaf0dfa
|
Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly d2b4d70702 [formerly 2a68e875a5] [formerly 6e0147169f] [formerly 9f085a0856 [formerly 6e0147169f [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]]]]
Former-commit-id: 9f085a0856
Former-commit-id: c263058e63 [formerly a6fa60f40d] [formerly 4b1dcfa5f1e94d0867e4b137f8e3643f96ecc196 [formerly 4622ad9b8a]]
Former-commit-id: c311f1a789e254f3b8d8c63514a373eb8b409c06 [formerly 56a1b8b682]
Former-commit-id: 072102dff0
|
2014-04-15 17:22:12 -05:00 |
|
brian.dyke
|
e205810cba
|
Merge branch 'master_14.2.2' into asm_14.2.2
Former-commit-id: c75dba32e9 [formerly 6a9ccba393] [formerly 6575f77fe3] [formerly c75dba32e9 [formerly 6a9ccba393] [formerly 6575f77fe3] [formerly a8d6d58f31 [formerly 6575f77fe3 [formerly 274338d3dfb6a839a59da8740ed968d8f0779d7d]]]]
Former-commit-id: a8d6d58f31
Former-commit-id: 16a261d7f6 [formerly 88ddd667b6] [formerly f4680f6e78d8dd9f6a0ede6791f8e2273054f211 [formerly ad63114f16]]
Former-commit-id: d5b0d90245289f70419c05b7aae730f0ee5d4f80 [formerly 1c4e02168c]
Former-commit-id: f299a28f9b
|
2014-04-11 10:58:48 -04:00 |
|
Brian.Dyke
|
f77319aa5b
|
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: b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: 70e228a893 [formerly afc1da9015] [formerly 460c0f2c903a9254ae079d95afd674824e6d6212 [formerly ff51498036]]
Former-commit-id: 9404d535e7a6fa45f9825f9c281883c24eedc7c4 [formerly f051b95a7a]
Former-commit-id: fbefee3e1d
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
52a54f5e9f
|
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: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
38a8f60a43
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]]
Former-commit-id: 929b736038
Former-commit-id: a6ebdbfc3a [formerly d76d3a26cb] [formerly ef99224ab38fbdf6c62ed3f358f4c50051cbc248 [formerly 5163a31a66]]
Former-commit-id: 281a7b2833a1dc51969eab1f2b614dfd6fa8f7eb [formerly 462952ce65]
Former-commit-id: 8ef50f023b
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
44ef143788
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 518167e0bb [formerly 529059851a] [formerly 20fef0f15b] [formerly 518167e0bb [formerly 529059851a] [formerly 20fef0f15b] [formerly 79c7ec7ae9 [formerly 20fef0f15b [formerly 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35]]]]
Former-commit-id: 79c7ec7ae9
Former-commit-id: 824e1f6d14 [formerly 20c27a479d] [formerly 05c5a8903cdbc8d381e7bf1456acac3943c3855e [formerly 538b02e42b]]
Former-commit-id: 969a16a0dd7b9f15428b7ccd55f960f38e507c9a [formerly c58835a7e3]
Former-commit-id: c99b4f3027
|
2014-04-08 13:05:12 -04:00 |
|
Ben Steffensmeier
|
bcfffbe1ed
|
Issue #2973 Use correct area for expanding subgrid requests.
Former-commit-id: 4e60abfd33 [formerly 5b3a8dccbf] [formerly 90f1750691] [formerly 4e60abfd33 [formerly 5b3a8dccbf] [formerly 90f1750691] [formerly 000f259cf4 [formerly 90f1750691 [formerly 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b]]]]
Former-commit-id: 000f259cf4
Former-commit-id: ffa4a7a73e [formerly d52be1875d] [formerly f24e95d25af89a1897da1baf888c6a2256e1ca6b [formerly 7b2f82ff30]]
Former-commit-id: 27cb98a4deac572f1aa264ac9da1057a2f3fc43d [formerly 7bd153a696]
Former-commit-id: 5306c9969d
|
2014-04-04 13:17:36 -05:00 |
|
Brian.Dyke
|
ae3f5dbff6
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
|
2014-04-04 12:57:32 -04:00 |
|
steve.naples
|
ec7e7b856e
|
ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5
Former-commit-id: 5d7cf6c098 [formerly 75be620d0d] [formerly f6636a3dd7] [formerly 5d7cf6c098 [formerly 75be620d0d] [formerly f6636a3dd7] [formerly 7624f7ab75 [formerly f6636a3dd7 [formerly 1c71a34944c7d823742b98dc65e19fe1f478eef0]]]]
Former-commit-id: 7624f7ab75
Former-commit-id: 86c06b5632 [formerly cfa9c6f01c] [formerly 1cf8539d045c95be911973c6773035bb176dd49d [formerly 050238ee44]]
Former-commit-id: da98d1d22c51d71497b6b15f804653483de7aa7c [formerly 571efe3596]
Former-commit-id: 32e931cead
|
2014-04-04 15:30:18 +00:00 |
|
Ron Anderson
|
f60398861b
|
Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly d556055299 [formerly 11fbd86558 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]]
Former-commit-id: d556055299
Former-commit-id: 5001c1f2be [formerly 3ac3d5de1b] [formerly dec5605ca65dcc7794d7aa2a917294e93e71160b [formerly ac7c5460f6]]
Former-commit-id: 1dcb3833d22665a093272a2766e36a92adf65c41 [formerly 4e88052beb]
Former-commit-id: 0033d7d3ef
|
2014-04-02 09:07:22 -05:00 |
|
Brian.Dyke
|
a30b45174a
|
Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
Former-commit-id: 411457248b [formerly 3186434368] [formerly 6e515eb334] [formerly 411457248b [formerly 3186434368] [formerly 6e515eb334] [formerly 1f5c6139e3 [formerly 6e515eb334 [formerly 5dbe50379db1558323dff2ffdc541cd81adfea4b]]]]
Former-commit-id: 1f5c6139e3
Former-commit-id: f5ed39a8d9 [formerly d163d9d190] [formerly d9da3cc373b8f207d487dbe28227905b8a81846e [formerly c013460db1]]
Former-commit-id: 57e818053f3d573b96db0f187009034ddd6fab8c [formerly 5345add58d]
Former-commit-id: c2a3ec6f04
|
2014-04-01 14:29:33 -04:00 |
|
David Friedman
|
8ea6e0b064
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1e4ac84f99 [formerly 1168a3eae5] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]]
Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3]
Former-commit-id: 8f8f55dd3c
|
2014-03-27 19:17:03 +00:00 |
|
Brian.Dyke
|
dedbdef64c
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 7ca114f7f1 [formerly a1b980a15d] [formerly 6346c9776b] [formerly 7ca114f7f1 [formerly a1b980a15d] [formerly 6346c9776b] [formerly 3b639347f8 [formerly 6346c9776b [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]]
Former-commit-id: 3b639347f8
Former-commit-id: bded86a35f [formerly 519ec3071a] [formerly 38694ae3f3f4b7b74544ffa190d887b7c937b26b [formerly 76625c2238]]
Former-commit-id: b11ad5967e376b34076f85e49fab9f19d3ad22e5 [formerly 9fa73765f9]
Former-commit-id: 102414db3a
|
2014-03-27 10:22:26 -04:00 |
|
Steve Harris
|
9659705737
|
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: e621e81f20 [formerly 9cf3600ff6] [formerly 4879520391] [formerly e621e81f20 [formerly 9cf3600ff6] [formerly 4879520391] [formerly a7efde7cf4 [formerly 4879520391 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 3b8569a1ac [formerly 311c8d67af] [formerly 9e1c5536bf5208e6e617f1b651bab6961954548a [formerly 55440888fd]]
Former-commit-id: 3aca6b03a25eacf45ba5d9bfa520a245475f2946 [formerly af32adebc5]
Former-commit-id: ef058152a0
|
2014-03-26 15:51:32 -05:00 |
|
Brian.Dyke
|
dc35ed8fe1
|
Fixed comment merge conflicts added .gitignore
Former-commit-id: 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 6476c4fb85 [formerly 412a7eb2c2] [formerly 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f [formerly d8256c4226]]
Former-commit-id: 8a69e5f0509d10278a9c81d31ec5d2e0a9d1f376 [formerly c19fc33493]
Former-commit-id: e7aea77979
|
2014-03-25 15:41:58 -04:00 |
|
Brian.Dyke
|
fbba012c20
|
OB_14.1.1-25 baseline
Former-commit-id: c66bac30c7 [formerly c085bc6879] [formerly c67833407c] [formerly c66bac30c7 [formerly c085bc6879] [formerly c67833407c] [formerly 074abeb0fa [formerly c67833407c [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]]
Former-commit-id: 074abeb0fa
Former-commit-id: 5b848e5480 [formerly 95ada25b65] [formerly ec4f283a91b4ae374dc7edc0c06351378f44b61f [formerly 36fdf6bfe4]]
Former-commit-id: 01adcc7557cfbd24c6477e8cc858ba353ef8328c [formerly 05ab17425c]
Former-commit-id: 2ba9b8825b
|
2014-03-25 13:55:54 -04:00 |
|