Commit graph

7544 commits

Author SHA1 Message Date
Roger Ferrel
304a337a0f Omaha #3353 Fix deadlock that freezes cave.
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b

Former-commit-id: 334b156d2e [formerly 398a8d6043] [formerly acbde703a2 [formerly 871fa68ddf242f1e63286939b1324fc3197c7336]]
Former-commit-id: acbde703a2
Former-commit-id: f27f2c456a
2014-11-04 14:13:29 -06:00
Steve Harris
e42a5d296f Merge tag 'OB_14.3.1-31m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: 472d9bd206 [formerly a5398d8035] [formerly e770670ebf [formerly 361f7bcf425edaf687cbfc63d4c165790b45a5bf]]
Former-commit-id: e770670ebf
Former-commit-id: 42db241877
2014-11-04 13:17:44 -06:00
Steve Harris
1deef1254f Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
Former-commit-id: 0acbe91e58 [formerly 98f2a877f6] [formerly 2ed98bb227 [formerly b70eb5b35985453e77ef2337728c65161ba60422]]
Former-commit-id: 2ed98bb227
Former-commit-id: 585bebbf12
2014-11-04 13:05:36 -06:00
Matthew Howard
4a7966269b 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: e4fecfd65c [formerly c2226a2817] [formerly afc51d425d [formerly 0c3de224e672ea5259eaa395672efdf8982a1d45]]
Former-commit-id: afc51d425d
Former-commit-id: dfffeb2fd3
2014-11-04 13:11:10 -05:00
Ron Anderson
3b2b59689b Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db.
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785

Former-commit-id: af9fd16f73 [formerly b508a7134c] [formerly dd230d9f01 [formerly de45da45f39169e3924122a7baf68ab6762e74e2]]
Former-commit-id: dd230d9f01
Former-commit-id: 47aadc52c1
2014-11-04 11:03:42 -06:00
Roger Ferrel
ad29b504dd Omaha #3643 Archive menu entries consolidated under Archive.
Former-commit-id: 4877ec1cc6 [formerly 18ef2df48c] [formerly 78614a83b2 [formerly 4eca2144b9d1109250dc9ceefe82701c66754980]]
Former-commit-id: 78614a83b2
Former-commit-id: 8a7c197d84
2014-11-04 10:04:30 -06:00
Nate Jensen
2ea56a028f Merge "Omaha #3601 Update satellite inventory scripts to DAF" into omaha_14.4.1
Former-commit-id: cf3e451448 [formerly 5e30cb57a8] [formerly c1f2f79c24 [formerly 524272eee2b2b27d46452509e944522649456d84]]
Former-commit-id: c1f2f79c24
Former-commit-id: 56224cc04b
2014-11-04 08:48:58 -06:00
Nate Jensen
94d4e527e9 Merge "Omaha #3600 Update radar inventory scripts to DAF" into omaha_14.4.1
Former-commit-id: 92626571a5 [formerly 4b0145a1c3] [formerly 93d8a31f41 [formerly 742a15be8431165cd348c87674275d45da9b6949]]
Former-commit-id: 93d8a31f41
Former-commit-id: c28bab2aa7
2014-11-04 08:48:42 -06:00
Nate Jensen
7d482127e4 Merge "Omaha #3599 Update grid inventory scirpts to DAF." into omaha_14.4.1
Former-commit-id: c656afbd93 [formerly bcaaf60fd1] [formerly e5ed793542 [formerly 2da2aa5af20a75edde85e566f680322106dd04ae]]
Former-commit-id: e5ed793542
Former-commit-id: 35d7da3c25
2014-11-04 08:48:32 -06:00
Ying-Lian.Shi
090de73852 ASM #16693 changed swear words to all upper case
Change-Id: I8e97aec281a3e2c307355a2138bde605de41f446

Former-commit-id: 741357ca4e [formerly 2c2662c191] [formerly da58db313c [formerly ae186e99c22beeda347561fe24dc38a61a699c25]]
Former-commit-id: da58db313c
Former-commit-id: 4b578495cd
2014-11-04 14:13:29 +00:00
Brian.Dyke
4b47c8a5b8 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: e4ce5f5af5 [formerly f3b80f319d] [formerly 327491a3a8 [formerly 4be7b001bc98e6fe81b3e66940d025fd7511060b]]
Former-commit-id: 327491a3a8
Former-commit-id: 196e5e37ac
2014-11-03 14:45:24 -05:00
Nathan Bowler
a355691cf0 Omaha #3601 Update satellite inventory scripts to DAF
Change-Id: If12bae7fff302e3da02552fd8d6393db9cd75a9f

