Commit graph

7412 commits

Author SHA1 Message Date
Steve Harris
5efdd0d572 Merge tag 'OB_14.3.1-30m' into omaha_14.4.1
Former-commit-id: 9f4fc2a9cbff7f8555c7bf8326bb785f791e8b00
2014-10-30 09:40:20 -05:00
Nate Jensen
e83c1f20bb Merge "Omaha #3668 Give grid a custom job pool." into omaha_14.4.1
Former-commit-id: b98016900319d31c23be96640aa97f7b2efcee5b
2014-10-30 09:32:12 -05:00
Shawn.Hooper
9332029a6d 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
bdd4f6b3cc 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
8d1829bee7 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
Ben Steffensmeier
b41b28ed57 Omaha #3668 Give grid a custom job pool.
Former-commit-id: 14e82b9f400b47b4f446bf1c5c5e729cf442b153
2014-10-29 18:07:28 -05:00
Benjamin Phillippe
1fcb79c423 Omaha #3454 Fixed text archiver
Former-commit-id: 61514bec505566ba434e3b9772e0aaf329b51cff
2014-10-29 16:09:35 -05:00
Ron Anderson
53144f55f0 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
0f40604bcb Merge tag 'OB_14.3.1-29m' into omaha_14.4.1
Former-commit-id: e5cd617f80e90dcfba52058b2a439fade1cfe15e
2014-10-29 10:03:20 -05:00
Steve Harris
f23b0fc310 Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 38fbd41a54b5dd9afe0482f83ed3b4d7d5a2aa2e
2014-10-29 09:55:14 -05:00
Steve Harris
15d91d4b2d 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
Nate Jensen
e42bf53f7a Merge "Omaha #2707 fixed LSR update script" into omaha_14.4.1
Former-commit-id: 828a103cf403430684f84f18dbfe0c044655e307
2014-10-28 18:03:13 -05:00
Brian Clements
0f5d97c961 Omaha #2707 fixed LSR update script
Change-Id: I879d7d425f19113cae2c0bbc6f43df1edcf5594a

Former-commit-id: ee38c97013e2a0c83e555cbbe77a9978296e39f1
2014-10-28 17:57:38 -05:00
Benjamin Phillippe
a13c0a8b39 Omaha #3454 Adding sequences to tables in events schema
Change-Id: I79d03c5f97eeecdb665fee624cdae377555fa373

Former-commit-id: fa5ec2a1866784e8b0fc0f9a6c0d3a363cbcc22d
2014-10-28 15:56:47 -05:00
Richard Peter
14a86f1063 Merge "Omaha #3454 Adding sequences to tables in events schema" into omaha_14.4.1
Former-commit-id: 3fb87f623c38b78c1d1046990fb05576851174d2
2014-10-28 15:50:26 -05:00
Nate Jensen
9fe7950e24 Merge "Omaha #3720 Remove dataURI column references from redbook" into omaha_14.4.1
Former-commit-id: add132c7f2baf5b421590827559b99954133be76
2014-10-28 15:32:55 -05:00
Nate Jensen
e54ebf94e5 Merge "Omaha #3454 Fixing usage of getSession() to ensure proper session closure" into omaha_14.4.1
Former-commit-id: 7306aeaa7986aa69d2c18c00d940fb2eb0624612
2014-10-28 15:32:41 -05:00
Nate Jensen
c89de11b63 Merge "Omaha #3681 SatBlended implements Interrogatable" into omaha_14.4.1
Former-commit-id: 17861a7e752838399a918c3b09dcaba8095a6a18
2014-10-28 15:32:32 -05:00
Ron Anderson
30d031989e Merge "Omaha #3685 Fix spell checker to use mixed case. Fix bug in importShapefile" into omaha_14.4.1
Former-commit-id: e076201872a69829228a6e78d632287839acf3d8
2014-10-28 15:15:26 -05:00
Ron Anderson
9bd76e678f Merge "Omaha #3685 Add support for sending specific products in mixed case" into omaha_14.4.1
Former-commit-id: 453e478604f048ae019eeee9bb8e46883b58254e
2014-10-28 15:15:16 -05:00
Brian.Dyke
94ddd59bfc 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
765359aee6 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
80c209fef7 Issue #3767 Change default image export name to screenCapture.png.
Former-commit-id: 021367d3212e185a2d8d4e5970fc268204bf070b
2014-10-28 14:18:02 -05:00
Steve Harris
19527f50bb Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	rpms/awips2.core/Installer.gfe.climo/component.spec

