Richard Peter
|
494217f808
|
Merge "Omaha #3643 Archive menu entries consolidated under Archive." into omaha_14.4.1
Former-commit-id: 2f5db5008b [formerly 4bdb77ea6a] [formerly 2f5db5008b [formerly 4bdb77ea6a] [formerly 8328d538cd [formerly e10b35d2537f6aec5cd007e071f570734098c802]]]
Former-commit-id: 8328d538cd
Former-commit-id: f474978bb7 [formerly c9989a4425]
Former-commit-id: 89455a1dd5
|
2014-11-07 10:01:32 -06:00 |
|
Richard Peter
|
532ee1b6b7
|
Merge "Omaha #3353 Fix deadlock that freezes cave." into omaha_14.4.1
Former-commit-id: 4608c2ff2c [formerly b92033924b] [formerly 4608c2ff2c [formerly b92033924b] [formerly f1499db1c3 [formerly 24f3f08d27ac6d3e2cba7b5f6f5a3fd8e6452700]]]
Former-commit-id: f1499db1c3
Former-commit-id: bd7a9c2327 [formerly 6cf6dff0f1]
Former-commit-id: 6995c6b05c
|
2014-11-07 09:50:34 -06:00 |
|
Richard Peter
|
c79c58422a
|
Merge "Omaha #3549 log time to receive data in pypies separate from deserialize time" into omaha_14.4.1
Former-commit-id: 0bf4e96f04 [formerly f13dbb07f3] [formerly 0bf4e96f04 [formerly f13dbb07f3] [formerly f7ef760f5a [formerly c24d5d08e6663e690b0966f71826869127c1a9cf]]]
Former-commit-id: f7ef760f5a
Former-commit-id: 8897a794c0 [formerly 71d478b40d]
Former-commit-id: cf14bfc2cb
|
2014-11-07 09:21:02 -06:00 |
|
Nate Jensen
|
a5f86aeaf3
|
Omaha #3356 fix thin client startup when localization caching is
disabled
Change-Id: I38a9299d9cc50c3e6f1b5d781c0754c2af70d478
Former-commit-id: 62f1088e05 [formerly 6173ea452d] [formerly 62f1088e05 [formerly 6173ea452d] [formerly 9c79b4851f [formerly b4817236399d6084da219892d97b6db38d44d64a]]]
Former-commit-id: 9c79b4851f
Former-commit-id: 88d5fa6edb [formerly 2c08bc1e38]
Former-commit-id: e87243e0ee
|
2014-11-06 16:48:11 -06:00 |
|
Nate Jensen
|
2de5ea3c23
|
Omaha #3549 log time to receive data in pypies separate from deserialize
time
Change-Id: I10e1fd81305b7653849ec3801fa1136368c19943
Former-commit-id: 50d2b6de1d [formerly a3b292c116] [formerly 50d2b6de1d [formerly a3b292c116] [formerly 9380b5ee1f [formerly 61ee939fb5611c0043cd3440716a03763785a7ab]]]
Former-commit-id: 9380b5ee1f
Former-commit-id: eb4c4b23b7 [formerly e16430a496]
Former-commit-id: 5cae62980a
|
2014-11-06 15:57:42 -06:00 |
|
Slav Korolev
|
37a7beb45e
|
Omaha #3667 - Corrected functionality of dialog.
Former-commit-id: 45c9b0560a [formerly fbb9e62cfc] [formerly 45c9b0560a [formerly fbb9e62cfc] [formerly 9f0b1a68e6 [formerly cf354d6ac5668ba502feb188bdf17a0967168b19]]]
Former-commit-id: 9f0b1a68e6
Former-commit-id: a49a3bbcc4 [formerly a3aaf1a744]
Former-commit-id: 0ba3e8d678
|
2014-11-06 15:24:12 -05:00 |
|
Brian.Dyke
|
0c9c29bff8
|
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: 43b6c9ff82 [formerly 1cd471ed72] [formerly 43b6c9ff82 [formerly 1cd471ed72] [formerly 1e7d47d2aa [formerly b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f]]]
Former-commit-id: 1e7d47d2aa
Former-commit-id: f2fad2a476 [formerly 331a06fedb]
Former-commit-id: 66d8327025
|
2014-11-06 13:14:24 -05:00 |
|
Dave Hladky
|
33a80a9ef0
|
Omaha #3798 Merge Fixes
Former-commit-id: 302464acda [formerly 2c61cae7ab] [formerly 302464acda [formerly 2c61cae7ab] [formerly 7f051d34e6 [formerly 011a9d5b937e1a8a337ffaf04ba47cd7080ffaf5]]]
Former-commit-id: 7f051d34e6
Former-commit-id: 08b98856aa [formerly 78e91a0c62]
Former-commit-id: 161d54e8ec
|
2014-11-06 12:09:42 -06:00 |
|
Brian.Dyke
|
f25f4ecb2c
|
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: 4ac24af0a9 [formerly aae68215c8] [formerly 4ac24af0a9 [formerly aae68215c8] [formerly acf00264f4 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]]
Former-commit-id: acf00264f4
Former-commit-id: 2743718323 [formerly 2b470ad1a1]
Former-commit-id: 54f82d7f6f
|
2014-11-06 12:55:21 -05:00 |
|
Nate Jensen
|
dedad2059a
|
Merge "Omaha #2714 created satellite.gini edex plugin" into omaha_14.4.1
Former-commit-id: b4c44c6695 [formerly 6560926461] [formerly b4c44c6695 [formerly 6560926461] [formerly a943e8e9e0 [formerly da81f4d7ceeb5251b69e72cfddde9e59de5a2da1]]]
Former-commit-id: a943e8e9e0
Former-commit-id: fee6faa453 [formerly a826865e0d]
Former-commit-id: 9d5dfeb486
|
2014-11-06 11:26:10 -06:00 |
|
Brian Clements
|
f9d30562ed
|
Omaha #2714 created satellite.gini edex plugin
moved satellite decoder to new plugin
replaced database table lookups with in-memory tables backed by XML
Change-Id: I45269240964dd3590ec2068472cf0b4f5dd54c60
Former-commit-id: cab31dd11f [formerly db7652f69d] [formerly cab31dd11f [formerly db7652f69d] [formerly 1954463cfc [formerly df744611151caf6492f5dc084974140c1a6fae0a]]]
Former-commit-id: 1954463cfc
Former-commit-id: 2ca42c3e03 [formerly 7de6a37637]
Former-commit-id: 8aba8edf08
|
2014-11-06 11:06:19 -06:00 |
|
Dave Hladky
|
2d38aa6ada
|
Omaha #3132 merge in PDA into 14.4.1
Former-commit-id: 23f945bad9 [formerly b954a12e79] [formerly 23f945bad9 [formerly b954a12e79] [formerly ef29e2883c [formerly 38944c601a800e96fbdd34d51034bb7e42ae4a27]]]
Former-commit-id: ef29e2883c
Former-commit-id: df8a326878 [formerly d4edc92ec5]
Former-commit-id: 750200f237
|
2014-11-06 09:48:54 -06:00 |
|
Dave Hladky
|
4c18bc4e66
|
Merge branch 'omaha_pda' into omaha_14.4.1
Former-commit-id: 6176578771 [formerly 1c6282503e] [formerly 6176578771 [formerly 1c6282503e] [formerly 1923af2aab [formerly 465a3cff39ad6f0159de561aaf6e8e89e99762ed]]]
Former-commit-id: 1923af2aab
Former-commit-id: 0cbbdd5755 [formerly b0a481d29d]
Former-commit-id: 8cd9d3bb55
|
2014-11-06 09:34:39 -06:00 |
|
Dave Hladky
|
899865c94a
|
Merge branch 'omaha_pda' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_pda
Former-commit-id: 4cfe179d9e [formerly fa065dcfe8] [formerly 4cfe179d9e [formerly fa065dcfe8] [formerly 66922edb00 [formerly cc451692b975f3e40c08960585970b1965aa5b84]]]
Former-commit-id: 66922edb00
Former-commit-id: 723d4d63d0 [formerly f44326ad0f]
Former-commit-id: 03f3a97463
|
2014-11-06 09:18:39 -06:00 |
|
Steve Harris
|
b05ff6ebad
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 1d162b6476 [formerly 1a8817803d] [formerly 1d162b6476 [formerly 1a8817803d] [formerly 4d0eef66f3 [formerly 3fdd69aade32e40d4684da739b19a414e0ba37df]]]
Former-commit-id: 4d0eef66f3
Former-commit-id: d5303fecde [formerly c2d4ce5ba0]
Former-commit-id: 4a4db9b9a1
|
2014-11-05 07:58:05 -06:00 |
|
Ron Anderson
|
195085cbd9
|
Omaha #3557 Fixed NPE when parm is removed from display
Change-Id: I14a82967256a788c25d049a4fd119289c909ad91
Former-commit-id: 377f1a5acb [formerly f0b58e1daa] [formerly 377f1a5acb [formerly f0b58e1daa] [formerly 1f0fee6536 [formerly 4ba96e15f55e276cf78b06f71d3e5d6c98bcab8b]]]
Former-commit-id: 1f0fee6536
Former-commit-id: e8df187d74 [formerly c80c3a2661]
Former-commit-id: 5c4a180d27
|
2014-11-04 17:41:19 -06:00 |
|
Roger Ferrel
|
effdc7ec2a
|
Omaha #3353 Fix deadlock that freezes cave.
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b
Former-commit-id: 334b156d2e [formerly 398a8d6043] [formerly 334b156d2e [formerly 398a8d6043] [formerly acbde703a2 [formerly 871fa68ddf242f1e63286939b1324fc3197c7336]]]
Former-commit-id: acbde703a2
Former-commit-id: 304a337a0f [formerly f27f2c456a]
Former-commit-id: 4ebf8669f4
|
2014-11-04 14:13:29 -06:00 |
|
Steve Harris
|
ada6d69ce0
|
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 472d9bd206 [formerly a5398d8035] [formerly e770670ebf [formerly 361f7bcf425edaf687cbfc63d4c165790b45a5bf]]]
Former-commit-id: e770670ebf
Former-commit-id: e42a5d296f [formerly 42db241877]
Former-commit-id: c4b8243a6e
|
2014-11-04 13:17:44 -06:00 |
|
Steve Harris
|
4614ea10a5
|
Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
Former-commit-id: 0acbe91e58 [formerly 98f2a877f6] [formerly 0acbe91e58 [formerly 98f2a877f6] [formerly 2ed98bb227 [formerly b70eb5b35985453e77ef2337728c65161ba60422]]]
Former-commit-id: 2ed98bb227
Former-commit-id: 1deef1254f [formerly 585bebbf12]
Former-commit-id: b72af6ee72
|
2014-11-04 13:05:36 -06:00 |
|
Matthew Howard
|
3cd058379a
|
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 e4fecfd65c [formerly c2226a2817] [formerly afc51d425d [formerly 0c3de224e672ea5259eaa395672efdf8982a1d45]]]
Former-commit-id: afc51d425d
Former-commit-id: 4a7966269b [formerly dfffeb2fd3]
Former-commit-id: 79883bc17e
|
2014-11-04 13:11:10 -05:00 |
|
Ron Anderson
|
6c57033c28
|
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 af9fd16f73 [formerly b508a7134c] [formerly dd230d9f01 [formerly de45da45f39169e3924122a7baf68ab6762e74e2]]]
Former-commit-id: dd230d9f01
Former-commit-id: 3b2b59689b [formerly 47aadc52c1]
Former-commit-id: 023abd756b
|
2014-11-04 11:03:42 -06:00 |
|
Roger Ferrel
|
c1c76e4fe0
|
Omaha #3643 Archive menu entries consolidated under Archive.
Former-commit-id: 4877ec1cc6 [formerly 18ef2df48c] [formerly 4877ec1cc6 [formerly 18ef2df48c] [formerly 78614a83b2 [formerly 4eca2144b9d1109250dc9ceefe82701c66754980]]]
Former-commit-id: 78614a83b2
Former-commit-id: ad29b504dd [formerly 8a7c197d84]
Former-commit-id: 4de983bb97
|
2014-11-04 10:04:30 -06:00 |
|
Nate Jensen
|
86a0d3cd8c
|
Merge "Omaha #3601 Update satellite inventory scripts to DAF" into omaha_14.4.1
Former-commit-id: cf3e451448 [formerly 5e30cb57a8] [formerly cf3e451448 [formerly 5e30cb57a8] [formerly c1f2f79c24 [formerly 524272eee2b2b27d46452509e944522649456d84]]]
Former-commit-id: c1f2f79c24
Former-commit-id: 2ea56a028f [formerly 56224cc04b]
Former-commit-id: 1584c8655d
|
2014-11-04 08:48:58 -06:00 |
|
Nate Jensen
|
36d0c6f1ea
|
Merge "Omaha #3600 Update radar inventory scripts to DAF" into omaha_14.4.1
Former-commit-id: 92626571a5 [formerly 4b0145a1c3] [formerly 92626571a5 [formerly 4b0145a1c3] [formerly 93d8a31f41 [formerly 742a15be8431165cd348c87674275d45da9b6949]]]
Former-commit-id: 93d8a31f41
Former-commit-id: 94d4e527e9 [formerly c28bab2aa7]
Former-commit-id: f4fb33cc0d
|
2014-11-04 08:48:42 -06:00 |
|
Nate Jensen
|
26544199e2
|
Merge "Omaha #3599 Update grid inventory scirpts to DAF." into omaha_14.4.1
Former-commit-id: c656afbd93 [formerly bcaaf60fd1] [formerly c656afbd93 [formerly bcaaf60fd1] [formerly e5ed793542 [formerly 2da2aa5af20a75edde85e566f680322106dd04ae]]]
Former-commit-id: e5ed793542
Former-commit-id: 7d482127e4 [formerly 35d7da3c25]
Former-commit-id: 7c35279d1e
|
2014-11-04 08:48:32 -06:00 |
|
Ying-Lian.Shi
|
ec7a960513
|
ASM #16693 changed swear words to all upper case
Change-Id: I8e97aec281a3e2c307355a2138bde605de41f446
Former-commit-id: 741357ca4e [formerly 2c2662c191] [formerly 741357ca4e [formerly 2c2662c191] [formerly da58db313c [formerly ae186e99c22beeda347561fe24dc38a61a699c25]]]
Former-commit-id: da58db313c
Former-commit-id: 090de73852 [formerly 4b578495cd]
Former-commit-id: 2ef5007880
|
2014-11-04 14:13:29 +00:00 |
|
Brian.Dyke
|
2c716cdca3
|
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 e4ce5f5af5 [formerly f3b80f319d] [formerly 327491a3a8 [formerly 4be7b001bc98e6fe81b3e66940d025fd7511060b]]]
Former-commit-id: 327491a3a8
Former-commit-id: 4b47c8a5b8 [formerly 196e5e37ac]
Former-commit-id: 319b2f9b15
|
2014-11-03 14:45:24 -05:00 |
|
Nathan Bowler
|
9b648b93af
|
Omaha #3601 Update satellite inventory scripts to DAF
Change-Id: If12bae7fff302e3da02552fd8d6393db9cd75a9f
Former-commit-id: 35ea6bb51d [formerly 9ce30740a7] [formerly 35ea6bb51d [formerly 9ce30740a7] [formerly 9942aebf17 [formerly 33b0fd4d0bc62e9dff1256edfe3f55a080b9efb9]]]
Former-commit-id: 9942aebf17
Former-commit-id: a355691cf0 [formerly 0d730c84a2]
Former-commit-id: 907e84243b
|
2014-11-03 14:03:51 -05:00 |
|
Nathan Bowler
|
1682b6fdf3
|
Omaha #3600 Update radar inventory scripts to DAF
Change-Id: I9b410e61db6dc9edd60cd1c0ec225bf3aa0daf51
Former-commit-id: 5a6aec3edc [formerly 6966d7d7c5] [formerly 5a6aec3edc [formerly 6966d7d7c5] [formerly d93009bd8d [formerly 1f780ff45f48936320853c793a4a5e85aa4ed588]]]
Former-commit-id: d93009bd8d
Former-commit-id: c59033f918 [formerly d3f7d1216b]
Former-commit-id: 5325dfa38d
|
2014-11-03 13:14:28 -05:00 |
|
Nathan Bowler
|
316dda9d9c
|
Omaha #3599 Update grid inventory scirpts to DAF.
Change-Id: I0ede4fae07d4b393348bf636612df0f81eb80bef
Former-commit-id: 37e89b5fda [formerly 3adeed0277] [formerly 37e89b5fda [formerly 3adeed0277] [formerly 79fea328f3 [formerly 881f242499a9130dd21fba9e5f65788627a95180]]]
Former-commit-id: 79fea328f3
Former-commit-id: 163fa45af2 [formerly 08efd3fb84]
Former-commit-id: 43efb1c9aa
|
2014-11-03 12:40:05 -05:00 |
|
Nate Jensen
|
bff937e2ab
|
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 adf63118e3 [formerly d5efa99fce] [formerly 0c4be8f4cb [formerly afe1e532e582e442c556679adcba4e8388b98bbb]]]
Former-commit-id: 0c4be8f4cb
Former-commit-id: effda35668 [formerly fcf278072c]
Former-commit-id: 3b033437fe
|
2014-11-03 09:59:06 -06:00 |
|
Shawn.Hooper
|
7ab9b05ef8
|
ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212
Former-commit-id: a9b50b13ce [formerly 58db54ff05] [formerly a9b50b13ce [formerly 58db54ff05] [formerly f8ee619f16 [formerly 41e18e5104eac8ee3335a80d678d74c7a56b196a]]]
Former-commit-id: f8ee619f16
Former-commit-id: bd94e0808a [formerly c4f4477a7c]
Former-commit-id: 2d012e4a7e
|
2014-11-03 10:30:05 -05:00 |
|
Matthew Howard
|
2868a0bf5a
|
Merge "ASM #16693 handles more swear words" into asm_14.3.1
Former-commit-id: 921bd882fa [formerly 36e73a31df] [formerly 921bd882fa [formerly 36e73a31df] [formerly 39ed75df43 [formerly a6ed07b8c01df8576cc54f88dc52d2110d211707]]]
Former-commit-id: 39ed75df43
Former-commit-id: 5fc103daf4 [formerly d90db01d4e]
Former-commit-id: c4fc8042ba
|
2014-11-03 09:56:09 -05:00 |
|
Mark Peters
|
87e18fa4d3
|
Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin
Change-Id: I5e407aeff99d7dc9a393d713096971a7ed4c01a6
Former-commit-id: a460792af8 [formerly 88b07ddb46] [formerly a460792af8 [formerly 88b07ddb46] [formerly bc9c564192 [formerly d946679c5a9b383f689ac3acc66d4aae4ecc4bde]]]
Former-commit-id: bc9c564192
Former-commit-id: bf2ec95e77 [formerly 64e9590b5b]
Former-commit-id: b253e61810
|
2014-10-31 13:32:42 -05:00 |
|
Ying-Lian.Shi
|
16e67d74b3
|
ASM #16693 fixed typo in the filter
Change-Id: Ib6df55dbaabdbebe8bb670fbffd9c4c901e31857
Former-commit-id: 66ffae1502 [formerly 12ccfcfa11] [formerly 66ffae1502 [formerly 12ccfcfa11] [formerly 004b6fb906 [formerly 29f50282d5e2415f1d9a876c5515be0c04e27015]]]
Former-commit-id: 004b6fb906
Former-commit-id: d3f52b327e [formerly 9d4e4a1143]
Former-commit-id: 31d7a25345
|
2014-10-31 10:57:55 +00:00 |
|
Mark Peters
|
fa20ab259b
|
Omaha #3768 Pluginize the D2D Upper Air menu
Change-Id: I58f76a59a40170fefe93d779760b6581c3f8490a
Former-commit-id: 5199f9b9ee [formerly 1c2e38dbd1] [formerly 5199f9b9ee [formerly 1c2e38dbd1] [formerly c11bd6816b [formerly 4554ba073c7a97a335d8020f7068bc5521c0b47a]]]
Former-commit-id: c11bd6816b
Former-commit-id: ddc78ffe66 [formerly d732bfe002]
Former-commit-id: db1cf9ae2f
|
2014-10-30 19:15:52 -05:00 |
|
Nate Jensen
|
c3adae41ea
|
Merge "Omaha #3601 Adding original, unaltered satellite inventory scripts" into omaha_14.4.1
Former-commit-id: 99309c619b [formerly 316052231f] [formerly 99309c619b [formerly 316052231f] [formerly dc13fce4dc [formerly 2c413c430c662b74e5d06e372f6d9f9ae7f6177a]]]
Former-commit-id: dc13fce4dc
Former-commit-id: 49fb546f20 [formerly 958441ec3e]
Former-commit-id: cff51071eb
|
2014-10-30 15:05:13 -05:00 |
|
Nathan Bowler
|
04a2429395
|
Omaha #3601 Adding original, unaltered satellite inventory scripts
Change-Id: I32bccffb990baf6dc023c9fafe011aaa0dd4c893
Former-commit-id: 68f9e2e76a [formerly 3bed545253] [formerly 68f9e2e76a [formerly 3bed545253] [formerly de68023968 [formerly 9e244756aa82082784c7f228378bf5f024b32422]]]
Former-commit-id: de68023968
Former-commit-id: 6676a275cc [formerly e4d532d4dc]
Former-commit-id: cd3ac95e0e
|
2014-10-30 15:46:09 -04:00 |
|
Nathan Bowler
|
e3c49cb766
|
Omaha #3600 Adding original, unaltered radar inventory scripts.
Change-Id: I2bd8de7b36aeba4cb5e58d6b153a249d72ac91bb
Former-commit-id: 5d3312b1d4 [formerly c84b7c3f0f] [formerly 5d3312b1d4 [formerly c84b7c3f0f] [formerly 68c4943c27 [formerly 965405355e5f053266bd50977c59dff760ee4f0b]]]
Former-commit-id: 68c4943c27
Former-commit-id: 5480e6e8fd [formerly b59d2d69cd]
Former-commit-id: af24524eeb
|
2014-10-30 15:35:14 -04:00 |
|
Nate Jensen
|
410f0fcccb
|
Merge "Omaha #3599 Adding unaltered, original grid inventory scripts" into omaha_14.4.1
Former-commit-id: 71d7fd520e [formerly 94b267202e] [formerly 71d7fd520e [formerly 94b267202e] [formerly 592a8d0e83 [formerly 9dd052b0cbe66ef388f0c435f32d7bc9a36b8545]]]
Former-commit-id: 592a8d0e83
Former-commit-id: f7c77d3efc [formerly 23ed772042]
Former-commit-id: 7317def63b
|
2014-10-30 14:34:27 -05:00 |
|
Brian.Dyke
|
871cb67e3b
|
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 6f57efd2cb [formerly affc9ed976] [formerly 186f587dd6 [formerly ef112c1ff84f846dbe7093bcbb4a94fecf2274d5]]]
Former-commit-id: 186f587dd6
Former-commit-id: 3451202fb4 [formerly 2b7ad1daec]
Former-commit-id: b7b16413cd
|
2014-10-30 15:05:39 -04:00 |
|
Brian.Dyke
|
79070ce122
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: ce4a1c042f [formerly 5e04756c0c] [formerly ce4a1c042f [formerly 5e04756c0c] [formerly 0f8e11aad4 [formerly 78923886791099b8e4564dd780d8ed64db16a5c1]]]
Former-commit-id: 0f8e11aad4
Former-commit-id: 6907e0d17b [formerly 6c13091ec2]
Former-commit-id: 189db02dfe
|
2014-10-30 15:03:19 -04:00 |
|
Nathan Bowler
|
a1e8b77172
|
Omaha #3599 Adding unaltered, original grid inventory scripts
Change-Id: If8702172dababa0acf73c1eead79769bde2f2469
Former-commit-id: 18e9499338 [formerly f3be28a332] [formerly 18e9499338 [formerly f3be28a332] [formerly b809f64cd4 [formerly 0dbabf14124334a97f88040c0ffa77e10299cb5f]]]
Former-commit-id: b809f64cd4
Former-commit-id: 67163ed1d4 [formerly 3ff8755679]
Former-commit-id: 07d85090c7
|
2014-10-30 14:59:06 -04:00 |
|
Shawn.Hooper
|
87c2032935
|
ASM #16800 - Add HRRR under D2D in Weather Element Browser
Change-Id: I829cd7357ccd37e389e88567a4159d0efde9aa41
Former-commit-id: 733d5ff94d [formerly a44d775a27] [formerly 733d5ff94d [formerly a44d775a27] [formerly ec3b831987 [formerly 99807ddc4810c08635d5462357dc29e661686e33]]]
Former-commit-id: ec3b831987
Former-commit-id: 3af096ae41 [formerly 2f2bb733a4]
Former-commit-id: 027364c2f9
|
2014-10-30 14:47:26 -04:00 |
|
Nate Jensen
|
204963c8e2
|
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 d5d38b8768 [formerly fc9c89c426] [formerly fbaecfe578 [formerly e9780b64d0ce8c91f7c236067f5ab251bd874546]]]
Former-commit-id: fbaecfe578
Former-commit-id: d273c1e6f6 [formerly 0e82fa47c8]
Former-commit-id: 972f967d4c
|
2014-10-30 13:41:14 -05:00 |
|
Ying-Lian.Shi
|
bef4398770
|
ASM #16693 handles more swear words
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7
Former-commit-id: e592171fe2 [formerly ea9e231074] [formerly e592171fe2 [formerly ea9e231074] [formerly 3d9fa4e763 [formerly 6133c233bd3e02b0a8e1540dd6c496997184f11d]]]
Former-commit-id: 3d9fa4e763
Former-commit-id: 49aafc099b [formerly c8cfe6a2a7]
Former-commit-id: a9d2b2aa5a
|
2014-10-30 18:22:34 +00:00 |
|
Nathan Bowler
|
5fc502cf10
|
Omaha #3755 Update Grid and Radar information retrieval for msas/laps inventories.
Change-Id: I472c2948ada9357350138fe27f2588cce27e17ba
Former-commit-id: 74c41dc01f [formerly f714213db3] [formerly 74c41dc01f [formerly f714213db3] [formerly 9673a96e71 [formerly 2ec9a420268e41d8fdc35efe7feabfb12b7bee4c]]]
Former-commit-id: 9673a96e71
Former-commit-id: 0efd421fe8 [formerly f76cd38a15]
Former-commit-id: 8c21dfa9a0
|
2014-10-30 13:18:14 -04:00 |
|
Steve Harris
|
bd01dcdeb4
|
Merge tag 'OB_14.3.1-30m' into omaha_14.4.1
Former-commit-id: b78ff0ee6e [formerly 54c14a5f5b] [formerly b78ff0ee6e [formerly 54c14a5f5b] [formerly 5efdd0d572 [formerly 9f4fc2a9cbff7f8555c7bf8326bb785f791e8b00]]]
Former-commit-id: 5efdd0d572
Former-commit-id: b9cc8a581d [formerly be38ca97d4]
Former-commit-id: c2b40626c9
|
2014-10-30 09:40:20 -05:00 |
|
Nate Jensen
|
4a738530a8
|
Merge "Omaha #3668 Give grid a custom job pool." into omaha_14.4.1
Former-commit-id: 199ccf1aba [formerly 5e22943a26] [formerly 199ccf1aba [formerly 5e22943a26] [formerly e83c1f20bb [formerly b98016900319d31c23be96640aa97f7b2efcee5b]]]
Former-commit-id: e83c1f20bb
Former-commit-id: ee04135d20 [formerly c004468689]
Former-commit-id: 60beaa58b4
|
2014-10-30 09:32:12 -05:00 |
|
Shawn.Hooper
|
bd561efdaa
|
ASM #16805 - Increment release number in the awips2-tools rpm spec file
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4
Former-commit-id: c715bdd83a [formerly 285e4baaec] [formerly c715bdd83a [formerly 285e4baaec] [formerly 9332029a6d [formerly 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f]]]
Former-commit-id: 9332029a6d
Former-commit-id: 01ba6f2df0 [formerly 0b0b922968]
Former-commit-id: 017fd9461d
|
2014-10-30 09:58:02 -04:00 |
|