Former-commit-id: 35ea6bb51d [formerly 9ce30740a7] [formerly 9942aebf17 [formerly 33b0fd4d0bc62e9dff1256edfe3f55a080b9efb9]]
Former-commit-id: 9942aebf17
Former-commit-id: 0d730c84a2
2014-11-03 14:03:51 -05:00
Nathan Bowler
c59033f918 Omaha #3600 Update radar inventory scripts to DAF
Change-Id: I9b410e61db6dc9edd60cd1c0ec225bf3aa0daf51

Former-commit-id: 5a6aec3edc [formerly 6966d7d7c5] [formerly d93009bd8d [formerly 1f780ff45f48936320853c793a4a5e85aa4ed588]]
Former-commit-id: d93009bd8d
Former-commit-id: d3f7d1216b
2014-11-03 13:14:28 -05:00
Nathan Bowler
163fa45af2 Omaha #3599 Update grid inventory scirpts to DAF.
Change-Id: I0ede4fae07d4b393348bf636612df0f81eb80bef

Former-commit-id: 37e89b5fda [formerly 3adeed0277] [formerly 79fea328f3 [formerly 881f242499a9130dd21fba9e5f65788627a95180]]
Former-commit-id: 79fea328f3
Former-commit-id: 08efd3fb84
2014-11-03 12:40:05 -05:00
Nate Jensen
effda35668 Merge "Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin" into omaha_14.4.1
Former-commit-id: adf63118e3 [formerly d5efa99fce] [formerly 0c4be8f4cb [formerly afe1e532e582e442c556679adcba4e8388b98bbb]]
Former-commit-id: 0c4be8f4cb
Former-commit-id: fcf278072c
2014-11-03 09:59:06 -06:00
Shawn.Hooper
bd94e0808a ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212

Former-commit-id: a9b50b13ce [formerly 58db54ff05] [formerly f8ee619f16 [formerly 41e18e5104eac8ee3335a80d678d74c7a56b196a]]
Former-commit-id: f8ee619f16
Former-commit-id: c4f4477a7c
2014-11-03 10:30:05 -05:00
Matthew Howard
5fc103daf4 Merge "ASM #16693 handles more swear words" into asm_14.3.1
Former-commit-id: 921bd882fa [formerly 36e73a31df] [formerly 39ed75df43 [formerly a6ed07b8c01df8576cc54f88dc52d2110d211707]]
Former-commit-id: 39ed75df43
Former-commit-id: d90db01d4e
2014-11-03 09:56:09 -05:00
Mark Peters
bf2ec95e77 Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin
Change-Id: I5e407aeff99d7dc9a393d713096971a7ed4c01a6

Former-commit-id: a460792af8 [formerly 88b07ddb46] [formerly bc9c564192 [formerly d946679c5a9b383f689ac3acc66d4aae4ecc4bde]]
Former-commit-id: bc9c564192
Former-commit-id: 64e9590b5b
2014-10-31 13:32:42 -05:00
Ying-Lian.Shi
d3f52b327e ASM #16693 fixed typo in the filter
Change-Id: Ib6df55dbaabdbebe8bb670fbffd9c4c901e31857

Former-commit-id: 66ffae1502 [formerly 12ccfcfa11] [formerly 004b6fb906 [formerly 29f50282d5e2415f1d9a876c5515be0c04e27015]]
Former-commit-id: 004b6fb906
Former-commit-id: 9d4e4a1143
2014-10-31 10:57:55 +00:00
Mark Peters
ddc78ffe66 Omaha #3768 Pluginize the D2D Upper Air menu
Change-Id: I58f76a59a40170fefe93d779760b6581c3f8490a

