Commit graph

1573 commits

Author SHA1 Message Date
Sean.Webb
0bc030b19e ASM #17467 - Commented out MRMS entry
Change-Id: I8c9ffd223be82c3db4d9bad55cb1d5c93ffa6c68

Former-commit-id: 3b5a5bc44e [formerly df312d6715 [formerly e09eb0800c7798bc81dc8e5f617a7460cba1cae8]]
Former-commit-id: df312d6715
Former-commit-id: 25ca8ad9a7
2015-05-06 10:47:11 -04:00
mjames-upc
ba867739be LDM pqact and ingestGrib product updates
Former-commit-id: 0ad5759403 [formerly c779c551ca] [formerly 1de9ff057fc9c0861669617590900416db26bf37 [formerly 3c41589061]]
Former-commit-id: d130b42517394e3d33bac534c0ce6faa2364e28b [formerly 835f0e0f02]
Former-commit-id: 877f18c243
2015-04-28 16:01:39 -06:00
mjames-upc
08482d613c python package release number fix
Former-commit-id: ba198ca1e9 [formerly 9c47166aee] [formerly 56f406df2dcecee9d4f4726ae4f891f68c46c46b [formerly 2c6bdb6cda]]
Former-commit-id: 391dcb9fb0a20595b05a51e0504d1147b601711b [formerly 801c28dd86]
Former-commit-id: d51cd53cf8
2015-04-28 16:01:06 -06:00
Shawn.Hooper
4a34651671 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: bfeceac493 [formerly 1e2a6f0dcb [formerly 12eaf1024c288cfbe746d70336f13268587848ad]]
Former-commit-id: 1e2a6f0dcb
Former-commit-id: 0479064ded
2015-04-24 16:27:06 -04:00
AWIPS User
0d16d287a1 don't put awips version in python package RPMs
Former-commit-id: 7fbf0bf1db [formerly 814c3f8147] [formerly aeebdfe79cf10745d8b4dc2fd8f9ec714f2a12fa [formerly 2b35f99b04]]
Former-commit-id: 62d141eb76debb459cc1d8e8483d6f71ba099d41 [formerly 692f72d9c9]
Former-commit-id: e4267c31d4
2015-04-24 13:51:24 -06:00
Sean.Webb
767120a938 ASM #17414 - EKDMOS pqact pattern changes
Change-Id: Ic2ac59f79fd53ef244ab0a40cfb30c40ceb575c3

Former-commit-id: 18ceef2aad [formerly 71dbf96f40 [formerly 262fd6e27cb512137a2576e58d9813ca90b1e90b]]
Former-commit-id: 71dbf96f40
Former-commit-id: a457a1c66b
2015-04-24 14:17:41 -04:00
AWIPS User
00ebd19ecd cleanup .orig and http tarbal
Former-commit-id: 178889af8b [formerly d1963286e0] [formerly 4dfb7ed1eebaf5c53f24d3df49df1d35f5760db2 [formerly d4a5791a0f]]
Former-commit-id: e56425e1a036e681b52429179c4f5f6fa174d883 [formerly 79ea810b59]
Former-commit-id: aca0eccb36
2015-04-24 06:24:39 -06:00
AWIPS User
cebb8b38c8 build updates
Former-commit-id: 18aa0e5dc7 [formerly a3cef2f93b] [formerly 3d4cb2094519fd1f7d725ba29867111d886bf589 [formerly 6f457198ce]]
Former-commit-id: d76925435260a8a00d7978ea1c0ee7359793f42c [formerly e9ec10cbc4]
Former-commit-id: 98f56937b5
2015-04-24 06:23:59 -06:00
AWIPS User
5b07d41542 Merge branch 'master_14.4.1' of https://github.com/Unidata/awips2 into master_14.4.1
Former-commit-id: 6313604212 [formerly 559462c6ca] [formerly 355771b71ff21cfe6d2f2a3b46feb1be38ed411f [formerly e95a87ff04]]
Former-commit-id: 72c365f3fedee2fbdfaa0ad22fd04a1ee71a2aa8 [formerly 08407a08bf]
Former-commit-id: e6600c7119
2015-04-24 03:46:25 -06:00
mjames-upc
cd3d2683a1 httpd tarball renamed
Former-commit-id: 8c57548f9f [formerly 60661ed581] [formerly f3d9f024a1a129aceba1b1b8e4f1f5be717fa080 [formerly 0f3faf29ad]]
Former-commit-id: 403a698e28798fc85851d5ab7d58e7871b5c31ac [formerly 3a3f339e4d]
Former-commit-id: b954a28fae
2015-04-24 10:31:21 -06:00
AWIPS User
9d2e0472de rsync update for 14.4.1 directories
Former-commit-id: ad3ce25356 [formerly 6ea3b32087] [formerly 43a4a982a23eb5d875a02540748b8c6b11cc44b0 [formerly 67edbfa0fb]]
Former-commit-id: 576ce97e17f32c4d613fecf544f33171078a3d53 [formerly 2eac76cc61]
Former-commit-id: 019e12f611
2015-04-24 03:45:36 -06:00
mjames-upc
d33cf5cbc8 Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: a2e6b5e6ed [formerly f71c396cef] [formerly 8624f9707276ae6bc8c638a057eaf9e7e1d2716a [formerly 2288995260]]
Former-commit-id: 7a2ac36eca3df270f4afc658f6f3530848347ee4 [formerly cd4cb8eb1d]
Former-commit-id: 93b22eeb17
2015-04-22 15:11:19 -06:00
Fay.Liang
74b682dba8 Merge tag 'OB_14.3.3-6' into master_14.4.1
14.3.3-6


