Brian.Dyke
7e87bf7ac4
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: b683c7776ef1fad2702fca82aed1abb4873e433b
2014-11-07 12:55:38 -05:00
Richard Peter
4d143654fe
Merge "Omaha #3788 Switch satellite_spatial.gid to a sequence." into omaha_14.4.1
...
Former-commit-id: 4b78380f15df6a8d9a35eb7a2b976b982e949243
2014-11-07 11:18:54 -06:00
Ben Steffensmeier
7988d740b0
Omaha #3788 Switch satellite_spatial.gid to a sequence.
...
Former-commit-id: 919f4ca671ca953b881037e4a69d720d3bf79eb5
2014-11-07 10:23:39 -06:00
Richard Peter
8328d538cd
Merge "Omaha #3643 Archive menu entries consolidated under Archive." into omaha_14.4.1
...
Former-commit-id: e10b35d2537f6aec5cd007e071f570734098c802
2014-11-07 10:01:32 -06:00
Richard Peter
f1499db1c3
Merge "Omaha #3353 Fix deadlock that freezes cave." into omaha_14.4.1
...
Former-commit-id: 24f3f08d27ac6d3e2cba7b5f6f5a3fd8e6452700
2014-11-07 09:50:34 -06:00
Richard Peter
f7ef760f5a
Merge "Omaha #3549 log time to receive data in pypies separate from deserialize time" into omaha_14.4.1
...
Former-commit-id: c24d5d08e6663e690b0966f71826869127c1a9cf
2014-11-07 09:21:02 -06:00
Nate Jensen
9c79b4851f
Omaha #3356 fix thin client startup when localization caching is
...
disabled
Change-Id: I38a9299d9cc50c3e6f1b5d781c0754c2af70d478
Former-commit-id: b4817236399d6084da219892d97b6db38d44d64a
2014-11-06 16:48:11 -06:00
Nate Jensen
9380b5ee1f
Omaha #3549 log time to receive data in pypies separate from deserialize
...
time
Change-Id: I10e1fd81305b7653849ec3801fa1136368c19943
Former-commit-id: 61ee939fb5611c0043cd3440716a03763785a7ab
2014-11-06 15:57:42 -06:00
Slav Korolev
9f0b1a68e6
Omaha #3667 - Corrected functionality of dialog.
...
Former-commit-id: cf354d6ac5668ba502feb188bdf17a0967168b19
2014-11-06 15:24:12 -05:00
Brian.Dyke
1e7d47d2aa
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
Dave Hladky
7f051d34e6
Omaha #3798 Merge Fixes
...
Former-commit-id: 011a9d5b937e1a8a337ffaf04ba47cd7080ffaf5
2014-11-06 12:09:42 -06:00
Brian.Dyke
acf00264f4
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
Nate Jensen
a943e8e9e0
Merge "Omaha #2714 created satellite.gini edex plugin" into omaha_14.4.1
...
Former-commit-id: da81f4d7ceeb5251b69e72cfddde9e59de5a2da1
2014-11-06 11:26:10 -06:00
Brian Clements
1954463cfc
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: df744611151caf6492f5dc084974140c1a6fae0a
2014-11-06 11:06:19 -06:00
Dave Hladky
ef29e2883c
Omaha #3132 merge in PDA into 14.4.1
...
Former-commit-id: 38944c601a800e96fbdd34d51034bb7e42ae4a27
2014-11-06 09:48:54 -06:00
Dave Hladky
1923af2aab
Merge branch 'omaha_pda' into omaha_14.4.1
...
Former-commit-id: 465a3cff39ad6f0159de561aaf6e8e89e99762ed
2014-11-06 09:34:39 -06:00
Dave Hladky
66922edb00
Merge branch 'omaha_pda' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_pda
...
Former-commit-id: cc451692b975f3e40c08960585970b1965aa5b84
2014-11-06 09:18:39 -06:00
Steve Harris
4d0eef66f3
Merge branch 'omaha_14.4.1' into omaha_pda
...
Former-commit-id: 3fdd69aade32e40d4684da739b19a414e0ba37df
2014-11-05 07:58:05 -06:00
Ron Anderson
1f0fee6536
Omaha #3557 Fixed NPE when parm is removed from display
...
Change-Id: I14a82967256a788c25d049a4fd119289c909ad91
Former-commit-id: 4ba96e15f55e276cf78b06f71d3e5d6c98bcab8b
2014-11-04 17:41:19 -06:00
Roger Ferrel
acbde703a2
Omaha #3353 Fix deadlock that freezes cave.
...
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b
Former-commit-id: 871fa68ddf242f1e63286939b1324fc3197c7336
2014-11-04 14:13:29 -06:00
Steve Harris
e770670ebf
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: 361f7bcf425edaf687cbfc63d4c165790b45a5bf
2014-11-04 13:17:44 -06:00
Steve Harris
2ed98bb227
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
Matthew Howard
afc51d425d
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: 0c3de224e672ea5259eaa395672efdf8982a1d45
2014-11-04 13:11:10 -05:00
Ron Anderson
dd230d9f01
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
Roger Ferrel
78614a83b2
Omaha #3643 Archive menu entries consolidated under Archive.
...
Former-commit-id: 4eca2144b9d1109250dc9ceefe82701c66754980
2014-11-04 10:04:30 -06:00
Nate Jensen
c1f2f79c24
Merge "Omaha #3601 Update satellite inventory scripts to DAF" into omaha_14.4.1
...
Former-commit-id: 524272eee2b2b27d46452509e944522649456d84
2014-11-04 08:48:58 -06:00
Nate Jensen
93d8a31f41
Merge "Omaha #3600 Update radar inventory scripts to DAF" into omaha_14.4.1
...
Former-commit-id: 742a15be8431165cd348c87674275d45da9b6949
2014-11-04 08:48:42 -06:00
Nate Jensen
e5ed793542
Merge "Omaha #3599 Update grid inventory scirpts to DAF." into omaha_14.4.1
...
Former-commit-id: 2da2aa5af20a75edde85e566f680322106dd04ae
2014-11-04 08:48:32 -06:00
Ying-Lian.Shi
da58db313c
ASM #16693 changed swear words to all upper case
...
Change-Id: I8e97aec281a3e2c307355a2138bde605de41f446
Former-commit-id: ae186e99c22beeda347561fe24dc38a61a699c25
2014-11-04 14:13:29 +00:00
Brian.Dyke
327491a3a8
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
Nathan Bowler
9942aebf17
Omaha #3601 Update satellite inventory scripts to DAF
...
Change-Id: If12bae7fff302e3da02552fd8d6393db9cd75a9f
Former-commit-id: 33b0fd4d0bc62e9dff1256edfe3f55a080b9efb9
2014-11-03 14:03:51 -05:00
Nathan Bowler
d93009bd8d
Omaha #3600 Update radar inventory scripts to DAF
...
Change-Id: I9b410e61db6dc9edd60cd1c0ec225bf3aa0daf51
Former-commit-id: 1f780ff45f48936320853c793a4a5e85aa4ed588
2014-11-03 13:14:28 -05:00
Nathan Bowler
79fea328f3
Omaha #3599 Update grid inventory scirpts to DAF.
...
Change-Id: I0ede4fae07d4b393348bf636612df0f81eb80bef
Former-commit-id: 881f242499a9130dd21fba9e5f65788627a95180
2014-11-03 12:40:05 -05:00
Nate Jensen
0c4be8f4cb
Merge "Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin" into omaha_14.4.1
...
Former-commit-id: afe1e532e582e442c556679adcba4e8388b98bbb
2014-11-03 09:59:06 -06:00
Shawn.Hooper
f8ee619f16
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
39ed75df43
Merge "ASM #16693 handles more swear words" into asm_14.3.1
...
Former-commit-id: a6ed07b8c01df8576cc54f88dc52d2110d211707
2014-11-03 09:56:09 -05:00
Mark Peters
bc9c564192
Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin
...
Change-Id: I5e407aeff99d7dc9a393d713096971a7ed4c01a6
Former-commit-id: d946679c5a9b383f689ac3acc66d4aae4ecc4bde
2014-10-31 13:32:42 -05:00
Ying-Lian.Shi
004b6fb906
ASM #16693 fixed typo in the filter
...
Change-Id: Ib6df55dbaabdbebe8bb670fbffd9c4c901e31857
Former-commit-id: 29f50282d5e2415f1d9a876c5515be0c04e27015
2014-10-31 10:57:55 +00:00
Mark Peters
c11bd6816b
Omaha #3768 Pluginize the D2D Upper Air menu
...
Change-Id: I58f76a59a40170fefe93d779760b6581c3f8490a
Former-commit-id: 4554ba073c7a97a335d8020f7068bc5521c0b47a
2014-10-30 19:15:52 -05:00
Nate Jensen
dc13fce4dc
Merge "Omaha #3601 Adding original, unaltered satellite inventory scripts" into omaha_14.4.1
...
Former-commit-id: 2c413c430c662b74e5d06e372f6d9f9ae7f6177a
2014-10-30 15:05:13 -05:00
Nathan Bowler
de68023968
Omaha #3601 Adding original, unaltered satellite inventory scripts
...
Change-Id: I32bccffb990baf6dc023c9fafe011aaa0dd4c893
Former-commit-id: 9e244756aa82082784c7f228378bf5f024b32422
2014-10-30 15:46:09 -04:00
Nathan Bowler
68c4943c27
Omaha #3600 Adding original, unaltered radar inventory scripts.
...
Change-Id: I2bd8de7b36aeba4cb5e58d6b153a249d72ac91bb
Former-commit-id: 965405355e5f053266bd50977c59dff760ee4f0b
2014-10-30 15:35:14 -04:00
Nate Jensen
592a8d0e83
Merge "Omaha #3599 Adding unaltered, original grid inventory scripts" into omaha_14.4.1
...
Former-commit-id: 9dd052b0cbe66ef388f0c435f32d7bc9a36b8545
2014-10-30 14:34:27 -05:00
Brian.Dyke
186f587dd6
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
0f8e11aad4
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 78923886791099b8e4564dd780d8ed64db16a5c1
2014-10-30 15:03:19 -04:00
Nathan Bowler
b809f64cd4
Omaha #3599 Adding unaltered, original grid inventory scripts
...
Change-Id: If8702172dababa0acf73c1eead79769bde2f2469
Former-commit-id: 0dbabf14124334a97f88040c0ffa77e10299cb5f
2014-10-30 14:59:06 -04:00
Shawn.Hooper
ec3b831987
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
Nate Jensen
fbaecfe578
Merge "Omaha #3755 Update Grid and Radar information retrieval for msas/laps inventories." into omaha_14.4.1
...
Former-commit-id: e9780b64d0ce8c91f7c236067f5ab251bd874546
2014-10-30 13:41:14 -05:00
Ying-Lian.Shi
3d9fa4e763
ASM #16693 handles more swear words
...
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7
Former-commit-id: 6133c233bd3e02b0a8e1540dd6c496997184f11d
2014-10-30 18:22:34 +00:00
Nathan Bowler
9673a96e71
Omaha #3755 Update Grid and Radar information retrieval for msas/laps inventories.
...
Change-Id: I472c2948ada9357350138fe27f2588cce27e17ba
Former-commit-id: 2ec9a420268e41d8fdc35efe7feabfb12b7bee4c
2014-10-30 13:18:14 -04:00
