Ron Anderson
|
a60e3465f4
|
Issue #2854 Fix merge issue in MessageProducer between DRs 2726 and 3684
Change-Id: I6a6ea9c57857459f61e955a54275a8983a8004ce
Former-commit-id: 09f13d9b33cfe3547d2dc3fb75c1673e1f3193b0
|
2014-11-12 11:25:32 -06:00 |
|
Dave Hladky
|
3052a38081
|
Issue #3026 Fixed null metaData lookups in resource.
Change-Id: I29d17ea990ac5516b67ac18fadf4267663a23efb
Former-commit-id: 3f6bba1fda61fe283be47af1a4245d196f94f998
|
2014-11-11 10:18:47 -06:00 |
|
Brian.Dyke
|
1cd471ed72
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
Former-commit-id: b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f
|
2014-11-06 13:14:24 -05:00 |
|
Brian.Dyke
|
aae68215c8
|
Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
|
2014-11-06 12:55:21 -05:00 |
|
Steve Harris
|
98f2a877f6
|
Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
Former-commit-id: b70eb5b35985453e77ef2337728c65161ba60422
|
2014-11-04 13:05:36 -06:00 |
|
Ron Anderson
|
b508a7134c
|
Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db.
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785
Former-commit-id: de45da45f39169e3924122a7baf68ab6762e74e2
|
2014-11-04 11:03:42 -06:00 |
|
Brian.Dyke
|
f3b80f319d
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 4be7b001bc98e6fe81b3e66940d025fd7511060b
|
2014-11-03 14:45:24 -05:00 |
|
Shawn.Hooper
|
58db54ff05
|
ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212
Former-commit-id: 41e18e5104eac8ee3335a80d678d74c7a56b196a
|
2014-11-03 10:30:05 -05:00 |
|
Matthew Howard
|
36e73a31df
|
Merge "ASM #16693 handles more swear words" into asm_14.3.1
Former-commit-id: a6ed07b8c01df8576cc54f88dc52d2110d211707
|
2014-11-03 09:56:09 -05:00 |
|
Brian.Dyke
|
affc9ed976
|
Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: ef112c1ff84f846dbe7093bcbb4a94fecf2274d5
|
2014-10-30 15:05:39 -04:00 |
|
Brian.Dyke
|
5e04756c0c
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 78923886791099b8e4564dd780d8ed64db16a5c1
|
2014-10-30 15:03:19 -04:00 |
|
Shawn.Hooper
|
a44d775a27
|
ASM #16800 - Add HRRR under D2D in Weather Element Browser
Change-Id: I829cd7357ccd37e389e88567a4159d0efde9aa41
Former-commit-id: 99807ddc4810c08635d5462357dc29e661686e33
|
2014-10-30 14:47:26 -04:00 |
|
Ying-Lian.Shi
|
ea9e231074
|
ASM #16693 handles more swear words
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7
Former-commit-id: 6133c233bd3e02b0a8e1540dd6c496997184f11d
|
2014-10-30 18:22:34 +00:00 |
|
Shawn.Hooper
|
285e4baaec
|
ASM #16805 - Increment release number in the awips2-tools rpm spec file
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4
Former-commit-id: 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f
|
2014-10-30 09:58:02 -04:00 |
|
Brian.Dyke
|
33522c2b74
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 5d2ba108dfbe266edbaee8f5a03e81c02419997a
|
2014-10-30 09:38:07 -04:00 |
|
Steve Harris
|
8fd7a28033
|
Merge branch 'master_14.3.1' (14.3.1-30) into omaha_14.3.1
Former-commit-id: ec350c044862fb51513ffa5246c47af33a6ceae5
|
2014-10-30 08:36:12 -05:00 |
|
Ron Anderson
|
0c3e19449f
|
Issue #3776 Cache SWT fill patterns used in history mode.
Change-Id: Ibb48a997fd0b9c2308ae9f492c7837a10db7285d
Former-commit-id: baefc78796f3d4826d32e5324dd88fa01d242ed5
|
2014-10-29 15:20:18 -05:00 |
|
Steve Harris
|
1753861b41
|
Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1
Former-commit-id: 9d95570c1686978a5c84a21af29dbc84e53355a3
|
2014-10-29 08:21:13 -05:00 |
|
Brian.Dyke
|
9907c37a0e
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d12d6cf7e6862a87c00f833ee02e72e5c0ad8252
|
2014-10-28 15:25:05 -04:00 |
|
Brian.Dyke
|
f8ce701c85
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
Former-commit-id: 52ba693c7d77f4e29db6bc5202c9764509bce58d
|
2014-10-28 15:23:11 -04:00 |
|
Ben Steffensmeier
|
1591c9cbb8
|
Issue #3767 Change default image export name to screenCapture.png.
Former-commit-id: 021367d3212e185a2d8d4e5970fc268204bf070b
|
2014-10-28 14:18:02 -05:00 |
|
Baoyu Yin
|
c9bc14a668
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 28 fix for FFW error ; fixes #4796
Change-Id: I4f43f1365c3ad4d11314f199c4d896aa542a48c0
Former-commit-id: 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8
|
2014-10-28 14:32:31 -04:00 |
|
Ron Anderson
|
ebe43e22d3
|
Issue #3766 Fixed return type of GridParmManager.createNewDb
Change-Id: Ib76bf614b09895ef08065da86d3af8d59f490f4c
Former-commit-id: 2e2f83952a6ef00b17d9f4504133c85e93e0126e
|
2014-10-27 18:40:15 -05:00 |
|
Brian.Dyke
|
34931f4cc5
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: cca25d0e29324cc883f177597e0975279b07c8ca
|
2014-10-27 15:51:57 -04:00 |
|
Baoyu Yin
|
2c0c42dcdd
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 27 ; fixes #4796
Change-Id: I636b0cbb46b31f46cb2d017a4b3047108c98f0c9
Former-commit-id: b447742f498bceaf5f522a637d6ae501f80dfa23
|
2014-10-27 10:15:39 -04:00 |
|
Brian.Dyke
|
dfeeca0087
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 053e63233a482aced6365a02adef9fda77ee7116
|
2014-10-24 14:56:38 -04:00 |
|
Baoyu Yin
|
c1d51b3588
|
VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 24 ; fixes #4796
Change-Id: I2df1ea83b9cd17735ee835914febd3739ff4671d
Former-commit-id: ecc2b0c99a4e849b9472dd6c0cd63416e880d4cb
|
2014-10-24 14:28:08 -04:00 |
|
Brian.Dyke
|
dc0810a926
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 546badba2c4dceb628b248d980baf571c6f44944
|
2014-10-24 14:01:28 -04:00 |
|
Brian.Dyke
|
382bf468ef
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 46ab2183dfeb66020368e7d079f59f21e31c37eb
|
2014-10-24 13:57:32 -04:00 |
|
Shawn.Hooper
|
ba89dbce5c
|
ASM #533 - Add delta script for 14.3.1 to delete FSS Obs Config Files
Change-Id: Id3c5cd06222eb62d50588c03f9d0ea6667883011
Former-commit-id: 040665f65dead38fed0e4ca6176b422c8e6c9f1b
|
2014-10-24 13:06:29 -04:00 |
|
Matthew Howard
|
f1d793c8f5
|
Merge "ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility" into asm_14.3.1
Former-commit-id: aa43d958820f8873a982d24d9c73760eb430ddc7
|
2014-10-24 10:06:56 -05:00 |
|
Rici.Yu
|
45e3b2895b
|
ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility
Change-Id: Ia377d571db68d0078399460ad1d434ba4dad510b
Former-commit-id: 902d1b1e4fed90ff216eab2ee5fc3f198bf7fc6d
|
2014-10-24 10:54:37 -04:00 |
|
Shawn.Hooper
|
7a7d877c17
|
ASM #16871 - Checkin: MPE Gage Table: columns do not sort in descending order
Change-Id: I197c3049e39ad0c5f5edca8926ff1afdaca20e2f
Former-commit-id: ce7ade3d25263f5af09073e4877b018a84f195a3
|
2014-10-24 09:47:54 -04:00 |
|
Stephen Gilbert
|
c94b2187f6
|
VLab Issue #5064 - Compare and Edit functions not working in SHARP(D2D);
fixes #5064
Change-Id: I3c9bf22b767dbc67fa70291989c694d39945d112
Former-commit-id: ee20131811fba389f001870d3274b32adfee3f28
|
2014-10-23 12:36:30 -04:00 |
|
Stephen Gilbert
|
97bd608624
|
VLab Issue #5063 - NSHARP(D2D) does not load using Volume Browser; fixes
#5063
Change-Id: Idd83363e5235868939c2251239264eb73863efb7
Former-commit-id: b59616510517bf52d23edaf055e9d4a53b26e2dc
|
2014-10-23 12:33:50 -04:00 |
|
Brian.Dyke
|
9199e8b072
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 97623c832e9ba336959d6f4f11045ec9738657eb
|
2014-10-22 14:51:41 -04:00 |
|
Shawn.Hooper
|
0e372cd13e
|
ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868
Former-commit-id: e29cf5a57591e5a25b6e73b267c0abb46e9f95c2
|
2014-10-22 14:47:42 -04:00 |
|
Brian.Dyke
|
9bcc6bb52e
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: c8cd8594507148284ac3ec2283fcc9e152c532a6
|
2014-10-22 10:39:36 -04:00 |
|
Shawn.Hooper
|
4e0cb152d2
|
Merge "ASM #13467 - Update GenericHazards.py for Shannon" into asm_14.3.1
Former-commit-id: 4bbcf01f8a3abf038f3183c5872bc8f9f12624a1
|
2014-10-21 10:35:01 -05:00 |
|
Shawn.Hooper
|
d0fba5965b
|
ASM #16805 - Fix rpms/legal/ directory
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3
Former-commit-id: 94872b496bec6c427030ea353856466809d2e6c1
|
2014-10-21 11:17:45 -04:00 |
|
Shawn.Hooper
|
4d81023184
|
ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e
Former-commit-id: f4e8f7493bbfb025e8040f7663dc582414a87413
|
2014-10-21 11:11:34 -04:00 |
|
Matthew Howard
|
8827f5e49c
|
Merge "ASM #16858 - Check in SerpISC tool." into asm_14.3.1
Former-commit-id: 4a965632119a9349cf320125b97db52498a760c8
|
2014-10-20 13:56:06 -05:00 |
|
Rici.Yu
|
9c2555466c
|
ASM #16858 - Check in SerpISC tool.
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6
Former-commit-id: 1e8961e4f4a8168b667ce4b689efd88157dfb61c
|
2014-10-20 14:39:46 -04:00 |
|
Shawn.Hooper
|
e24cb3c37e
|
ASM #16805 - Update master rights and license files for 14.3.1.
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82
Former-commit-id: f72ec046e98bdb6734dbce10ef472dd5294c59ba
|
2014-10-20 14:36:31 -04:00 |
|
Slav Korolev
|
0d4ed62be4
|
Issue #2757 - Fixed a problem with duplicate zones.
Former-commit-id: 8929c542c33090555dd9db16113453e1000c6e5b
|
2014-10-20 13:08:44 -04:00 |
|
Dave Hladky
|
19840e43f3
|
Issue #3736 Allow shared subscriptions to have adhocs
Change-Id: I2379ac2cd1f02b36587531b448b8c3e6434664f9
Former-commit-id: a5a2b995e5dd4a7af165f62496d8052ed43d23b4
|
2014-10-20 08:58:08 -05:00 |
|
Nate Jensen
|
dcce72b823
|
Merge "Issue #3707 Reworked gridded subscription triggereing for retrievals. Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176" into omaha_14.3.1
Former-commit-id: 57848f31cc73d81d16595e4e5b01949bcff12a24
|
2014-10-20 08:37:41 -05:00 |
|
Dave Hladky
|
a3268ae60d
|
Issue #3707 Reworked gridded subscription triggereing for retrievals.
Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176
Former-commit-id: eb64bd232cd25a71dbac655f4d59f9ec10b841b4
|
2014-10-17 16:01:47 -05:00 |
|
Brian.Dyke
|
418894a17b
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: f0f79fb324665245ef759947d24514a6c8bc4470
|
2014-10-16 12:04:27 -04:00 |
|
Sean.Webb
|
36d39be5fd
|
ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd
Former-commit-id: c11e78b57bca7d242d4d8c29dc51669d7aebb37d
|
2014-10-16 10:38:14 -05:00 |
|