Commit graph

670 commits

Author SHA1 Message Date
David Friedman
ec882fc46e ASM #14990 - Add pqact patterns for earthquake and tsunami products
Change-Id: Ied72bd5896a9e1939f4ddd9d68cb362067406d65

Former-commit-id: 12987b265a [formerly cc2c3da325] [formerly 12987b265a [formerly cc2c3da325] [formerly 1afdea35fb [formerly 899c6472abfdcfa27018d20cc204735dea4d2f43]]]
Former-commit-id: 1afdea35fb
Former-commit-id: f4a648489c [formerly 5044b99d1a]
Former-commit-id: 6de60a5ea3
2015-02-24 15:33:48 +00:00
Fay.Liang
d84ada842d Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 058bd4ae9c [formerly a534707534] [formerly 058bd4ae9c [formerly a534707534] [formerly 31dcfdc402 [formerly ef870235658ea88d676ca65611bcfbdd56d206b1]]]
Former-commit-id: 31dcfdc402
Former-commit-id: 06750bbcde [formerly b55148442d]
Former-commit-id: e24545fbcc
2015-02-17 14:07:11 -05:00
Sean.Webb
8ea8be130a ASM #17142 - Fixed nwps dir permissions
Change-id: Ibd843098cea02d3f1ea6b75d3e715d804c5c1e37

Former-commit-id: 62e125667f [formerly 9d46bf24dc] [formerly 62e125667f [formerly 9d46bf24dc] [formerly edae59425b [formerly fc7258495581cd1d241f55aba2a8e60053575571]]]
Former-commit-id: edae59425b
Former-commit-id: 9e1b6846d3 [formerly c530e44a15]
Former-commit-id: c8445f320e
2015-02-17 12:29:55 -05:00
Fay.Liang
2546eeb607 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java

Former-commit-id: c95baa3c40 [formerly 8cdd180b0a] [formerly c95baa3c40 [formerly 8cdd180b0a] [formerly af8b95bb97 [formerly fd4e0b9ada38ab93586088948809279e39a0374c]]]
Former-commit-id: af8b95bb97
Former-commit-id: f18381db69 [formerly 8d5a9c2045]
Former-commit-id: 984091af0c
2015-02-13 09:34:24 -05:00
Fay.Liang
cf869f38ce Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 84dff9abc0 [formerly 32c91172b4] [formerly 84dff9abc0 [formerly 32c91172b4] [formerly eefa05ada3 [formerly 480b6597331ebd2ce7d7835de6e21050abf18722]]]
Former-commit-id: eefa05ada3
Former-commit-id: f4106951e2 [formerly 2b261f9ef2]
Former-commit-id: 444b080629
2015-02-13 09:32:40 -05:00
Shawn.Hooper
19cdb600ed ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28

Former-commit-id: 0d9e4dd69e [formerly 060a169904] [formerly 0d9e4dd69e [formerly 060a169904] [formerly 9c637bda0b [formerly 2c62f45654b0531349fef5e7523c67c94236ce1a]]]
Former-commit-id: 9c637bda0b
Former-commit-id: 89d1309974 [formerly 5ff97ae188]
Former-commit-id: b29bfba24b
2015-02-12 17:32:05 -05:00
Ana Rivera
cb4300775b Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java

Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209

Former-commit-id: 461db8a395 [formerly 420132b396] [formerly 461db8a395 [formerly 420132b396] [formerly 6191c93a9c [formerly f6b3765fc1670db2b9ceef75be7422a07b2badcf]]]
Former-commit-id: 6191c93a9c
Former-commit-id: 726045354b [formerly d8b54a59cf]
Former-commit-id: 85de48c8bf
2015-02-11 22:00:40 +00:00
Steve Harris
f2f6d56366 Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10


Former-commit-id: e76330fac0 [formerly 3fe3d35339] [formerly e76330fac0 [formerly 3fe3d35339] [formerly 9311e6f440 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]]
Former-commit-id: 9311e6f440
Former-commit-id: 300e3e50fe [formerly 6a2d5ec16d]
Former-commit-id: 07475d998f
2015-02-11 15:53:38 -06:00
Steve Harris
2139ef4dbf Omaha #4111 - Updated foss licenses and Master_Rights_File.pdf
Former-commit-id: 3f8008fc9f [formerly 62d29fefb4] [formerly 3f8008fc9f [formerly 62d29fefb4] [formerly a5da551a5d [formerly 45e09e8f848d85ae45205b655074bba8342c9156]]]
Former-commit-id: a5da551a5d
Former-commit-id: 5f4b78fd53 [formerly dc372b03d8]
Former-commit-id: 002c2ab43f
2015-02-11 10:58:07 -06:00
Ana Rivera
7585c6e288 Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f