Former-commit-id: 5199f9b9ee [formerly 1c2e38dbd1] [formerly c11bd6816b [formerly 4554ba073c7a97a335d8020f7068bc5521c0b47a]]
Former-commit-id: c11bd6816b
Former-commit-id: d732bfe002
2014-10-30 19:15:52 -05:00
Nate Jensen
49fb546f20 Merge "Omaha #3601 Adding original, unaltered satellite inventory scripts" into omaha_14.4.1
Former-commit-id: 99309c619b [formerly 316052231f] [formerly dc13fce4dc [formerly 2c413c430c662b74e5d06e372f6d9f9ae7f6177a]]
Former-commit-id: dc13fce4dc
Former-commit-id: 958441ec3e
2014-10-30 15:05:13 -05:00
Nathan Bowler
6676a275cc Omaha #3601 Adding original, unaltered satellite inventory scripts
Change-Id: I32bccffb990baf6dc023c9fafe011aaa0dd4c893

Former-commit-id: 68f9e2e76a [formerly 3bed545253] [formerly de68023968 [formerly 9e244756aa82082784c7f228378bf5f024b32422]]
Former-commit-id: de68023968
Former-commit-id: e4d532d4dc
2014-10-30 15:46:09 -04:00
Nathan Bowler
5480e6e8fd Omaha #3600 Adding original, unaltered radar inventory scripts.
Change-Id: I2bd8de7b36aeba4cb5e58d6b153a249d72ac91bb

Former-commit-id: 5d3312b1d4 [formerly c84b7c3f0f] [formerly 68c4943c27 [formerly 965405355e5f053266bd50977c59dff760ee4f0b]]
Former-commit-id: 68c4943c27
Former-commit-id: b59d2d69cd
2014-10-30 15:35:14 -04:00
Nate Jensen
f7c77d3efc Merge "Omaha #3599 Adding unaltered, original grid inventory scripts" into omaha_14.4.1
Former-commit-id: 71d7fd520e [formerly 94b267202e] [formerly 592a8d0e83 [formerly 9dd052b0cbe66ef388f0c435f32d7bc9a36b8545]]
Former-commit-id: 592a8d0e83
Former-commit-id: 23ed772042
2014-10-30 14:34:27 -05:00
Brian.Dyke
3451202fb4 Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: 6f57efd2cb [formerly affc9ed976] [formerly 186f587dd6 [formerly ef112c1ff84f846dbe7093bcbb4a94fecf2274d5]]
Former-commit-id: 186f587dd6
Former-commit-id: 2b7ad1daec
2014-10-30 15:05:39 -04:00
Brian.Dyke
6907e0d17b Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: ce4a1c042f [formerly 5e04756c0c] [formerly 0f8e11aad4 [formerly 78923886791099b8e4564dd780d8ed64db16a5c1]]
Former-commit-id: 0f8e11aad4
Former-commit-id: 6c13091ec2
2014-10-30 15:03:19 -04:00
Nathan Bowler
67163ed1d4 Omaha #3599 Adding unaltered, original grid inventory scripts
Change-Id: If8702172dababa0acf73c1eead79769bde2f2469

Former-commit-id: 18e9499338 [formerly f3be28a332] [formerly b809f64cd4 [formerly 0dbabf14124334a97f88040c0ffa77e10299cb5f]]
Former-commit-id: b809f64cd4
Former-commit-id: 3ff8755679
2014-10-30 14:59:06 -04:00
Shawn.Hooper
3af096ae41 ASM #16800 - Add HRRR under D2D in Weather Element Browser
Change-Id: I829cd7357ccd37e389e88567a4159d0efde9aa41

Former-commit-id: 733d5ff94d [formerly a44d775a27] [formerly ec3b831987 [formerly 99807ddc4810c08635d5462357dc29e661686e33]]
Former-commit-id: ec3b831987
Former-commit-id: 2f2bb733a4
2014-10-30 14:47:26 -04:00
Nate Jensen
d273c1e6f6 Merge "Omaha #3755 Update Grid and Radar information retrieval for msas/laps inventories." into omaha_14.4.1
Former-commit-id: d5d38b8768 [formerly fc9c89c426] [formerly fbaecfe578 [formerly e9780b64d0ce8c91f7c236067f5ab251bd874546]]
Former-commit-id: fbaecfe578
Former-commit-id: 0e82fa47c8
2014-10-30 13:41:14 -05:00
Ying-Lian.Shi
49aafc099b ASM #16693 handles more swear words
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7

Former-commit-id: e592171fe2 [formerly ea9e231074] [formerly 3d9fa4e763 [formerly 6133c233bd3e02b0a8e1540dd6c496997184f11d]]
Former-commit-id: 3d9fa4e763
Former-commit-id: c8cfe6a2a7
2014-10-30 18:22:34 +00:00
Nathan Bowler
0efd421fe8 Omaha #3755 Update Grid and Radar information retrieval for msas/laps inventories.
Change-Id: I472c2948ada9357350138fe27f2588cce27e17ba

