Commit graph

6436 commits

Author SHA1 Message Date
Ying-Lian.Shi
5c21331fe9 ASM #16929 Service Backup log cleanup script issue on test systems
Change-Id: I09f184a01081cf025854da60a298345b29ffc15f

Former-commit-id: c4b665ad24 [formerly d451c4b1f1 [formerly 66fc128c8be25753904dfff65840334bfdff7963]]
Former-commit-id: d451c4b1f1
Former-commit-id: 446b1927ee
2014-12-09 16:19:33 +00:00
Dave Hladky
4b7557498f Issue #3891 Special overlap handling for promotion of sub from site to shared
Change-Id: Ifa8f4be3e9e0f172ee54c5ef7021b912d45c5de2

Former-commit-id: 8796705c6b [formerly d81e3b0efa [formerly 9a31befafe66a677b744fa9ae9ef7e134a758bd9]]
Former-commit-id: d81e3b0efa
Former-commit-id: e897cb40df
2014-12-08 14:36:44 -06:00
steve.naples
b14e8e0998 ASM #16889 - Fixed issue with precip station count, also added logging for Snow data file read and station edit.
Change-Id: I1b689b485a152e1c942c021ac0f778b0f299d3e3

Former-commit-id: 539b859040 [formerly 18b2de3fdf [formerly c836fb0c1f8721f81049af56cb8f7be9960a5cd6]]
Former-commit-id: 18b2de3fdf
Former-commit-id: fdc62ce4d5
2014-12-08 15:48:28 +00:00
Steve Harris
cc9614e0c7 Merge branch 'master_14.3.1' (14.3.1-36) into omaha_14.3.1
Former-commit-id: 12d20a1e6b [formerly b19ae7a6db [formerly e2a6deed98773f943def0ce9d9daf2a6a13f0eda]]
Former-commit-id: b19ae7a6db
Former-commit-id: b9081f0c0c
2014-12-07 23:13:26 -06:00
Shawn.Hooper
91e351340a ASM #16805 - Update component.spec for awips2-java for removal of license.txt file
Change-Id: I55524734785e63647cba46edb8e15324b794af95

Former-commit-id: e4224cd67b [formerly d3f6005946 [formerly dc77d48fc9c9e5183b94bc05321ab0061404a4ff]]
Former-commit-id: d3f6005946
Former-commit-id: 2abdd00f1b
2014-12-04 16:48:33 -05:00
Steve Harris
976387008b Merge branch 'master_14.3.1' (14.3.1-35) into omaha_14.3.1
Former-commit-id: 6179b233a4 [formerly 55e02e460f [formerly 28f68f31cbb9b73910fc3623f48b141ba5ba2385]]
Former-commit-id: 55e02e460f
Former-commit-id: 94c94fc302
2014-12-03 16:03:42 -06:00
Juliya Dynina
96f5d1719e Merge "ASM #16889 - Fixed colorvalue_use warning and cleaned up some code." into asm_14.3.1
Former-commit-id: 354a421da7 [formerly c431691d06 [formerly 2ebcc016732b0405b183b0e4e56d528a24e9cbdf]]
Former-commit-id: c431691d06
Former-commit-id: d49e57a971
2014-12-03 14:40:12 -05:00
steve.naples
a281a43536 ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4

Former-commit-id: b5389ced26 [formerly c4fad58bd9 [formerly 862cb7c4d789915067558c4508cf5f1e45a2cdf2]]
Former-commit-id: c4fad58bd9
Former-commit-id: 91c240f8bd
2014-12-03 18:35:19 +00:00
Brian.Dyke
9e9eaa9eb2 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 3b0a70d21e [formerly 6777dfad30 [formerly 5972d08bfe8bc836a3437251bcf9f5e68e14b6a1]]
Former-commit-id: 6777dfad30
Former-commit-id: 5c476c7a35
2014-12-02 12:17:32 -05:00
Paul.Grell
a2baa66348 ASM #16911 HydroDate set to next day if hour is 18Z or later
Change-Id: Ied55660cb81e3fdf2e87295fe22eb0915f7b4764