Former-commit-id: 353674cd0deec2dd86c38dc75c7593d1477a7e78
2014-10-28 13:32:31 -05:00
Baoyu Yin
4252ccfcb1 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
Mark Peters
c034d98ab9 Omaha #3720 Remove dataURI column references from redbook
Change-Id: I81ba779e6e9ded93256c7ccd7b2932ceefbfd51d

Former-commit-id: 48160d952981b597634c941741e2bc370a5fdb5f
2014-10-28 12:21:45 -05:00
Benjamin Phillippe
50f5c8d1e3 Omaha #3454 Fixing usage of getSession() to ensure proper session closure
Former-commit-id: fc36b84fa43c354b674f040ae5d2647df5b3122f
2014-10-28 11:30:25 -05:00
Benjamin Phillippe
4af35d83f8 Omaha #3454 Adding sequences to tables in events schema
Former-commit-id: 9799cba1a2c525190d297f7e355cda29f1e98ee7
2014-10-28 10:30:47 -05:00
Ron Anderson
8362946f0e Issue #3766 Fixed return type of GridParmManager.createNewDb
Change-Id: Ib76bf614b09895ef08065da86d3af8d59f490f4c

Former-commit-id: 2e2f83952a6ef00b17d9f4504133c85e93e0126e
2014-10-27 18:40:15 -05:00
Ben Steffensmeier
5e63b30ab0 Omaha #3681 SatBlended implements Interrogatable
Former-commit-id: 10b1129bb8c938d99b9c74816927f3879a1ef6a2
2014-10-27 18:16:49 -05:00
Brian.Dyke
1ac5b6af5d Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: cca25d0e29324cc883f177597e0975279b07c8ca
2014-10-27 15:51:57 -04:00
Nate Jensen
ced3e75600 Merge "Omaha #3612 Fixed Thin client plugin blacklist" into omaha_14.4.1
Former-commit-id: 370411bb2ca890457e0630804c3a6b0b46080c3a
2014-10-27 13:34:22 -05:00
Max Schenkelberg
1fa0ff4c67 Omaha #3612 Fixed Thin client plugin blacklist
Change-Id: I989656df46a6ebd9dd64c41f44f9335591848d42

Former-commit-id: b3f42acd1a8fc814b7fa1e094f1f39f8a374567d
2014-10-27 13:07:50 -05:00
Baoyu Yin
bb89f99643 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
2aa72b21eb 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
fe574dd41d 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
9a5d1450b2 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
7bbaafabaa 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
e83e14dcb1 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
Dave Hladky
80c0ecf79c Merge branch 'omaha_pda' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_pda
Former-commit-id: b56df6a2b2adc606891b968c987138c8c09b624d
2014-10-24 11:00:06 -05:00
Benjamin Phillippe
52e3ba5914 Omaha #3454 Configuring Hibernate query plan cache settings
Former-commit-id: 0d18e110bf2266400b538d38c4f42078d78a5b41
2014-10-24 10:44:38 -05:00
Matthew Howard
4b542e6e5b 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
b9269162a6 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
f5b9798c3d 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
David Lovely
081ea4a12a Omaha #2991 Initial add of qpid 0.28. Fixed an issue with the x86_64 directory not being created.
Change-Id: Iacd5c7d8b41ab3100b7ea9c409ec18691ffe7fdc

Former-commit-id: b50c56c84968f4765245ec12fa33c3037b0380ff
2014-10-23 15:55:26 -05:00
Benjamin Phillippe
5606597b56 Omaha #3454 Fixing text purge
Former-commit-id: 43299673f2172188bc44866c6ccd5552fda348cb
2014-10-23 12:54:26 -05:00
Greg Armendariz
abfcd2505f Merge "Omaha #3299 attempt to fix cave p2-install order" into omaha_14.4.1
Former-commit-id: 2604e7f68719bf1e5b4ba1d2e212f26341926938
2014-10-23 11:45:00 -05:00
Stephen Gilbert
302779155f 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
Nate Jensen
ca94deb789 Omaha #3299 attempt to fix cave p2-install order
Change-Id: Ic02c4a1c28d6be67cff709e0ea50fed3e36ca6b3

Former-commit-id: d8ef7657cada2a7ec2bf1c3b2c70011a3d160913
2014-10-23 11:35:44 -05:00
Stephen Gilbert
5e1e9f6f58 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