Former-commit-id: 74c41dc01f [formerly f714213db3] [formerly 9673a96e71 [formerly 2ec9a420268e41d8fdc35efe7feabfb12b7bee4c]]
Former-commit-id: 9673a96e71
Former-commit-id: f76cd38a15
2014-10-30 13:18:14 -04:00
Steve Harris
b9cc8a581d Merge tag 'OB_14.3.1-30m' into omaha_14.4.1
Former-commit-id: b78ff0ee6e [formerly 54c14a5f5b] [formerly 5efdd0d572 [formerly 9f4fc2a9cbff7f8555c7bf8326bb785f791e8b00]]
Former-commit-id: 5efdd0d572
Former-commit-id: be38ca97d4
2014-10-30 09:40:20 -05:00
Nate Jensen
ee04135d20 Merge "Omaha #3668 Give grid a custom job pool." into omaha_14.4.1
Former-commit-id: 199ccf1aba [formerly 5e22943a26] [formerly e83c1f20bb [formerly b98016900319d31c23be96640aa97f7b2efcee5b]]
Former-commit-id: e83c1f20bb
Former-commit-id: c004468689
2014-10-30 09:32:12 -05:00
Shawn.Hooper
01ba6f2df0 ASM #16805 - Increment release number in the awips2-tools rpm spec file
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4

Former-commit-id: c715bdd83a [formerly 285e4baaec] [formerly 9332029a6d [formerly 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f]]
Former-commit-id: 9332029a6d
Former-commit-id: 0b0b922968
2014-10-30 09:58:02 -04:00
Brian.Dyke
752395b827 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 7e526df351 [formerly 33522c2b74] [formerly bdd4f6b3cc [formerly 5d2ba108dfbe266edbaee8f5a03e81c02419997a]]
Former-commit-id: bdd4f6b3cc
Former-commit-id: e3ebd14d63
2014-10-30 09:38:07 -04:00
Steve Harris
a4314b292f Merge branch 'master_14.3.1' (14.3.1-30) into omaha_14.3.1
Former-commit-id: 4bca05c4e0 [formerly 8fd7a28033] [formerly 8d1829bee7 [formerly ec350c044862fb51513ffa5246c47af33a6ceae5]]
Former-commit-id: 8d1829bee7
Former-commit-id: 8a6a57d9de
2014-10-30 08:36:12 -05:00
Ben Steffensmeier
9ea0a6f1bd Omaha #3668 Give grid a custom job pool.
Former-commit-id: e00f394424 [formerly 596578281a] [formerly b41b28ed57 [formerly 14e82b9f400b47b4f446bf1c5c5e729cf442b153]]
Former-commit-id: b41b28ed57
Former-commit-id: 90e9458999
2014-10-29 18:07:28 -05:00
Benjamin Phillippe
691664da6e Omaha #3454 Fixed text archiver
Former-commit-id: 3b8e7bc7ea [formerly fd16871b96] [formerly 1fcb79c423 [formerly 61514bec505566ba434e3b9772e0aaf329b51cff]]
Former-commit-id: 1fcb79c423
Former-commit-id: 13b8859ee1
2014-10-29 16:09:35 -05:00
Brian.Dyke
b11b0868ef Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 6161c5ea4f [formerly a6f8a3b109] [formerly 01c3167dc9 [formerly bc44629025f7070a97fcff4a00939e509e6987b1]]
Former-commit-id: 01c3167dc9
Former-commit-id: 4639e2c25d
2014-10-29 16:39:06 -04:00
Ron Anderson
e946ac633e Issue #3776 Cache SWT fill patterns used in history mode.
Change-Id: Ibb48a997fd0b9c2308ae9f492c7837a10db7285d

Former-commit-id: 8f220702f9 [formerly 0c3e19449f] [formerly 53144f55f0 [formerly baefc78796f3d4826d32e5324dd88fa01d242ed5]]
Former-commit-id: 53144f55f0
Former-commit-id: 5f83ca27f1
2014-10-29 15:20:18 -05:00
Sarah Pontius
5bb52ed311 VLab Issue #5129 - Merging code from tropical_hazard_formatters to tcv_14.3.2; fixes #5129
Change-Id: Ia7365620c5cc803faa25af4d6c32d3e394497626

