David Friedman
|
86100b6ca8
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 05707d0f20 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]
Former-commit-id: 6791e8d885
|
2014-09-26 20:05:46 +00:00 |
|
David Friedman
|
1737d16a5c
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: db29ec9dec [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]
Former-commit-id: 33aee54b8f
|
2014-09-26 15:13:56 +00:00 |
|
David Friedman
|
cfcfc17a2b
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: c85b0d1cfd [formerly 70b520c08670646047ffa753814f98c032938ff8]
Former-commit-id: 41820f112f
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
c16f5c2e7c
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: e82f96193e [formerly 117c2f072b647e353456832f2f0088d51a660d65]
Former-commit-id: 5755c120d5
|
2014-09-25 22:10:42 +00:00 |
|
Qinglu.Lin
|
1c55b5c400
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: ef851d0016 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]
Former-commit-id: 94fed71091
|
2014-09-25 15:16:42 -04:00 |
|
David Friedman
|
0ed1ce5726
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: 2ee1ebe72d [formerly e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5]
Former-commit-id: a6acf71a0a
|
2014-09-23 18:39:22 +00:00 |
|
Qinglu.Lin
|
4bce4db9ef
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: 5e93999662 [formerly e7ab29fbfebb1943e0b0702547dbd353367e797d]
Former-commit-id: 0e2be5afd8
|
2014-09-17 10:26:25 -04:00 |
|
David Friedman
|
94d78ed010
|
ASM #16730 - WarnGen Watch wording error when issuing product only over Marine Locations
Change-Id: I361a1635cf11f3c66801f33c74034028b3e0271d
Former-commit-id: bed361fe35 [formerly 17d27fca04fb733d74e5bac99bfed3112bd81b6c]
Former-commit-id: 8d7ba120a2
|
2014-09-10 19:28:57 +00:00 |
|
Qinglu.Lin
|
62bcefb9e1
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: 902b6c55bd [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]
Former-commit-id: 8c28597210
|
2014-09-04 14:09:24 -04:00 |
|
Qinglu.Lin
|
b32ea40289
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: ae13ea419e [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]
Former-commit-id: 2374673f8d
|
2014-09-02 14:37:19 -04:00 |
|
David Friedman
|
ea1e9feb1d
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: ea9230b37c [formerly 6bfa1d6662b00925814be7126592bbe340651649]
Former-commit-id: a2dfe8e8f6
|
2014-08-28 15:43:32 +00:00 |
|
David Friedman
|
b053e1e2ce
|
ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f
Former-commit-id: 6a7638ddae [formerly 7027ff533991251f64f2e5a0deb31e2945cdde5f]
Former-commit-id: 78ee5a56c5
|
2014-08-20 14:13:32 +00:00 |
|
Michael Gamazaychikov
|
2b450af136
|
ASM #15701 WarnGen displaying error for Watch Wording when switching from backup site to local site
Change-Id: I9ff834f0b3717d046f278b8a21ca955e5f5c4805
Former-commit-id: c14a5287ac [formerly 126ec43423a864df597bd6dd745671ee0bf4fbfb]
Former-commit-id: 9897417235
|
2014-08-15 11:03:23 -04:00 |
|
Brian.Dyke
|
eeca2f2ec8
|
Merge branch 'asm_14.2.2' into master_14.2.2
Former-commit-id: 905728d2fb [formerly 96ff2234e0d8893695b33a79d24a026a1a409073]
Former-commit-id: 3598f7b549
|
2014-07-31 09:56:21 -04:00 |
|
Shawn.Hooper
|
27f50397aa
|
ASM #15627 Revert "ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products."
This reverts commit e24dd6958e [formerly ba4c386f30] [formerly 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]].
Change-Id: Ie01ca9463a4db371ffce0b6e38d5c43e1f9addf2
Former-commit-id: 4e322737ce [formerly d272d426f8bd218954a75a7b2e19d21b30f975cb]
Former-commit-id: 976c7b2d4a
|
2014-07-30 14:03:51 -04:00 |
|
Michael Gamazaychikov
|
e24dd6958e
|
ASM #15627 - WarnGen leaving out reference to State that is under SVR or TOR Watch in SPS text products.
Change-Id: Ic5689db7714be086d6e4543602db33a07e5b2fc1
Former-commit-id: 8cffe955a9 [formerly 00ec5e2d47809d084b3e24e1f1503af96d129fed]
Former-commit-id: ba4c386f30
|
2014-07-28 15:12:10 -04:00 |
|
Qinglu.Lin
|
f69a06238b
|
ASM #15554 - Improve speed/efficiency of WarngenLayer.populateStrings
Change-Id: I6a3b9823ac7c23ba171206708187ab3fc3c7c1ca
Former-commit-id: 2aa16c114a [formerly 3b971d52a82099142fe08986df879a379dfa6314]
Former-commit-id: 1eca5ef51a
|
2014-07-28 12:36:07 -04:00 |
|
Jonathan Sanchez
|
997485dd22
|
Issue #3419 Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1
Former-commit-id: b991838494 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]
Former-commit-id: 86a8ca4a30
|
2014-07-22 15:32:12 -05:00 |
|
David Friedman
|
8784501bba
|
ASM #15052 - WarnGen: service backup should use config.xml from failed site
Change-Id: Icff8ca2a124da595be6b83ac9f9999831daee0b1
Former-commit-id: db8977e281 [formerly f9c0dc09ee7bc692c6f70b4a5ad67bb2c2ed5a20]
Former-commit-id: a45fe1dad0
|
2014-07-03 13:58:24 +00:00 |
|
Juliya Dynina
|
bf765525b7
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: 102da2d0f7 [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]
Former-commit-id: b5e4bc1fdc
|
2014-07-01 10:05:57 -05:00 |
|
Qinglu.Lin
|
1180b31875
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 1d52d020eb [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]
Former-commit-id: 1200633cd2
|
2014-06-30 13:09:15 -04:00 |
|
David Friedman
|
c4967a96fb
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: dc25040a25 [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]
Former-commit-id: 18b3b61afc
|
2014-06-27 19:17:55 +00:00 |
|
Steve Harris
|
16f5ff0979
|
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: 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]
Former-commit-id: b84dda5930
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
be589ceb9b
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]
Former-commit-id: 399c06820a
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
822ad181bf
|
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: db68b80bbd [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]
Former-commit-id: 2fd18d14d6
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
c4b7b8dd74
|
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: d5a4669fc4 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]
Former-commit-id: dbd3bb54e8
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
2eae2be646
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 06c2478539 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]
Former-commit-id: b29db01a59
|
2014-05-19 13:26:45 -04:00 |
|
Brian.Dyke
|
509616ba6a
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: e9bd17a21f [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]
Former-commit-id: f8ed9c7944
|
2014-05-19 07:55:42 -04:00 |
|
Brian.Dyke
|
f38d0138e6
|
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: d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]
Former-commit-id: 627541512d
|
2014-05-14 16:08:16 -04:00 |
|
Steve Harris
|
848519177d
|
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: fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]
Former-commit-id: cf62cf4a6e
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
3aa2f7974b
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]
Former-commit-id: 386ec058e1
|
2014-05-12 14:07:11 -04:00 |
|
Steve Harris
|
9e149df799
|
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: 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]
Former-commit-id: 6ef3b9f1e5
|
2014-05-05 08:21:02 -05:00 |
|
Qinglu.Lin
|
b51bdd9107
|
ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: 13c81f9468 [formerly 108895dccefb42c71d0f47b13bfd64591e8dca98]
Former-commit-id: e489658072
|
2014-05-01 14:49:27 -04:00 |
|
Brian.Dyke
|
eff27f5504
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: e82fc8f89c [formerly 4e921dbeab89e61635144b441ae0015155376c59]
Former-commit-id: a19f01c620
|
2014-04-24 13:01:50 -04:00 |
|
David Friedman
|
32a7adbe4b
|
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: f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]
Former-commit-id: fd900e38c2
|
2014-03-27 19:17:03 +00:00 |
|
Qinglu.Lin
|
09e90dfe43
|
ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: af82143e84 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]
Former-commit-id: 4b3c821ce0
|
2014-03-17 18:17:49 -04:00 |
|
Ron Anderson
|
e7f2b6883d
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]
Former-commit-id: 32bcf9d0d0
|
2014-02-18 10:45:20 -06:00 |
|
Michael Gamazaychikov
|
8cd5cce89e
|
ASM #94
Change-Id: I97797a7adbd17532b261987caf2fdcaa1d39c9ed
Former-commit-id: b63053d8b4 [formerly 3c9c34c84ac1cd4962c3e6f877bd33b37aab705a]
Former-commit-id: 42399284ca
|
2014-02-11 01:32:37 +00:00 |
|
brian.dyke
|
4a62e83835
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]
Former-commit-id: 2294c81a57
|
2014-01-27 15:27:49 -05:00 |
|
gerritcm
|
9e935404d8
|
14.1.1-16 baseline
Former-commit-id: b84f7d4203 [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]
Former-commit-id: 6be938e6eb
|
2014-01-16 16:43:05 -05:00 |
|
Qinglu.Lin
|
e52d03fd37
|
Issue #123
Change-Id: Iac88a9d04fce04b4f604fb3d29c6591c90d85a65
Former-commit-id: 14e34361db [formerly bbd87416db31892d00960da0d9076e265578dd43]
Former-commit-id: 1c2b48a66e
|
2014-01-09 14:13:25 -05:00 |
|
Qinglu.Lin
|
9eb26957f2
|
Issue #117
Change-Id: I83e97c43ab9c27a965a9329d5cc4d691c7e20dc2
Former-commit-id: cfc815af76 [formerly c877d3db7b960309def150343672757b59b353a3]
Former-commit-id: 6e1dd369a8
|
2013-12-20 14:31:16 -05:00 |
|
Qinglu.Lin
|
50732574aa
|
Issue #117
Change-Id: I52293e2148fdc1fbfd22ad01e03d6d628cd1c09a
Former-commit-id: 5dc466443b [formerly 6f197a78afa6a8760f852e94861950a230eaedcc]
Former-commit-id: db66cbb605
|
2013-12-20 14:21:54 -05:00 |
|
Richard Peter
|
b3b23647b4
|
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: a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]
Former-commit-id: 0c4ae068ad
|
2013-12-05 12:12:27 -06:00 |
|
Steve Harris
|
8251107646
|
14.1.1-10 baseline
Former-commit-id: 9248695a1f [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]
Former-commit-id: ca0f65bd9a
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
90bc008a50
|
14.1.1-8 baseline
Former-commit-id: c7d36eb6ad [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]
Former-commit-id: aa6c977e7b
|
2013-11-13 12:32:17 -05:00 |
|
Steve Harris
|
51af205d06
|
Merge branch 'omaha_13.5.3' into development
Former-commit-id: 66f99f3974 [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]
Former-commit-id: 9dabbc7b8e
|
2013-11-11 15:40:45 -06:00 |
|
Steve Harris
|
36af5686bd
|
13.5.3-7 baseline
Former-commit-id: 47102ee47b [formerly a9ada72dc63cd460499052171c61323b438bb10d]
Former-commit-id: 21bed95fa4
|
2013-11-11 16:33:51 -05:00 |
|
Richard Peter
|
25df870b67
|
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: 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]
Former-commit-id: fa7d77ae97
|
2013-11-07 14:25:45 -06:00 |
|
Steve Harris
|
80614c0e52
|
14.1.1-7 baseline
Former-commit-id: 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]
Former-commit-id: 3328e2dd1d
|
2013-11-06 14:16:14 -05:00 |
|