Former-commit-id: 631d700cf9 [formerly bdb0e3aacb] [formerly 631d700cf9 [formerly bdb0e3aacb] [formerly c2f02ff4b2 [formerly c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265]]]
Former-commit-id: c2f02ff4b2
Former-commit-id: e6ea29b193 [formerly 0bab05a20b]
Former-commit-id: 3eb45fd8e1
2015-02-10 14:41:19 +00:00
Fay.Liang
31607db1e1 Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
	edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
	rpms/awips2.core/Installer.java/1.7/component.spec

Former-commit-id: e3107ce1e4 [formerly 59f3f87190] [formerly e3107ce1e4 [formerly 59f3f87190] [formerly 43c7161dcf [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]]
Former-commit-id: 43c7161dcf
Former-commit-id: 149102ec85 [formerly 0b98fc8be6]
Former-commit-id: 2d5858f8f0
2015-02-09 17:19:41 -05:00
Greg Armendariz
2f8b5d32eb Omaha #3299 - Fix collaboration RPM build issue
Former-commit-id: 6fed5e21e7 [formerly b88c8da164] [formerly 6fed5e21e7 [formerly b88c8da164] [formerly af72fd3775 [formerly 9132eff524289c5df48c682cd3ff226fe14cdf1b]]]
Former-commit-id: af72fd3775
Former-commit-id: d27e4b416e [formerly 483ed63a57]
Former-commit-id: 3463c00928
2015-02-06 11:37:47 -06:00
Joshua Watson
9b66935012 VLab Issue #5238 - serverConfig.py - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS, changed serverConfig.Vis to Vis on that same line. pqact.conf.template - fixed typo on line 223 FLE to FILE, line 286 missing a period in pattern; fixes #5238
Change-Id: Ia83e3576613683fa58a7631150d2d3132937a7b4

Former-commit-id: 5d0dea9253 [formerly aec617b1eb] [formerly 5d0dea9253 [formerly aec617b1eb] [formerly 65a568b79d [formerly 12e0aeea9fa6b2dc7de297aee0ff7d1de3a99111]]]
Former-commit-id: 65a568b79d
Former-commit-id: 12a2f9eff1 [formerly ac46876161]
Former-commit-id: da106869b6
2015-02-05 09:26:20 -05:00
Shawn.Hooper
910f220a38 ASM #15311 - Update pgadmin spec file to allow for postgresql version greater than or equal to 8.4.13-1 and customTargets.xml for EDEX to allow for flexible feature files.
Change-Id: I9cf47aff9c6fa874ffe3d2e8bbbba2871abacec2

Former-commit-id: f4cd41e2f6 [formerly a98b54a944] [formerly f4cd41e2f6 [formerly a98b54a944] [formerly 915ddd6964 [formerly f1383bbdbadc54f8f2a0384d319c70160464a3ac]]]
Former-commit-id: 915ddd6964
Former-commit-id: b8b4e192fb [formerly ebe39a11ae]
Former-commit-id: e1e9c02dcd
2015-02-04 16:47:26 -05:00
Greg Armendariz
b0121df3bc Omaha #3839 - Add script to /awips2/edex/bin/
Former-commit-id: efbdfa504b [formerly 25cb96ec19] [formerly efbdfa504b [formerly 25cb96ec19] [formerly bb8a61a996 [formerly c215890342be6fed80d614e0a5853e8ce816a7f2]]]
Former-commit-id: bb8a61a996
Former-commit-id: c3b4d790a3 [formerly d405e4bfe1]
Former-commit-id: 956a8fd092
2015-02-04 09:59:06 -06:00
Greg Armendariz
e09375ffce Merge "Omaha #4065 - Update EDEX RPM install to modify date stamp" into omaha_14.4.1
Former-commit-id: bdcb5067d4 [formerly e87f8c0c5f] [formerly bdcb5067d4 [formerly e87f8c0c5f] [formerly e004e0881f [formerly ddf9b7d0a97ffda6e79688d7c35c828fb7fc1d91]]]
Former-commit-id: e004e0881f
Former-commit-id: 24d9da8c2c [formerly 48afd5b062]
Former-commit-id: 86a6f08f80
2015-02-03 11:35:26 -06:00
Greg Armendariz
e3f22bed4c Omaha #4065 - Update EDEX RPM install to modify date stamp
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0

Former-commit-id: 19d79f71d3 [formerly 8c38289cf7] [formerly 19d79f71d3 [formerly 8c38289cf7] [formerly fbadd1deb1 [formerly 83243af002e8ddfd15f899ff1ab3e511cf5a0af4]]]
Former-commit-id: fbadd1deb1
Former-commit-id: 6a7891d660 [formerly a3d4342498]
Former-commit-id: fdf1408c06
2015-02-03 10:12:54 -06:00
Ana Rivera
cf29758096 Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40

Former-commit-id: 4071b58b85 [formerly 8bfa7c4087] [formerly 4071b58b85 [formerly 8bfa7c4087] [formerly 20ad0a65f3 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]]
Former-commit-id: 20ad0a65f3
Former-commit-id: de74e8a90d [formerly 3696a3a1d1]
Former-commit-id: 0af5d55eb6
2015-01-27 22:05:59 +00:00
Ana Rivera
d4e36fe496 Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18

Former-commit-id: 62094315d2 [formerly 7c5fc26537] [formerly 62094315d2 [formerly 7c5fc26537] [formerly 327945af8b [formerly 889608360567b829f81ed6392c64c669798f34a9]]]
Former-commit-id: 327945af8b
Former-commit-id: a84f43a8c6 [formerly 5e97e24201]
Former-commit-id: ef4ca10b8a
2015-01-27 16:28:42 +00:00
Steve Harris
fcdd2faaf1 Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec

Former-commit-id: 8cd9e2e92f [formerly 158fa16376] [formerly 8cd9e2e92f [formerly 158fa16376] [formerly 0f05c53a53 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]]
Former-commit-id: 0f05c53a53
Former-commit-id: 5fda208a17 [formerly 033d0fc742]
Former-commit-id: c3d3d5f424
2015-01-23 09:08:06 -06:00
David Lovely
62425dfbb3 Omaha #3957 Removed trailing slash in Spec for QPID.
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5

Former-commit-id: 1f59c0cd21 [formerly 1cfc27241f] [formerly 1f59c0cd21 [formerly 1cfc27241f] [formerly cf4077e8cd [formerly 5fe598aef48f91e57d8f233872ccd0bab395164e]]]
Former-commit-id: cf4077e8cd
Former-commit-id: af5df71b4c [formerly f7565da27d]
Former-commit-id: 3babe6269f
2015-01-15 08:16:18 -06:00
David Lovely
55fbb2ad86 Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac

Former-commit-id: 2771afe7f4 [formerly 63c3631559] [formerly 2771afe7f4 [formerly 63c3631559] [formerly 0b7ee2dc08 [formerly 8107830bf2fa384c3bbe9472801c89a2a43990a3]]]
Former-commit-id: 0b7ee2dc08
Former-commit-id: 0fa33b0e84 [formerly f75e17f79e]
Former-commit-id: 49e435ede3
2015-01-14 14:40:36 -06:00
David Lovely
4467128c35 Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9

Former-commit-id: e4dbe403b3 [formerly 9b9d569062] [formerly e4dbe403b3 [formerly 9b9d569062] [formerly f75230366c [formerly 34faf643b5de3c01713e0129209efb4ccc2c2aa0]]]
Former-commit-id: f75230366c
Former-commit-id: e8150e977c [formerly 5bbea995ae]
Former-commit-id: 9316cbc4a4
2015-01-14 11:28:56 -06:00
Fay.Liang
1e9024ede9 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 6b77894bd0 [formerly c6bd5d7675] [formerly 6b77894bd0 [formerly c6bd5d7675] [formerly eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]
Former-commit-id: eed6737801
Former-commit-id: f3ecae8573 [formerly 5cc8e5b4af]
Former-commit-id: 06ac6b396e
2015-01-12 13:03:31 -05:00
David Lovely
9c401ce4ea Omaha #3957 Moved QPID to build repository directory structure.
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084

Former-commit-id: 208dd5de01 [formerly 240927c241] [formerly 208dd5de01 [formerly 240927c241] [formerly e56002debf [formerly f27b0c6b92b4c744493e44b510defe3d650ca1f6]]]
Former-commit-id: e56002debf
Former-commit-id: 9f09af1c8a [formerly d860af2218]
Former-commit-id: b67b97803c
2015-01-07 12:03:10 -06:00
Fay.Liang
155d0783d2 Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 795b472fff [formerly 06061eee19] [formerly 795b472fff [formerly 06061eee19] [formerly 77863309a9 [formerly 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d]]]
Former-commit-id: 77863309a9
Former-commit-id: b4051b9fe8 [formerly 22fc1baada]
Former-commit-id: 7839f80035
2014-12-22 14:43:32 -05:00
Qinglu.Lin
4caef3c695 ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25

Former-commit-id: 2d4a045e3c [formerly 3b3780fd13] [formerly 2d4a045e3c [formerly 3b3780fd13] [formerly baa96590f1 [formerly 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864]]]
Former-commit-id: baa96590f1
Former-commit-id: f4d78ec480 [formerly cae57983d8]
Former-commit-id: 484799b7f5
2014-12-17 16:53:31 -05:00
Brian Clements
6794196b7c Issue #3935 prevent warning when using init.d script to stop edex
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03

Former-commit-id: 06d82c9f4e [formerly d2774cffc2] [formerly 06d82c9f4e [formerly d2774cffc2] [formerly 6ae64007a2 [formerly b1034aa16b3393e6584038ebb80faf2a4e1a831f]]]
Former-commit-id: 6ae64007a2
Former-commit-id: 14a6f678ca [formerly 53f28e0b75]
Former-commit-id: db5e0013a8
2014-12-17 14:35:16 -06:00
Joshua Watson
8dd62191ae VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667

Former-commit-id: 0c375981e7 [formerly 3f2f7f2f3a] [formerly 0c375981e7 [formerly 3f2f7f2f3a] [formerly 5aa4748569 [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]]
Former-commit-id: 5aa4748569
Former-commit-id: 1040be8594 [formerly 094e8048e9]
Former-commit-id: eb68dac32d
2014-12-17 08:38:27 -05:00
Ana Rivera
40df82b005 Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895

Former-commit-id: 214be0a93b [formerly 043bc3a8b7] [formerly 214be0a93b [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]
Former-commit-id: 1823ed3596
Former-commit-id: ef35771bfa [formerly d2d8127363]
Former-commit-id: f7c0319ee4
2014-12-16 23:39:02 +00:00
Richard Peter
59e9fe78f2 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: 23eafaba3d [formerly 2457d0e6f7] [formerly 23eafaba3d [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 746bbb0885 [formerly f7d8755ba9]
Former-commit-id: bf3ddbb62b
2014-12-12 10:36:04 -06:00
Joshua Watson
8789ca8e8e VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: 0c8b629c96 [formerly a8f5bb480b] [formerly 0c8b629c96 [formerly a8f5bb480b] [formerly bca4b40eed [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]]
Former-commit-id: bca4b40eed
Former-commit-id: ce1476d78f [formerly 9383635749]
Former-commit-id: 33e4b8bc88
2014-12-11 11:39:00 -05:00
Bryan Kowal
7279d157bb Omaha #3914 - increment yajsw release
Former-commit-id: c2e0b33c19 [formerly aad5e554b9] [formerly c2e0b33c19 [formerly aad5e554b9] [formerly 0b65eb314d [formerly 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a]]]
Former-commit-id: 0b65eb314d
Former-commit-id: 544c5e39eb [formerly 9efc72561b]
Former-commit-id: e3bad2212b
2014-12-10 10:34:26 -06:00
Brian Graham
963b52651e ASM #15662 - Updated spec files to include AWIPS version
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f

Former-commit-id: aabc38c52c [formerly 99143e0045] [formerly aabc38c52c [formerly 99143e0045] [formerly e1b4c4abe3 [formerly 11741b03db9424aa10086553729303fa23a7366f]]]
Former-commit-id: e1b4c4abe3
Former-commit-id: 29912607c9 [formerly 24ca442651]
Former-commit-id: 10fd784dd7
2014-12-09 09:25:59 -05:00
Bryan Kowal
3ec292bebb Omaha #3508 - remove references to yajsw in %files
Former-commit-id: 16a33efd8b [formerly 9e55db1c52] [formerly 16a33efd8b [formerly 9e55db1c52] [formerly 9e77b9635e [formerly 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9]]]
Former-commit-id: 9e77b9635e
Former-commit-id: 5644901634 [formerly 7575599185]
Former-commit-id: cc4ee08244
2014-12-05 10:04:42 -06:00
Bryan Kowal
258f7a93ca Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: 289689e774 [formerly 19f6551c88] [formerly 289689e774 [formerly 19f6551c88] [formerly 48ec32e595 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]
Former-commit-id: 48ec32e595
Former-commit-id: aba4679eb6 [formerly 9f5297504d]
Former-commit-id: ec8371db52
2014-12-05 09:20:23 -06:00
Greg Armendariz
f1b203fec9 Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1
Former-commit-id: f6f50778c7 [formerly 8803a6b658] [formerly f6f50778c7 [formerly 8803a6b658] [formerly 610f38e9ef [formerly 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23]]]
Former-commit-id: 610f38e9ef
Former-commit-id: 1e78bd8898 [formerly f307a34150]
Former-commit-id: 2d6ab26fd8
2014-12-05 08:57:37 -06:00
Greg Armendariz
c3008b22d6 Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1
Former-commit-id: 73e48f7b1d [formerly 83ca3b5381] [formerly 73e48f7b1d [formerly 83ca3b5381] [formerly ed42ecc0e8 [formerly f310e13350ba8e64e313d99a7d03d0ef3cdc6aba]]]
Former-commit-id: ed42ecc0e8
Former-commit-id: 1fac1cb693 [formerly 9883443470]
Former-commit-id: c87e692d9c
2014-12-05 08:57:08 -06:00
Bryan Kowal
8ac5284fff Omaha #3508 - purge non-centralized yajsw distributions
amend: ensure edex is dependent on yajsw

Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55

Former-commit-id: cf5353e368 [formerly 71cf313666] [formerly cf5353e368 [formerly 71cf313666] [formerly 0894efaaa3 [formerly 9b36754ca610887a17666ceff2a1540b958913b6]]]
Former-commit-id: 0894efaaa3
Former-commit-id: 3c95967633 [formerly ccb7cead64]
Former-commit-id: d55f5e0c63
2014-12-04 17:33:43 -06:00
Bryan Kowal
40434c2d72 Omaha #3508 - created the yajsw rpm
Former-commit-id: a89e9d96b9 [formerly 8be5362dbd] [formerly a89e9d96b9 [formerly 8be5362dbd] [formerly 127db6aaee [formerly 6bd0c60b4c5ba3ff6b424cac04c42728594b4c21]]]
Former-commit-id: 127db6aaee
Former-commit-id: aa0f4129c4 [formerly c3bb142d88]
Former-commit-id: 27686d8783
2014-12-04 16:26:55 -06:00
Shawn.Hooper
a9ee60a81d ASM #16805 - Update component.spec for awips2-java for removal of license.txt file
Change-Id: I55524734785e63647cba46edb8e15324b794af95

Former-commit-id: 2abdd00f1b [formerly d3f6005946] [formerly 2abdd00f1b [formerly d3f6005946] [formerly e4224cd67b [formerly dc77d48fc9c9e5183b94bc05321ab0061404a4ff]]]
Former-commit-id: e4224cd67b
Former-commit-id: f045c0189d [formerly c24d9b2f90]
Former-commit-id: 5a8cad715b
2014-12-04 16:48:33 -05:00
Fay.Liang
5f6842175d Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: f327b9dd5a [formerly 83a4987188] [formerly f327b9dd5a [formerly 83a4987188] [formerly 19194e0aa3 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]]
Former-commit-id: 19194e0aa3
Former-commit-id: 3404290a55 [formerly 19d1be03e0]
Former-commit-id: d3c8b8a470
2014-12-04 13:46:31 -05:00
Greg Armendariz
532891c6b7 Omaha #3216 - update postgres to use geos 3.4.2
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b

Former-commit-id: 515aa32cc6 [formerly 6dd90bb25a] [formerly 515aa32cc6 [formerly 6dd90bb25a] [formerly 1b1064d541 [formerly 453247c7731adb5e1ca4e58306d14715c0f3a350]]]
Former-commit-id: 1b1064d541
Former-commit-id: fa7fef1605 [formerly aba34ca613]
Former-commit-id: 88cd053b81
2014-12-04 11:34:45 -06:00
Greg Armendariz
c561bcc4e2 Omaha #3216 - Increment pypies release number
Former-commit-id: 0650a941b1 [formerly 7ac9281ba6] [formerly 0650a941b1 [formerly 7ac9281ba6] [formerly 44af2c4ff1 [formerly 0497a64f539e716089736597385ff9ff3d18e5c0]]]
Former-commit-id: 44af2c4ff1
Former-commit-id: f76075c3cc [formerly bed2187d35]
Former-commit-id: 2b3b672618
2014-12-02 14:45:04 -06:00
Bryan Kowal
33b903d97e Omaha #3695 - PostgreSQL will always provide version 3.3.6 of geos. Version 3.3.6
of geos is the only version that our current version of postgis will see. Even
when geos 3.3.7 and 3.3.6 are on the path during compilation, postgis will still
be compiled with a dynamic link to both versions of the library even though
there was not a 3.3.6 available during compilation.


Former-commit-id: b1bf38f922 [formerly eb52d1b333] [formerly b1bf38f922 [formerly eb52d1b333] [formerly 700eefe0ee [formerly 2dafcfc4e0350654c30eb077329711259bf12d1f]]]
Former-commit-id: 700eefe0ee
Former-commit-id: 4a106ddab1 [formerly d40302bf3b]
Former-commit-id: a05d7f7cc1
2014-11-24 16:20:34 -06:00
Fay.Liang
d7f86a9a63 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 069db81e14 [formerly 99263f79e1] [formerly 069db81e14 [formerly 99263f79e1] [formerly 5bd22b74c6 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]]]
Former-commit-id: 5bd22b74c6
Former-commit-id: acdabae0ab [formerly 7aa08b8ba4]
Former-commit-id: 59f64b29b1
2014-11-20 13:32:25 -05:00
Shawn Hooper
6699c18a7a VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: fd57e5334c [formerly b7369c5eef] [formerly fd57e5334c [formerly b7369c5eef] [formerly cf72b5753d [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]]
Former-commit-id: cf72b5753d
Former-commit-id: 2f954d65be [formerly 330eae9f9e]
Former-commit-id: b6d1f3aef4
2014-11-20 13:12:16 -05:00
Fay.Liang
5c3a6d006c Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: a32ec39df2 [formerly 29561d5324] [formerly a32ec39df2 [formerly 29561d5324] [formerly 45b80432d6 [formerly 28c3dbd91c1e89ffffd19afa811a08e228a995dd]]]
Former-commit-id: 45b80432d6
Former-commit-id: a75d5d336d [formerly de4ab82df7]
Former-commit-id: e61707aefc
2014-11-19 22:07:54 -05:00
Shawn Hooper
da77e0bcd3 VLab Issue #5375 - Update spec file for VADATUMS tar file.
Change-Id: Id4cb17192ca46af4dc731ebae260c9a8a3acfd13

Former-commit-id: 3455a07e99 [formerly 50cd8ace64] [formerly 3455a07e99 [formerly 50cd8ace64] [formerly f88d320e60 [formerly 83e81ee0af2d612f08f32e760e9f4d00ee1dd7aa]]]
Former-commit-id: f88d320e60
Former-commit-id: a872090b54 [formerly 58fed17369]
Former-commit-id: f543901a53
2014-11-19 14:08:27 -05:00
Greg Armendariz
a17f0cb3e1 Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b

Former-commit-id: d3295027c2 [formerly ad5e3134e4] [formerly d3295027c2 [formerly ad5e3134e4] [formerly d7af478037 [formerly 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e]]]
Former-commit-id: d7af478037
Former-commit-id: fa3eda0370 [formerly 756d33bf89]
Former-commit-id: 1fbd4f0038
2014-11-18 13:48:19 -06:00