Nate Jensen
|
b2dcfdf572
|
Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: 03ed17c8994b00ea37c1c591760c9b7c452dfcde
|
2014-10-06 15:53:19 -05:00 |
|
Nate Jensen
|
9025e166dd
|
Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0
Former-commit-id: 9dac0fcf997feeecdd8c581ae8fd72581c32d095
|
2014-10-06 15:41:42 -05:00 |
|
Brian.Dyke
|
92762f46c7
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 23d16004c389f0ef708bee2a8bfb84d465b7b36b
|
2014-10-03 14:04:46 -04:00 |
|
Brian.Dyke
|
20dd249d2c
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 441fc7561a8526422f9b73b9c47cd220f0babb54
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
f3f95aabb0
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 8fa6749e28cb247ae63307f1423351c23ec0eb87
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
2ac30f6c22
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ece734cb6218a80fa2dda1b3c43673dc5a31bfbb
|
2014-10-02 10:24:04 -04:00 |
|
Brian.Dyke
|
97464ea153
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f26e54011d334972bb1e999304b1b2d13a1c408f
|
2014-10-02 10:15:34 -04:00 |
|
Steve Harris
|
cc34483b0b
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: ace8473f96c6151918ee8ecf61e3b8986d98a68a
|
2014-10-02 08:09:02 -05:00 |
|
Shawn.Hooper
|
ae02cbc2da
|
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: ea8e4c3a30bceb2f3b53159317382ae651aa5531
|
2014-10-01 15:58:48 -04:00 |
|
Brian.Dyke
|
a4bfbea3c2
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 622e63224b6d6bf1d6ced874658bbd9db381799b
|
2014-10-01 15:36:06 -04:00 |
|
Nate Jensen
|
f2633a56c0
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: e2d5957c02ba210e1964d00f37a00455f3326b37
|
2014-10-01 11:53:40 -05:00 |
|
dmsys
|
9f4560c480
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
|
2014-09-30 13:45:54 -04:00 |
|
Nate Jensen
|
510d26050d
|
Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083
|
2014-09-29 17:50:34 -05:00 |
|
Ben Steffensmeier
|
95b096192b
|
Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: e93157375f90c6cc2038db9a78346592e4d46b0e
|
2014-09-29 11:20:33 -05:00 |
|
Steve Harris
|
c03bc273da
|
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: 49ad8e0e780443a0439227694a92ec8ab683b125
|
2014-09-29 11:14:32 -05:00 |
|
Brian.Dyke
|
0e0255ce5b
|
Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 6e79993fbf34ebd832ca07356cbac003efaf6405
|
2014-09-29 11:55:16 -04:00 |
|
Sean.Webb
|
2d531d73fd
|
Merge "ASM #16720 - Added pushd and cd prior to patch extraction" into asm_14.2.4
Former-commit-id: c62a7e14e82c7274ed1868d73446aab895901546
|
2014-09-29 10:35:10 -05:00 |
|
Brian.Dyke
|
46af1d0857
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
|
2014-09-29 11:20:57 -04:00 |
|
Sean.Webb
|
600b75bd9f
|
ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225
Former-commit-id: c2af0284e9146dff8431ecd4f6ce88437ea83d9f
|
2014-09-29 10:24:04 -04:00 |
|
Sean.Webb
|
6e1f0363c8
|
Merge "ASM #16720 - Removed extraneous popd which was changing dir when not needed" into asm_14.2.4
Former-commit-id: 8f44d89f1d11cd587106f7eda3edec93802f5cf3
|
2014-09-29 08:31:44 -05:00 |
|
Sean.Webb
|
78f83fa594
|
ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683
Former-commit-id: 4faea9724adf17d0bec7f013bafc7f8dd2f7499e
|
2014-09-29 08:21:00 -04:00 |
|
Brian.Dyke
|
142432ba5e
|
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 93ddf672c137c7221e9595e8b5c1b279084cb451
|
2014-09-26 16:14:06 -04:00 |
|
David Friedman
|
05707d0f20
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb
|
2014-09-26 20:05:46 +00:00 |
|
Brian.Dyke
|
814b9a2869
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 60756ddb841a0daa347493047b76d2fcb93f7f4a
|
2014-09-26 15:15:57 -04:00 |
|
Brian.Dyke
|
f1755fb7ae
|
Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: 4ff65f7c83042dd40b5c2bf37ee54d12315c5714
|
2014-09-26 14:20:34 -04:00 |
|
Brian.Dyke
|
f26fe97ec4
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 5b570e5229628de88068edee1c70c26eec13f71a
|
2014-09-26 14:19:03 -04:00 |
|
Brian.Dyke
|
a4f68caac6
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 6ed90023551e25216c10d05f2568593992326900
|
2014-09-26 13:02:49 -04:00 |
|
Sean.Webb
|
57342f0256
|
Merge "ASM #16720 - Added updated palt.c to fix seq num in pqact pattern" into asm_14.2.4
Former-commit-id: d1ce11d690a1acf24fe82fc10acc83302e8f61f9
|
2014-09-26 11:01:04 -05:00 |
|
Brian.Dyke
|
bd983e1932
|
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7
|
2014-09-26 11:47:38 -04:00 |
|
David Friedman
|
db29ec9dec
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: c8aa2fbfc35c872e2d50de2212eaf16db9b5483d
|
2014-09-26 15:13:56 +00:00 |
|
Sean.Webb
|
7d75d994c1
|
ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5
Former-commit-id: d59054c870fee17076aec22cd683ef1586a153da
|
2014-09-26 10:49:37 -04:00 |
|
David Friedman
|
c85b0d1cfd
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: 70b520c08670646047ffa753814f98c032938ff8
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
e82f96193e
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: 117c2f072b647e353456832f2f0088d51a660d65
|
2014-09-25 22:10:42 +00:00 |
|
David Friedman
|
8ab4649312
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 5048af915b004067ec8a6e788a0e9ad3e006c9d8
|
2014-09-25 21:07:16 +00:00 |
|
Shawn.Hooper
|
831af82c23
|
ASM #600 - WarnGen: template optional watch inclusion
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 04bd69f437b897d63ac78d6cbd7c60451366cc6d
|
2014-09-25 16:25:43 -04:00 |
|
Qinglu.Lin
|
ef851d0016
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: 8b194664458246dad7509c44bcc07480cb088ddd
|
2014-09-25 15:16:42 -04:00 |
|
Matthew Howard
|
63a7fb0372
|
Merge "ASM #16693 updated dictionary cleanup script" into asm_14.3.1
Former-commit-id: bc9c9b073e69825d5e040e1cca2f738719a7e4f7
|
2014-09-25 14:14:40 -05:00 |
|
Matthew Howard
|
aaf48f3dfe
|
Merge "ASM #16693 Fix spelling checker swear words" into asm_14.3.1
Former-commit-id: 1c8a526f4f40eb4ef6fef55f9d49f8abe425b548
|
2014-09-25 14:14:24 -05:00 |
|
Ron Anderson
|
34df50963e
|
Issue #3648 Fix GridParmManager.d2dGridDataPurged() to use deallocateDb.
Change-Id: Id9bb73c54028615c33a61373d7b565a230867c1a
Former-commit-id: 8c177752b8e2baa2e739fc69320c4e4b31d972c7
|
2014-09-25 13:48:11 -05:00 |
|
Ana Rivera
|
c1b58f214f
|
VLab Issue #4836 - O&M RM14013; Update aKrtmaNDFD.xml; fixes #4836
Change-Id: I18d92482782e4c95cdd147d1edb1f65f3865b98f
Former-commit-id: cf3d9a81a52c19977371e3abee755d1c239b1f8a
|
2014-09-25 18:18:21 +00:00 |
|
Ana Rivera
|
a72725f9ef
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: 833cff4f37542078578de96b3b59723f77c31f4c
|
2014-09-25 17:46:53 +00:00 |
|
Kevin.Johnson
|
4d8efeeb9a
|
ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7
Former-commit-id: c36b732cc8057cf7b830de647998f679725760da
|
2014-09-25 10:50:07 -04:00 |
|
Baoyu Yin
|
c9385c0912
|
VLab Issue #4553 - AWIPS2_DR_16047: An update for Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
Change-Id: Ib4e566154c6b8282efb33464b850ff1f66a5e6d0
Former-commit-id: 847ecb836cf5d7bad28817dd68e752e4ba79f6c4
|
2014-09-25 09:44:21 -04:00 |
|
Lee Venable
|
5efe3232a7
|
Merge "Issue #2757 - Fixed problem with adding and removing zones." into omaha_14.3.1
Former-commit-id: 2ec651b767555946485c8a087f891c8736f59105
|
2014-09-24 16:23:23 -05:00 |
|
Ana Rivera
|
9a0e9b17f4
|
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: 2c16492202230dcbec93cf390b47f400a77a545e
|
2014-09-24 20:11:29 +00:00 |
|
Benjamin Phillippe
|
81870960e6
|
Issue #3560 Fixed slow memory leak in registry
Former-commit-id: 918119b26864ee246ac2571baa4e380ae21f2ded
|
2014-09-24 14:36:34 -05:00 |
|
Brian.Dyke
|
87fa32d2d4
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
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
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: e04ad21771ce410beb25e15fe300a34796a1a062
|
2014-09-24 11:05:37 -04:00 |
|
Ron Anderson
|
61baeb4bcc
|
Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500.
This reverts commit 2abfe6de77 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f].
Change-Id: I50a580d7c038b039cc8ebf3e05dd16c4453f8355
Former-commit-id: d1c6475343160eeb02171fb8fc3b04f527203154
|
2014-09-24 09:17:43 -05:00 |
|
Slav Korolev
|
a4914bd85d
|
Issue #2757 - Fixed problem with adding and removing zones.
Former-commit-id: 31ccaf218df628327fe4b27d69a4500eb1dc8d84
|
2014-09-24 09:34:43 -04:00 |
|
Ying-Lian.Shi
|
b6ed9507e5
|
ASM #16693 updated dictionary cleanup script
Change-Id: I431226edf9afdf2f85811e36a631926a37398203
Former-commit-id: bd9b2c16e78147a0d7929922ad31cd9c57979efb
|
2014-09-24 12:30:40 +00:00 |
|