Former-commit-id: 8d05dd54f9 [formerly ca388273ae [formerly 60bbc49613d1ea355e49061fb984db9de257b0a5]]
Former-commit-id: ca388273ae
Former-commit-id: b456da8441
2015-04-21 10:09:11 -04:00
mjames-upc
36d4337756 build update, remove leftover plugins or else CAVE build barfs
Former-commit-id: 4a83aa7b8a [formerly 06825dfa09] [formerly cdedc4c022eeafa4e36a1a88d5985a1cacbb0d60 [formerly 9327b7b7bc]]
Former-commit-id: 8ca8ba460a435d5e754a635d31ce96f27203ebfa [formerly 5098e0c346]
Former-commit-id: 973adde1cc
2015-04-20 17:29:07 -06:00
Sean.Webb
0176d9f010 ASM #17398 - Removed tropical patterns from baseline
Change-Id: I95bbf55d0306d5478c4decd20bc06677b4af9c57

Former-commit-id: 59d0c55202 [formerly c8b2510b61 [formerly 869e804dcdf4cbd00314eec063a134ca0d53f443]]
Former-commit-id: c8b2510b61
Former-commit-id: ab56a897b3
2015-04-20 11:36:04 -04:00
Steve Harris
012c843bf3 Merge tag 'OB_14.4.1-26' into omaha_14.4.1
14.4.1-26


Former-commit-id: 1d71dee037 [formerly cc1f5eaada [formerly b6156ab57179bb4af118912960cf402d459ba779]]
Former-commit-id: cc1f5eaada
Former-commit-id: cfa478da4f
2015-04-20 07:36:26 -05:00
mjames-upc
ee3d447aa1 build increment
Former-commit-id: ff29d1e215 [formerly 4b252ba378] [formerly 8178f1396b695988589804287ea38a8dacf34c44 [formerly 668c5ee330]]
Former-commit-id: 2d68043cdfa717e98da2299fc90407abab9acfe2 [formerly 0b5fac3877]
Former-commit-id: 8b8a367019
2015-04-17 10:38:28 -06:00
Steve Harris
1ee9770467 Omaha #3299 - Added ldm-6.12.9 to open source credits
Former-commit-id: b0faa6d57f [formerly 89693bc797 [formerly 2555771c8694cdcbe208362538444ec514e5d518]]
Former-commit-id: 89693bc797
Former-commit-id: 3a4731daff
2015-04-15 09:15:11 -05:00
Steve Harris
520ca14c21 Merge tag 'OB_14.4.1-24' into omaha_14.4.1
14.4.4-24