Former-commit-id: 370466a7e8 [formerly 63ae1fe88c [formerly 38d9bc8c4e385e339df5bdd010160728730bed8d]]
Former-commit-id: 63ae1fe88c
Former-commit-id: 2aecc9933d
2014-12-02 11:35:28 -05:00
Greg Armendariz
ac15389395 Merge "Issue #3804 BigNsharp 32 Bit Binary DLL" into omaha_14.3.1
Former-commit-id: f8d3131a94 [formerly 2b7718e838 [formerly e2ca08db84093060c1b570d7ec0c6d95b37d958c]]
Former-commit-id: 2b7718e838
Former-commit-id: 90211f7199
2014-12-01 08:39:56 -06:00
David Lovely
4b6b382db2 Issue #3804 BigNsharp 32 Bit Binary DLL
Former-commit-id: 7011dcd271 [formerly 96d211ec20 [formerly d4fe863a026c3df816d74ae724276628ab8aa4fb]]
Former-commit-id: 96d211ec20
Former-commit-id: 48f15f5168
2014-11-26 13:39:22 -06:00
steve.naples
144c886fd0 ASM #16889 - Daily QC does not display SNOTEL data.
Change-Id: I42035d5d4d856a395400a1be1d0c6a24bc64b0d8

Former-commit-id: a0face5b02 [formerly ec656123f2 [formerly 01735909fffdc9b5ef14ed072253eed6deaecad9]]
Former-commit-id: ec656123f2
Former-commit-id: 74aa7ae98b
2014-11-26 18:24:53 +00:00
Nate Jensen
0c79204969 Merge "Issue #3026 - Fix for HPE displays is volume browser" into omaha_14.3.1
Former-commit-id: 63c505f357 [formerly b46b4b51a8 [formerly 1cf731bc43346810f1976650ad509ee538cf3067]]
Former-commit-id: b46b4b51a8
Former-commit-id: e4da2244f9
2014-11-21 15:46:16 -06:00
Mike Duff
d9db0d97de Issue #3026 - Fix for HPE displays is volume browser
Change-Id: I1ef2766e9bf74e7ad82cc36cd4e4a35659aacf39

Former-commit-id: c1bea3b41f [formerly 67f3b00beb [formerly a375e64e7ee3276be47b26f4386e7bc6491bc740]]
Former-commit-id: 67f3b00beb
Former-commit-id: 3ab236aca3
2014-11-21 13:56:46 -06:00
Roger Ferrel
58019036d5 Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e