Former-commit-id: 8d3958527b [formerly d7e8bc97b6] [formerly 760c0d6532 [formerly eee97946890b5b0df941e2665a4a183eece14598]]
Former-commit-id: 760c0d6532
Former-commit-id: bbe1125b56
2014-10-29 13:33:24 -06:00
Steve Harris
1d89136dd2 Merge tag 'OB_14.3.1-29m' into omaha_14.4.1
Former-commit-id: 7da796e1b0 [formerly 0322884798] [formerly 0f40604bcb [formerly e5cd617f80e90dcfba52058b2a439fade1cfe15e]]
Former-commit-id: 0f40604bcb
Former-commit-id: 0d2cbbfe4a
2014-10-29 10:03:20 -05:00
Steve Harris
5bda487c3b Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 893a0d91e5 [formerly 315423d014] [formerly f23b0fc310 [formerly 38fbd41a54b5dd9afe0482f83ed3b4d7d5a2aa2e]]
Former-commit-id: f23b0fc310
Former-commit-id: a3dd8f7e88
2014-10-29 09:55:14 -05:00
Steve Harris
51175a1556 Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1
Former-commit-id: 9646f78f5d [formerly 1753861b41] [formerly 15d91d4b2d [formerly 9d95570c1686978a5c84a21af29dbc84e53355a3]]
Former-commit-id: 15d91d4b2d
Former-commit-id: 2a46e1a813
2014-10-29 08:21:13 -05:00
Nate Jensen
782698f6d5 Merge "Omaha #2707 fixed LSR update script" into omaha_14.4.1
Former-commit-id: a2f3f93724 [formerly 18b160faac] [formerly e42bf53f7a [formerly 828a103cf403430684f84f18dbfe0c044655e307]]
Former-commit-id: e42bf53f7a
Former-commit-id: 4b9b013b22
2014-10-28 18:03:13 -05:00
Brian Clements
bce723c005 Omaha #2707 fixed LSR update script
Change-Id: I879d7d425f19113cae2c0bbc6f43df1edcf5594a

Former-commit-id: 3659812649 [formerly 3c0c33288a] [formerly 0f5d97c961 [formerly ee38c97013e2a0c83e555cbbe77a9978296e39f1]]
Former-commit-id: 0f5d97c961
Former-commit-id: 682ad5d400
2014-10-28 17:57:38 -05:00
Benjamin Phillippe
c1dba0e118 Omaha #3454 Adding sequences to tables in events schema
Change-Id: I79d03c5f97eeecdb665fee624cdae377555fa373

Former-commit-id: 306508bdbd [formerly 80879d9efa] [formerly a13c0a8b39 [formerly fa5ec2a1866784e8b0fc0f9a6c0d3a363cbcc22d]]
Former-commit-id: a13c0a8b39
Former-commit-id: 73c1c816c0
2014-10-28 15:56:47 -05:00
Richard Peter
1f71ff6cc9 Merge "Omaha #3454 Adding sequences to tables in events schema" into omaha_14.4.1
Former-commit-id: 3f1217ac04 [formerly 7c8a19d149] [formerly 14a86f1063 [formerly 3fb87f623c38b78c1d1046990fb05576851174d2]]
Former-commit-id: 14a86f1063
Former-commit-id: be63cfd242
2014-10-28 15:50:26 -05:00
Nate Jensen
473d2edd5d Merge "Omaha #3720 Remove dataURI column references from redbook" into omaha_14.4.1
Former-commit-id: 325bf767a0 [formerly 13096c2eaa] [formerly 9fe7950e24 [formerly add132c7f2baf5b421590827559b99954133be76]]
Former-commit-id: 9fe7950e24
Former-commit-id: 751d88442c
2014-10-28 15:32:55 -05:00
Nate Jensen
d0d6fb1e06 Merge "Omaha #3454 Fixing usage of getSession() to ensure proper session closure" into omaha_14.4.1
Former-commit-id: 2f2eb20e61 [formerly bf7d9b31b7] [formerly e54ebf94e5 [formerly 7306aeaa7986aa69d2c18c00d940fb2eb0624612]]
Former-commit-id: e54ebf94e5
Former-commit-id: 870fd8efd9
2014-10-28 15:32:41 -05:00