Former-commit-id: b78afa0e72 [formerly 50ea025340 [formerly 11b32bb99084a6162cd0d463800281c7115aef85]]
Former-commit-id: 50ea025340
Former-commit-id: 7592f02576
2015-04-13 08:56:12 -05:00
mjames-upc
97ef7eef56 build increment 14.4.1-1n5
Former-commit-id: 58cf791552 [formerly 9b0595a8ab] [formerly 12f4901f2620d307ebdad1db2ab3f9fe70eb49c6 [formerly caaf0da3a0]]
Former-commit-id: 23ef8edbc18f908101d8fe65d45b564dd355db23 [formerly 98a9a120bb]
Former-commit-id: 3f52a9fd89
2015-04-11 07:40:28 -06:00
mjames-upc
bd31aeca2e check for eth1 before using it
Former-commit-id: 9e02300551 [formerly 88ab1218eb] [formerly 8a6e278373889c5ceaf70e99ca6e33d44647641b [formerly d4d1e1e140]]
Former-commit-id: 8ed8302c55d428488d35471612bbf17c5b763df7 [formerly ffcf154507]
Former-commit-id: 2b30d00003
2015-04-11 07:39:09 -06:00
Fay.Liang
a2193b5b4b 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: 88d6e796f5 [formerly 0a5f18487a [formerly 66eb429aee1d602cf216f1509e780afdbd1cbd23]]
Former-commit-id: 0a5f18487a
Former-commit-id: 266161bf86
2015-04-10 13:49:22 -04:00
Fay.Liang
abe7660994 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 6a9a1daef6 [formerly a4a2421296 [formerly a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9]]
Former-commit-id: a4a2421296
Former-commit-id: 3898abb1db
2015-04-10 12:13:31 -04:00
Steve Harris
065c1e8155 Omaha #3299 - Master rights and foss for 14.4.1
Former-commit-id: 6aa72398d2 [formerly 1d281377d5 [formerly e9c9daec3e77c8f9af54afb06318f0dce9958b50]]
Former-commit-id: 1d281377d5
Former-commit-id: 42d321d3c8
2015-04-09 10:22:32 -05:00
Fay.Liang
ab37a5c8a3 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: 2301da818a [formerly c1d84bf3b0 [formerly fea365e547f12a13a942594f8267b15a7895a102]]
Former-commit-id: c1d84bf3b0
Former-commit-id: 43adcc2ea3
2015-04-07 15:38:18 -04:00
Ana Rivera
5f6d3ed622 VLab Issue #7489 - Fix SFPA42 data_store entry in pqact.conf;fixes #7489
Change-Id: Id7675169dc22035ea9640fdf07351f8667638dd6

Former-commit-id: 53807298e8 [formerly b5150e3d43 [formerly 2b2b0b0387932888eaa6c8e5b86fc05d7254de3a]]
Former-commit-id: b5150e3d43
Former-commit-id: f486274e5d
2015-04-07 18:33:14 +00:00
Fay.Liang
f81dd89c07 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: dd7c47b911 [formerly e7d2d5e901 [formerly f8b4d9d81247c6089960c83b57417a5ba62cdfc2]]
Former-commit-id: e7d2d5e901
Former-commit-id: 8383682425
2015-03-27 15:16:09 -04:00
Fay.Liang
6f334984cb 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: f3dcf799d6 [formerly cf8cd9d051 [formerly a91ad7ff32c153c34d6982f29cc497812d9f22f7]]
Former-commit-id: cf8cd9d051
Former-commit-id: cc7a2e7082
2015-03-27 15:07:28 -04:00
Sean.Webb
4a54cf9006 Merge "ASM #17221 - Updated LDM to 6.12.9" into asm_14.4.1
Former-commit-id: 6679bc9519 [formerly d93c0ec88c [formerly ec7696a5ca44ccdebf86888d27e3fcb151576a61]]
Former-commit-id: d93c0ec88c
Former-commit-id: 0bfb84273c
2015-03-27 08:06:00 -05:00
Sean.Webb
49f1959c15 ASM #17221 - Updated LDM to 6.12.9
Change-Id: Ib01372e3d0365404c9c8c94b951536d671ec5319

