Steve Harris
|
7375074ed8
|
Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
15.1.1-2m
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
|
2015-03-30 11:07:52 -05: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 |
|
Steve Harris
|
1c1844ad65
|
Merge branch 'omaha_15.1.1' into omaha_16.1.1
Conflicts:
cave/build/p2-build.xml
Former-commit-id: 908fc24c43aab13856a375d8f79b4d0e576bea9a
|
2015-03-27 13:52:27 -05: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 |
|
Steve Harris
|
165971a4f6
|
Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
|
2015-03-26 09:57:17 -05:00 |
|
David Lovely
|
cdd4141d18
|
Omaha #3799 Upgraded QPID to version 0.32
Former-commit-id: bede2a938cdc5b97d288a79b41ef5123a8cb75bd
|
2015-03-25 21:43:58 -05:00 |
|
David Lovely
|
d87f7c6215
|
Omaha #4178 Java 1.7u76 Upgrade
Former-commit-id: 50c46ce076713a18076b45110e373fba6d39b841
|
2015-03-25 10:46:34 -05:00 |
|
Sean.Webb
|
cd838863a7
|
ASM #17189 - Removed rpm commands from profile scripts
Change-Id: Id6abd356376c29a179278a127828e8616cc66fbd
Former-commit-id: 0b51d70c7f71fdecdc2f4ab0988d1d1161019030
|
2015-03-24 14:31:17 -04:00 |
|
Fay.Liang
|
86a8041062
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
|
2015-03-19 12:35:31 -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 |
|
Steve Harris
|
67b3a77c4f
|
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
|
2015-03-18 09:29:01 -05: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 |
|
Melissa Porricel
|
fcdcb81963
|
ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km
Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c
Former-commit-id: 9c7d466213eaac3a46fddf416967d00e3446bfee
|
2015-03-16 17:14: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 |
|
Sean.Webb
|
5f2708d19d
|
ASM #14804 - Removed duplicate codes from regex pattern
Change-Id: Ibdd2954d9140651f937e99a261595906df2c4c8a
Former-commit-id: f8e9546d57fbd353003bdf9021d9bc8c5129a8bf
|
2015-03-05 07:56:30 -05:00 |
|
Greg Armendariz
|
d49207c051
|
Omaha #4200 - Update Shapely to v1.4.4
Former-commit-id: c5b543725c87e17d4899f66f5f2b1ea76a4c5ac9
|
2015-03-03 16:05:47 -06:00 |
|
Steve Harris
|
ead97f053e
|
Merge tag 'OB_14.4.1-14m' into omaha_15.1.1
14.4.1-14
Former-commit-id: cdca3c5b9eb65bed9d773019917245d1000d78dd
|
2015-03-02 10:58:40 -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 |
|
Steve Harris
|
78b41638b9
|
Merge tag 'OB_14.4.1-13m' into omaha_15.1.1
14.4.1-13
Former-commit-id: ea76883b615967a79e8c9d0ee16accebd210ee0b
|
2015-02-20 13:17:47 -06:00 |
|
David Lovely
|
60f9eb3e1f
|
Omaha #4072 Remove old python files before installing.
Former-commit-id: ba56c1d304d2f7ca03f26112ec2f8b25783ff8ca
|
2015-02-18 10:46:59 -06: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 |
|
Steve Harris
|
118f52263f
|
Merge branch 'omaha_14.4.1' into omaha_15.1.1
Former-commit-id: ffee274d844442a36d633deda5776c09a758cb38
|
2015-02-12 12:48:29 -06: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 |
|
Steve Harris
|
afb3d31759
|
Merge tag 'OB_14.4.1-6m' into omaha_15.1.1
14.4.1-6
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 9fd5ed1aea1a667552144da88dcc394a99133c52
|
2015-02-03 12:25:05 -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 |
|
David Lovely
|
b8a10c4336
|
Omaha #3945 Moved the ESB folder to deploy.edex.awips2 and updated the build scripts.
Former-commit-id: b9868fc974226fe6b003b0361ce1b18507b2d810
|
2015-01-28 15:15:15 -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 |
|