Former-commit-id: 71db8afbaa [formerly 4d06812d30 [formerly a9ce685c99dbdc1442f022cda7af09af5bdabf87]]
Former-commit-id: 4d06812d30
Former-commit-id: 4bcfb3ccaf
2014-11-20 12:25:00 -06:00
Roger Ferrel
18d467a6c7 Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: b88300a5fc [formerly 90a8b262f3 [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]
Former-commit-id: 90a8b262f3
Former-commit-id: 85d717b49c
2014-11-18 17:42:39 -06:00
Mike Duff
7ca13e8c64 Issue #3026 - Fixed pattern to match the actual file names
Change-Id: I957e2076cfa5ee4d59acc1a0db89066e446bfc99

Former-commit-id: f841f1eda9 [formerly 9be37bb41e [formerly 5a3ccbadbf08957a4f68a0cb7118c765ca44f849]]
Former-commit-id: 9be37bb41e
Former-commit-id: edb85525d0
2014-11-18 13:54:17 -06:00
Steve Harris
f7d8458cff Merge branch 'master_14.3.1' (14.3.1-33) into omaha_14.3.1
Former-commit-id: 8372956276 [formerly e8d5ccbc8c [formerly 75097cfa26dbcff3adf0054a1f88d0d185f289fc]]
Former-commit-id: e8d5ccbc8c
Former-commit-id: 9be298ac91
2014-11-17 13:46:28 -06:00
David Lovely
fbc8c87a3d Issue #3804 BigNsharp Binary DLL
Change-Id: Iaed7d84aeee537d884aa89942b6d0f14bb0a119d

Former-commit-id: bfcc4cf523 [formerly e8a2331f46 [formerly 1e0d00304e70b89b9b2a9de96753aeebde32bb19]]
Former-commit-id: e8a2331f46
Former-commit-id: 56536c7fa8
2014-11-17 12:40:13 -06:00
Fay.Liang
2ecd6d5cb2 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: d666aca2b4 [formerly 82f427924a [formerly 3b21d69375ceb9c07377082c5e46a094742406a0]]
Former-commit-id: 82f427924a
Former-commit-id: 99f1259dda
2014-11-14 16:24:25 -05:00
Lee Venable
b818070fad Merge "Issue #3026 - fixes to data access for HPE label generation" into omaha_14.3.1
Former-commit-id: f5bcc5b2c2 [formerly 6b127b488d [formerly 389c35bce7c456154321605c3415c43431a46c7b]]
Former-commit-id: 6b127b488d
Former-commit-id: f18c963895
2014-11-13 09:31:57 -06:00
Mike Duff
286339f229 Issue #3026 - fixes to data access for HPE label generation
Former-commit-id: 15f9d1ef50 [formerly 8503cc25a7 [formerly 8d30af1c970cca70fe74560d3157e754e1164785]]
Former-commit-id: 8503cc25a7
Former-commit-id: b43c8557cd
2014-11-12 18:34:32 -06:00
Ron Anderson
d88d5321e2 Issue #2854 Fix merge issue in MessageProducer between DRs 2726 and 3684
Change-Id: I6a6ea9c57857459f61e955a54275a8983a8004ce

Former-commit-id: 654c831b4e [formerly a60e3465f4 [formerly 09f13d9b33cfe3547d2dc3fb75c1673e1f3193b0]]
Former-commit-id: a60e3465f4
Former-commit-id: 755fdd1950
2014-11-12 11:25:32 -06:00
Dave Hladky
02cba88d1a Issue #3026 Fixed null metaData lookups in resource.
Change-Id: I29d17ea990ac5516b67ac18fadf4267663a23efb

Former-commit-id: 39db26fb1d [formerly 3052a38081 [formerly 3f6bba1fda61fe283be47af1a4245d196f94f998]]
Former-commit-id: 3052a38081
Former-commit-id: 019739d738
2014-11-11 10:18:47 -06:00
Brian.Dyke
36af744c81 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 7e87bf7ac4 [formerly 3dff476497 [formerly b683c7776ef1fad2702fca82aed1abb4873e433b]]
Former-commit-id: 3dff476497
Former-commit-id: 1cef274675
2014-11-07 12:55:38 -05:00
Brian.Dyke
bb6e90eb2e 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: 1e7d47d2aa [formerly 1cd471ed72 [formerly b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f]]
Former-commit-id: 1cd471ed72
Former-commit-id: 43b6c9ff82
2014-11-06 13:14:24 -05:00
Brian.Dyke
5cdd9f4256 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: acf00264f4 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]
Former-commit-id: aae68215c8
Former-commit-id: 4ac24af0a9
2014-11-06 12:55:21 -05:00
Steve Harris
fdbbbca1dc Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
Former-commit-id: 2ed98bb227 [formerly 98f2a877f6 [formerly b70eb5b35985453e77ef2337728c65161ba60422]]
Former-commit-id: 98f2a877f6
Former-commit-id: 0acbe91e58
2014-11-04 13:05:36 -06:00
Matthew Howard
8dd1e096dd Merge changes I8e97aec2,Ib6df55db into asm_14.3.1
* changes:
  ASM #16693 changed swear words to all upper case
  ASM #16693 fixed typo in the filter


