Sean.Webb
3b5a5bc44e
ASM #17467 - Commented out MRMS entry
...
Change-Id: I8c9ffd223be82c3db4d9bad55cb1d5c93ffa6c68
Former-commit-id: e09eb0800c7798bc81dc8e5f617a7460cba1cae8
2015-05-06 10:47:11 -04:00
Shawn.Hooper
bfeceac493
Merge branch 'master_14.4.1' into asm_14.4.1
...
Merge up to 14.4.1-28
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I94021611ed076207a6632895925f20cc0edd4888
Former-commit-id: 12eaf1024c288cfbe746d70336f13268587848ad
2015-04-24 16:27:06 -04:00
Sean.Webb
18ceef2aad
ASM #17414 - EKDMOS pqact pattern changes
...
Change-Id: Ic2ac59f79fd53ef244ab0a40cfb30c40ceb575c3
Former-commit-id: 262fd6e27cb512137a2576e58d9813ca90b1e90b
2015-04-24 14:17:41 -04:00
Fay.Liang
8d05dd54f9
Merge tag 'OB_14.3.3-6' into master_14.4.1
...
14.3.3-6
Former-commit-id: 60bbc49613d1ea355e49061fb984db9de257b0a5
2015-04-21 10:09:11 -04:00
Sean.Webb
59d0c55202
ASM #17398 - Removed tropical patterns from baseline
...
Change-Id: I95bbf55d0306d5478c4decd20bc06677b4af9c57
Former-commit-id: 869e804dcdf4cbd00314eec063a134ca0d53f443
2015-04-20 11:36:04 -04:00
Steve Harris
1d71dee037
Merge tag 'OB_14.4.1-26' into omaha_14.4.1
...
14.4.1-26
Former-commit-id: b6156ab57179bb4af118912960cf402d459ba779
2015-04-20 07:36:26 -05:00
Steve Harris
b0faa6d57f
Omaha #3299 - Added ldm-6.12.9 to open source credits
...
Former-commit-id: 2555771c8694cdcbe208362538444ec514e5d518
2015-04-15 09:15:11 -05:00
Steve Harris
b78afa0e72
Merge tag 'OB_14.4.1-24' into omaha_14.4.1
...
14.4.4-24
Former-commit-id: 11b32bb99084a6162cd0d463800281c7115aef85
2015-04-13 08:56:12 -05:00
Fay.Liang
88d6e796f5
Merge tag 'OB_14.3.3-5' into master_14.4.1
...
Merges 14.3.3-3, 14.3.3-4, and 14.3.3-5
Former-commit-id: 66eb429aee1d602cf216f1509e780afdbd1cbd23
2015-04-10 13:49:22 -04:00
Fay.Liang
6a9a1daef6
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9
2015-04-10 12:13:31 -04:00
Steve Harris
6aa72398d2
Omaha #3299 - Master rights and foss for 14.4.1
...
Former-commit-id: e9c9daec3e77c8f9af54afb06318f0dce9958b50
2015-04-09 10:22:32 -05:00
Fay.Liang
2301da818a
Merge branch 'field_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.3
...
Conflicts:
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: fea365e547f12a13a942594f8267b15a7895a102
2015-04-07 15:38:18 -04:00
Ana Rivera
53807298e8
VLab Issue #7489 - Fix SFPA42 data_store entry in pqact.conf;fixes #7489
...
Change-Id: Id7675169dc22035ea9640fdf07351f8667638dd6
Former-commit-id: 2b2b0b0387932888eaa6c8e5b86fc05d7254de3a
2015-04-07 18:33:14 +00:00
Fay.Liang
dd7c47b911
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: f8b4d9d81247c6089960c83b57417a5ba62cdfc2
2015-03-27 15:16:09 -04:00
Fay.Liang
f3dcf799d6
Merge tag 'OB_14.3.2-24m' into master_14.4.1
...
14.3.2-24m
Conflicts:
rpms/awips2.core/Installer.gfesuite-server/component.spec
Former-commit-id: a91ad7ff32c153c34d6982f29cc497812d9f22f7
2015-03-27 15:07:28 -04:00
Sean.Webb
6679bc9519
Merge "ASM #17221 - Updated LDM to 6.12.9" into asm_14.4.1
...
Former-commit-id: ec7696a5ca44ccdebf86888d27e3fcb151576a61
2015-03-27 08:06:00 -05:00
Sean.Webb
723febe25e
ASM #17221 - Updated LDM to 6.12.9
...
Change-Id: Ib01372e3d0365404c9c8c94b951536d671ec5319
Former-commit-id: 3fb2bed462ec0cb2f985b80a4ea02192eac917db
2015-03-27 07:58:40 -04:00
Fay.Liang
475019fb61
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e
2015-03-18 15:12:56 -04:00
Fay.Liang
3233640aa2
Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 42d435f739134ec29a021415ed96b6c3406fc021
2015-03-18 14:54:46 -04:00
Sean.Webb
506090817b
ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS
...
Change-Id: Ifd691a453dd201c04a297aa54068a9557b1b03e6
Former-commit-id: f3164dc891d77c84d12e745a7ece5bd7eddfa0ee
2015-03-17 11:31:56 -04:00
Fay.Liang
8bdfffa97d
Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
...
Former-commit-id: f7d4e763a667aef949d360d18143f8caa618ae6b
2015-03-12 22:23:33 -04:00
Shawn.Hooper
713e1be2c2
ASM #17164 - Update gfesuite build files
...
Change-Id: I3f350beb10e2cb4b49d9f755e6cd9c549f1c95a4
Former-commit-id: 446c28f031dd408cea1f79c093d9239e47af0798
2015-03-12 17:14:33 -04:00
Fay.Liang
70714494f9
Merge tag 'OB_14.3.2-21m' into master_14.4.1
...
14.3.2-21m
Former-commit-id: f08ea9cd7acadd1f8f1bb2eedf7ce39894c3f39e
2015-03-11 14:32:22 -04:00
Fay.Liang
d06537cf12
Merge branch 'master_14.3.1.1' into master_14.3.2
...
Former-commit-id: 450fdfceca0e7f3745a8dcbffe3d7740ff1aee64
2015-03-10 14:52:49 -04:00
Sean.Webb
4ef6100cf8
ASM #17227 - Fixed total lightning pattern
...
Change-Id: I889a405685e1b51cb115d40ada425f80947920d2
Former-commit-id: 4349757b615d3963d3201c1045fa7599c09acdf8
2015-03-10 12:43:15 -04:00
Fay.Liang
0e475cb704
Merge tag 'OB_14.3.2-19m' into master_14.4.1
...
14.3.2-19m
Conflicts:
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
cave/com.raytheon.viz.product.awips/awips.product
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
2015-03-09 16:11:13 -04:00
Greg Armendariz
d49207c051
Omaha #4200 - Update Shapely to v1.4.4
...
Former-commit-id: c5b543725c87e17d4899f66f5f2b1ea76a4c5ac9
2015-03-03 16:05:47 -06:00
David Friedman
1afdea35fb
ASM #14990 - Add pqact patterns for earthquake and tsunami products
...
Change-Id: Ied72bd5896a9e1939f4ddd9d68cb362067406d65
Former-commit-id: 899c6472abfdcfa27018d20cc204735dea4d2f43
2015-02-24 15:33:48 +00:00
Fay.Liang
31dcfdc402
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: ef870235658ea88d676ca65611bcfbdd56d206b1
2015-02-17 14:07:11 -05:00
Sean.Webb
edae59425b
ASM #17142 - Fixed nwps dir permissions
...
Change-id: Ibd843098cea02d3f1ea6b75d3e715d804c5c1e37
Former-commit-id: fc7258495581cd1d241f55aba2a8e60053575571
2015-02-17 12:29:55 -05:00
Fay.Liang
af8b95bb97
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: fd4e0b9ada38ab93586088948809279e39a0374c
2015-02-13 09:34:24 -05:00
Fay.Liang
eefa05ada3
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 480b6597331ebd2ce7d7835de6e21050abf18722
2015-02-13 09:32:40 -05:00
Shawn.Hooper
9c637bda0b
ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm
...
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28
Former-commit-id: 2c62f45654b0531349fef5e7523c67c94236ce1a
2015-02-12 17:32:05 -05:00
Ana Rivera
6191c93a9c
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: f6b3765fc1670db2b9ceef75be7422a07b2badcf
2015-02-11 22:00:40 +00:00
Steve Harris
9311e6f440
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
...
14.4.1-10
Former-commit-id: 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2
2015-02-11 15:53:38 -06:00
Steve Harris
a5da551a5d
Omaha #4111 - Updated foss licenses and Master_Rights_File.pdf
...
Former-commit-id: 45e09e8f848d85ae45205b655074bba8342c9156
2015-02-11 10:58:07 -06:00
Fay.Liang
07076f91aa
Merge branch 'master_14.3.1' into master_14.3.2
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 155801c3d418b6deb7e17ffb04c963a80d092c5a
2015-02-10 10:59:16 -05:00
Ana Rivera
c2f02ff4b2
Merge branch 'omaha_14.4.1' into field_14.4.1
...
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f
Former-commit-id: c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265
2015-02-10 14:41:19 +00:00
Fay.Liang
43c7161dcf
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: e91a78eec910b84f44350d3aae68a26f4e0dcd72
2015-02-09 17:19:41 -05:00
Greg Armendariz
af72fd3775
Omaha #3299 - Fix collaboration RPM build issue
...
Former-commit-id: 9132eff524289c5df48c682cd3ff226fe14cdf1b
2015-02-06 11:37:47 -06:00
Joshua Watson
65a568b79d
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: 12e0aeea9fa6b2dc7de297aee0ff7d1de3a99111
2015-02-05 09:26:20 -05:00
Shawn.Hooper
915ddd6964
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: f1383bbdbadc54f8f2a0384d319c70160464a3ac
2015-02-04 16:47:26 -05:00
Greg Armendariz
bb8a61a996
Omaha #3839 - Add script to /awips2/edex/bin/
...
Former-commit-id: c215890342be6fed80d614e0a5853e8ce816a7f2
2015-02-04 09:59:06 -06:00
Roger Ferrel
6e4b93ed15
Issue #4066 Added Earth Networks Total Lightning to pqact.template and RAW_DATA.xml
...
Change-Id: I09ccfea7e02134339771550fb915bb3516067320
Former-commit-id: 4d9df40733b0ac8cfa40974dd13abe2e204ab3bd
2015-02-03 11:58:13 -06:00
Greg Armendariz
e004e0881f
Merge "Omaha #4065 - Update EDEX RPM install to modify date stamp" into omaha_14.4.1
...
Former-commit-id: ddf9b7d0a97ffda6e79688d7c35c828fb7fc1d91
2015-02-03 11:35:26 -06:00
Greg Armendariz
fbadd1deb1
Omaha #4065 - Update EDEX RPM install to modify date stamp
...
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0
Former-commit-id: 83243af002e8ddfd15f899ff1ab3e511cf5a0af4
2015-02-03 10:12:54 -06:00
Ana Rivera
20ad0a65f3
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: 291d66c66af4f1f4d298185412d5930714ffb2c5
2015-01-27 22:05:59 +00:00
Ana Rivera
327945af8b
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: 889608360567b829f81ed6392c64c669798f34a9
2015-01-27 16:28:42 +00:00
Steve Harris
0f05c53a53
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: 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79
2015-01-23 09:08:06 -06:00
David Lovely
cf4077e8cd
Omaha #3957 Removed trailing slash in Spec for QPID.
...
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5
Former-commit-id: 5fe598aef48f91e57d8f233872ccd0bab395164e
2015-01-15 08:16:18 -06:00