Former-commit-id: 723febe25e [formerly 022b59e739 [formerly 3fb2bed462ec0cb2f985b80a4ea02192eac917db]]
Former-commit-id: 022b59e739
Former-commit-id: 35b2495144
2015-03-27 07:58:40 -04:00
Fay.Liang
15560cc42e Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 475019fb61 [formerly 0284b3b7e9 [formerly e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e]]
Former-commit-id: 0284b3b7e9
Former-commit-id: 228e85dcb9
2015-03-18 15:12:56 -04:00
Fay.Liang
ec294fd11c 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: 3233640aa2 [formerly 6f8f2f5398 [formerly 42d435f739134ec29a021415ed96b6c3406fc021]]
Former-commit-id: 6f8f2f5398
Former-commit-id: 8db78cb400
2015-03-18 14:54:46 -04:00
Sean.Webb
3008bd9c75 ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS
Change-Id: Ifd691a453dd201c04a297aa54068a9557b1b03e6

Former-commit-id: 506090817b [formerly ada3710b7e [formerly f3164dc891d77c84d12e745a7ece5bd7eddfa0ee]]
Former-commit-id: ada3710b7e
Former-commit-id: 9918c8e476
2015-03-17 11:31:56 -04:00
mjames-upc
c640750bdb psql profile.d script account control
Former-commit-id: 8f335571ec [formerly 08d6e0eaf0] [formerly cd51f7b6bec42961cfe384381683ae382919f490 [formerly c155facc96]]
Former-commit-id: c161edfd9351998303b01f9b2be1671e32a78bb4 [formerly 5c0fe6ed10]
Former-commit-id: 62efd40c74
2015-03-13 15:17:13 -06:00
Fay.Liang
3593db8387 Merge branch 'asm_14.3.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.2
Former-commit-id: 8bdfffa97d [formerly 29863ea663 [formerly f7d4e763a667aef949d360d18143f8caa618ae6b]]
Former-commit-id: 29863ea663
Former-commit-id: 0b3baf855f
2015-03-12 22:23:33 -04:00
mjames-upc
bb8a378c01 upc RPM build using _component_version and _component_release from buildEnvironment.sh
Former-commit-id: 2caad5d9a7 [formerly abc109f421] [formerly c662817804711b07a1c0388eadd7c80440df841a [formerly 73f35ddf96]]
Former-commit-id: 89ea56f8afba7b69bf6fcb5292de120201157009 [formerly 95cacfedd2]
Former-commit-id: 9ea71aef1f
2015-03-12 16:02:08 -06:00
Shawn.Hooper
ab1c4b8ec3 ASM #17164 - Update gfesuite build files
Change-Id: I3f350beb10e2cb4b49d9f755e6cd9c549f1c95a4

Former-commit-id: 713e1be2c2 [formerly 98f47b420c [formerly 446c28f031dd408cea1f79c093d9239e47af0798]]
Former-commit-id: 98f47b420c
Former-commit-id: 206438edb7
2015-03-12 17:14:33 -04:00
AWIPS User
d1b52a2e6d edex service mananger check for wlan and eth interfaces
Former-commit-id: 1be6f1d726 [formerly 06c82e1e94] [formerly 76a1fcee39e61bc557e7b8a348b5e376ec9b4cec [formerly cc7e4035e7]]
Former-commit-id: 8fe332d7b5060b1a85aa6b51aed24ccb933a7bed [formerly 74d3d0d8b1]
Former-commit-id: 16e3a6b7e8
2015-03-12 15:00:13 -06:00
AWIPS User
36e7af29a0 pqact.conf formatting pt 2
Former-commit-id: 8168c3a104 [formerly 7e5f4a72bb] [formerly b441bee49b54a798617b0ae46648500f6f01b6d2 [formerly 869e4f6a24]]
Former-commit-id: 78371d6e42249603a00ac6904d983f0c1df97028 [formerly df5362d727]
Former-commit-id: bbd3b86ca5
2015-03-11 17:12:12 -06:00
AWIPS User
93b83b735d pqact.conf formatting
Former-commit-id: 67abc9fd43 [formerly 7d124a1bb5] [formerly 57ace7e0fad542bc713652c7c64238ead71db586 [formerly 1a3f4c8700]]
Former-commit-id: 3d78a986de1d119fe30ff2681447c85334465b26 [formerly 421ee53eeb]
Former-commit-id: e694569ad0
2015-03-11 17:11:17 -06:00
Fay.Liang
2d47e9b612 Merge tag 'OB_14.3.2-21m' into master_14.4.1
14.3.2-21m