Former-commit-id: afc51d425d [formerly c2226a2817 [formerly 0c3de224e672ea5259eaa395672efdf8982a1d45]]
Former-commit-id: c2226a2817
Former-commit-id: e4fecfd65c
2014-11-04 13:11:10 -05:00
Ron Anderson
ae81f91f32 Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db.
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785

Former-commit-id: dd230d9f01 [formerly b508a7134c [formerly de45da45f39169e3924122a7baf68ab6762e74e2]]
Former-commit-id: b508a7134c
Former-commit-id: af9fd16f73
2014-11-04 11:03:42 -06:00
Ying-Lian.Shi
fa8b686f3b ASM #16693 changed swear words to all upper case
Change-Id: I8e97aec281a3e2c307355a2138bde605de41f446

Former-commit-id: da58db313c [formerly 2c2662c191 [formerly ae186e99c22beeda347561fe24dc38a61a699c25]]
Former-commit-id: 2c2662c191
Former-commit-id: 741357ca4e
2014-11-04 14:13:29 +00:00
Brian.Dyke
05aa513de3 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 327491a3a8 [formerly f3b80f319d [formerly 4be7b001bc98e6fe81b3e66940d025fd7511060b]]
Former-commit-id: f3b80f319d
Former-commit-id: e4ce5f5af5
2014-11-03 14:45:24 -05:00
Shawn.Hooper
4dc9aaf835 ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212

Former-commit-id: f8ee619f16 [formerly 58db54ff05 [formerly 41e18e5104eac8ee3335a80d678d74c7a56b196a]]
Former-commit-id: 58db54ff05
Former-commit-id: a9b50b13ce
2014-11-03 10:30:05 -05:00
Matthew Howard
bef8c1d1dd Merge "ASM #16693 handles more swear words" into asm_14.3.1
Former-commit-id: 39ed75df43 [formerly 36e73a31df [formerly a6ed07b8c01df8576cc54f88dc52d2110d211707]]
Former-commit-id: 36e73a31df
Former-commit-id: 921bd882fa
2014-11-03 09:56:09 -05:00
Ying-Lian.Shi
3c441e63e2 ASM #16693 fixed typo in the filter
Change-Id: Ib6df55dbaabdbebe8bb670fbffd9c4c901e31857

Former-commit-id: 004b6fb906 [formerly 12ccfcfa11 [formerly 29f50282d5e2415f1d9a876c5515be0c04e27015]]
Former-commit-id: 12ccfcfa11
Former-commit-id: 66ffae1502
2014-10-31 10:57:55 +00:00
Brian.Dyke
69d2129918 Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: 186f587dd6 [formerly affc9ed976 [formerly ef112c1ff84f846dbe7093bcbb4a94fecf2274d5]]
Former-commit-id: affc9ed976
Former-commit-id: 6f57efd2cb
2014-10-30 15:05:39 -04:00
Brian.Dyke
2db7d09544 Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 0f8e11aad4 [formerly 5e04756c0c [formerly 78923886791099b8e4564dd780d8ed64db16a5c1]]
Former-commit-id: 5e04756c0c
Former-commit-id: ce4a1c042f
2014-10-30 15:03:19 -04:00
Shawn.Hooper
b291c1a96a ASM #16800 - Add HRRR under D2D in Weather Element Browser
Change-Id: I829cd7357ccd37e389e88567a4159d0efde9aa41

Former-commit-id: ec3b831987 [formerly a44d775a27 [formerly 99807ddc4810c08635d5462357dc29e661686e33]]
Former-commit-id: a44d775a27
Former-commit-id: 733d5ff94d
2014-10-30 14:47:26 -04:00
Ying-Lian.Shi
f66932209e ASM #16693 handles more swear words
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7

Former-commit-id: 3d9fa4e763 [formerly ea9e231074 [formerly 6133c233bd3e02b0a8e1540dd6c496997184f11d]]
Former-commit-id: ea9e231074
Former-commit-id: e592171fe2
2014-10-30 18:22:34 +00:00
Shawn.Hooper
31c1d24165 ASM #16805 - Increment release number in the awips2-tools rpm spec file
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4

Former-commit-id: 9332029a6d [formerly 285e4baaec [formerly 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f]]
Former-commit-id: 285e4baaec
Former-commit-id: c715bdd83a
2014-10-30 09:58:02 -04:00
Brian.Dyke
b77a84627c Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: bdd4f6b3cc [formerly 33522c2b74 [formerly 5d2ba108dfbe266edbaee8f5a03e81c02419997a]]
Former-commit-id: 33522c2b74
Former-commit-id: 7e526df351
2014-10-30 09:38:07 -04:00
Steve Harris
f03e574ae9 Merge branch 'master_14.3.1' (14.3.1-30) into omaha_14.3.1
Former-commit-id: 8d1829bee7 [formerly 8fd7a28033 [formerly ec350c044862fb51513ffa5246c47af33a6ceae5]]
Former-commit-id: 8fd7a28033
Former-commit-id: 4bca05c4e0
2014-10-30 08:36:12 -05:00
Ron Anderson
96ea0c0f1b Issue #3776 Cache SWT fill patterns used in history mode.
Change-Id: Ibb48a997fd0b9c2308ae9f492c7837a10db7285d

Former-commit-id: 53144f55f0 [formerly 0c3e19449f [formerly baefc78796f3d4826d32e5324dd88fa01d242ed5]]
Former-commit-id: 0c3e19449f
Former-commit-id: 8f220702f9
2014-10-29 15:20:18 -05:00
Steve Harris
06351e31d9 Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1
Former-commit-id: 15d91d4b2d [formerly 1753861b41 [formerly 9d95570c1686978a5c84a21af29dbc84e53355a3]]
Former-commit-id: 1753861b41
Former-commit-id: 9646f78f5d
2014-10-29 08:21:13 -05:00
Brian.Dyke
807a6372e8 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 94ddd59bfc [formerly 9907c37a0e [formerly d12d6cf7e6862a87c00f833ee02e72e5c0ad8252]]
Former-commit-id: 9907c37a0e
Former-commit-id: 77b206664f
2014-10-28 15:25:05 -04:00
Brian.Dyke
839438530c 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: 765359aee6 [formerly f8ce701c85 [formerly 52ba693c7d77f4e29db6bc5202c9764509bce58d]]
Former-commit-id: f8ce701c85
Former-commit-id: fe00e65407
2014-10-28 15:23:11 -04:00
Ben Steffensmeier
baa1fc1f7f Issue #3767 Change default image export name to screenCapture.png.
Former-commit-id: 80c209fef7 [formerly 1591c9cbb8 [formerly 021367d3212e185a2d8d4e5970fc268204bf070b]]
Former-commit-id: 1591c9cbb8
Former-commit-id: 4e24cde257
2014-10-28 14:18:02 -05:00
Baoyu Yin
2f5803a63d 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: 4252ccfcb1 [formerly c9bc14a668 [formerly 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8]]
Former-commit-id: c9bc14a668
Former-commit-id: 3481a6eee5
2014-10-28 14:32:31 -04:00
Ron Anderson
cf13947cf2 Issue #3766 Fixed return type of GridParmManager.createNewDb
Change-Id: Ib76bf614b09895ef08065da86d3af8d59f490f4c

Former-commit-id: 8362946f0e [formerly ebe43e22d3 [formerly 2e2f83952a6ef00b17d9f4504133c85e93e0126e]]
Former-commit-id: ebe43e22d3
Former-commit-id: c8ff5af7b6
2014-10-27 18:40:15 -05:00