Former-commit-id: 70714494f9 [formerly 8b2164cfa1 [formerly f08ea9cd7acadd1f8f1bb2eedf7ce39894c3f39e]]
Former-commit-id: 8b2164cfa1
Former-commit-id: 17934b3a66
2015-03-11 14:32:22 -04:00
mjames-upc
f3f5997d8f ldm pqact.conf GFS updates for new CONDUIT naming
Former-commit-id: 5f4b0905e1 [formerly 601ea2e80e] [formerly 5f7a39ee23234bfc790de7a00f9fd99867dd94bc [formerly 2c9091872c]]
Former-commit-id: 26d39efcf6b3ae391e4c0f5eea7d876f131e3663 [formerly 1b32cbd9ea]
Former-commit-id: 02b27e42d2
2015-03-10 16:39:12 -06:00
Fay.Liang
67497cc1e9 Merge branch 'master_14.3.1.1' into master_14.3.2
Former-commit-id: d06537cf12 [formerly 4be968c00b [formerly 450fdfceca0e7f3745a8dcbffe3d7740ff1aee64]]
Former-commit-id: 4be968c00b
Former-commit-id: 5b9a4ddbdf
2015-03-10 14:52:49 -04:00
Sean.Webb
29ccb6965f ASM #17227 - Fixed total lightning pattern
Change-Id: I889a405685e1b51cb115d40ada425f80947920d2

Former-commit-id: 4ef6100cf8 [formerly 20ea80a89a [formerly 4349757b615d3963d3201c1045fa7599c09acdf8]]
Former-commit-id: 20ea80a89a
Former-commit-id: 304ec5502d
2015-03-10 12:43:15 -04:00
Fay.Liang
1138f48ee9 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: 0e475cb704 [formerly 059eb032b1 [formerly 4b3626307cf35ada45985c25cf062e7b857db764]]
Former-commit-id: 059eb032b1
Former-commit-id: a9945f1981
2015-03-09 16:11:13 -04:00
mjames-upc
8a681fea2a build update for 14.4.1: with these edits CAVE will finally build, but only if you use previous version of eclipse with current PyDev update, which is stupid because Raytheon says to use current eclipse which breaks on build attempts. smh.
Former-commit-id: c3e1cc66e6 [formerly 6f67b802f0] [formerly 971b16644f0a85387c661f26aa5a530e66c7998e [formerly 5756a3cde9]]
Former-commit-id: 2603f49de242adb24e0b33768ad64fe1a8f95b61 [formerly c30abec01b]
Former-commit-id: 0d371744a4
2015-03-06 13:42:26 -07:00
mjames-upc
4d5ecdc258 move manual data directory chmod to explicit rather than in %files for edex rpm install
Former-commit-id: ae349de8e8 [formerly 5f0ff190a7] [formerly b3ce3ec743926072d008c7082431273a0d2336cd [formerly e0e7c78472]]
Former-commit-id: 9c76833f373474cc7285a0d80f3b482a5fdc859f [formerly 53f2450004]
Former-commit-id: 752ac6676c
2015-03-06 13:41:02 -07:00
Greg Armendariz
b2c39e311d Omaha #4200 - Update Shapely to v1.4.4
Former-commit-id: d49207c051 [formerly 031d63b6fc [formerly c5b543725c87e17d4899f66f5f2b1ea76a4c5ac9]]
Former-commit-id: 031d63b6fc
Former-commit-id: 21f742d81c
2015-03-03 16:05:47 -06:00
mjames-upc
36e1267855 add back upc build directory
Former-commit-id: 4602b42b59 [formerly 93cdcfaa1c] [formerly b2d44de979ac0309bee48ec6559428e03d7f8674 [formerly 1dd4cb2246]]
Former-commit-id: 65f1daf19c883c5e367fc0a81e1d2ec377b08330 [formerly 7bf5a90a75]
Former-commit-id: bb5a296b0f
2015-03-02 13:52:23 -07:00
AWIPS User
ea30abe01b merge upc development orphan branch into upc_14.4.1
Former-commit-id: 4458299928 [formerly 06a7f2ad9d] [formerly 1f4613a97ecb170f991ddd5ca9be32b5c63945b0 [formerly c9f28fd594]]
Former-commit-id: 76393e9e3ea8a386189eecfc4953a49d04ba95df [formerly 892c265b12]
Former-commit-id: 1ac670fc00
2015-03-01 12:44:45 -07:00