xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7687 commits 31 branches 40 tags 3.8 GiB
Commit graph

3547 commits

Author SHA1 Message Date
Nate Jensen
bf39bfd680 Merge "Omaha #3077 Cache logic fix Change-Id: Iea128331728b318ecd85b1e95848c1ff181386a8" into omaha_15.1.1 
Former-commit-id: 14d70e5c7d5bd875c8a2edb3cba77685e86adda4
 2015-02-10 08:57:11 -06:00
Dave Hladky
c4ad904577 Omaha #3077 Cache logic fix 
Change-Id: Iea128331728b318ecd85b1e95848c1ff181386a8

Former-commit-id: f5264715f04f6d6a2a9e4fcb9ad4c0a28fae95df
 2015-02-09 13:41:04 -06:00
David Gillingham
f743cba5a8 Omaha #4072: Remove uf.common.dataplugin.grib modules from pythonPackages project. 
Change-Id: Ibb512ca3d8c1f1ef83e51e70a70b6fba67b90922

Former-commit-id: 89a108e98c148429f574dae2abe4f5c5beacc323
 2015-02-09 13:07:39 -06:00
Nate Jensen
76a47a593a Merge "Omaha #4009 Improved error handling for bad/incomplete DAF requests" into omaha_15.1.1 
Former-commit-id: 468e477002a12ffe9ff20dee0c145ac323a54bc2
 2015-02-04 13:42:33 -06:00
Mark Peters
8600775953 Omaha #4009 Improved error handling for bad/incomplete DAF requests 
Change-Id: I947f8097f5d8981286023ca6acbde8517581abf0

Former-commit-id: 455f7d8cd4f42e2c1611029ca6c7d5e8d1b5997b
 2015-02-03 17:36:54 -06:00
Steve Harris
85457e37cb Merge tag 'OB_14.4.1-7m' into omaha_15.1.1 
14.4.1-7


Former-commit-id: bf0368503a8defd41a20e369e154d560b93bee6c
 2015-02-03 17:30:23 -06:00
Steve Harris
8cd98ea3b9 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
Fay.Liang
ae85ade54d Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: 06a34c609a217ca98b027ac6d92a31faf802b668
 2015-02-03 11:24:57 -05:00
Nate Jensen
25cd946168 Merge "Omaha #3945 Moved the ESB folder to deploy.edex.awips2 and updated the build scripts." into omaha_15.1.1 
Former-commit-id: 611b6980c2f69ba515b2931afca366472a909e02
 2015-02-02 13:01:03 -06:00
Ana Rivera
ea92049aac Merge branch 'master_14.4.1' into gsd_14.4.1 
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5

Former-commit-id: d5996a81aad0809aaddbb8df99a985c86c66aaf8
 2015-01-30 19:29:29 +00:00
David Lovely
fa557d08e3 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
Steve Harris
995d60fb54 Merge tag 'OB_14.4.1-5m' into omaha_15.1.1 
14.4.1-5

Conflicts:
	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

Former-commit-id: 28075dabb4b6421ddaee3af71518f565d9bc7e90
 2015-01-28 13:45:36 -06:00
Ana Rivera
8bfa7c4087 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
Steve Harris
716879f58b Merge tag 'OB_14.4.1-4m' into omaha_15.1.1 
Conflicts:
	cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java

Former-commit-id: 714ca199f27013313099920bb9f55009c794f7f8
 2015-01-27 11:56:24 -06:00
Fay.Liang
d29d86ad05 Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: 6ad30059fa7249aba100a39c7c39215212a929cc
 2015-01-27 12:08:28 -05:00
Ana Rivera
7c5fc26537 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
Ana Rivera
98ac97e397 Merge branch 'master_14.4.1' into emc_14.4.1 
Conflicts:
	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: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1

Former-commit-id: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
 2015-01-26 18:45:26 +00:00
Shawn.Hooper
568b7c801a Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: 95cdc2d817eac840017fc14746c2ada498f1a716
 2015-01-26 11:22:49 -05:00
Roger Ferrel
5e91714487 Omaha #3763 Update xml tags to match labels in the ArchiveRetentionDlg dialog. 
Change-Id: I9d8344fdecb16d75bfa360d403ab84312f6bfe0e

Former-commit-id: 083ba10ef9ecdae0c2a242f432641b7659fdc822
 2015-01-26 07:46:00 -06:00
Steve Harris
2c559f4c88 Merge tag 'OB_14.4.1-2m' into omaha_15.1.1 
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)

Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
 2015-01-23 09:32:44 -06:00
Steve Harris
158fa16376 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
Shawn.Hooper
0bc501bd4c Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: d53c809149da23fcae51138cc45c57aecd641794
 2015-01-22 16:05:41 -05:00
Dave Hladky
c1127b066f Omaha #3918 Central registry web interface broken by DPA fix. 
Former-commit-id: 5aa305adb5fd16c72ce557309cab28fd287379d9
 2015-01-22 13:22:18 -06:00
Nathan Bowler
efd13e5442 Omaha #3949 Add lightning source to SCAN site run config and filter on it. 
Change-Id: Ic8a13effa112f6858a34b07c65ddae5a592d9be5

Former-commit-id: 4817945b7eadadca996dd1e3d037a2b2de297ec4
 2015-01-22 12:15:00 -05:00
Ana Rivera
7b47ffe362 VLab Issue #6082 - Patch for BinLightningDecoder.java; fixes #6082 
Change-Id: Ide610d8209a7072dbcdc4bb7c26fc85cedc6e24f

Former-commit-id: 8a66266d3ffa236343f14089d7e7b32c1060f9ea
 2015-01-22 16:11:44 +00:00
Ron Anderson
6b8705ee39 Omaha #4013 Change rsyncGrdsToCWF_client.sh to use any available EDEX cluster member 
Change-Id: If2370cf73ec816bbac2a9b46ebbc8fb720eae805

Former-commit-id: e2f809e7b48f83b5abeb4dcda0c7e96a160e7fbf
 2015-01-20 16:46:47 -06:00
David Gillingham
41af2f661c Omaha #4014: Add ingest and display support for ETSS model. 
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846

Former-commit-id: fa7e11a22b47a48d2bc7b9cf6f0ddfd97ea2fea7
 2015-01-20 14:02:06 -06:00
Ron Anderson
03df152b3d Merge "Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data" into omaha_15.1.1 
Former-commit-id: 27d20161a120d027cc0d2ed892384cdc00faeba5
 2015-01-19 15:08:31 -06:00
Ron Anderson
b58904fe25 Merge "Omaha #3955 Move GridType enum into GridParmInfo where it belongs" into omaha_15.1.1 
Former-commit-id: e541806ce417494bb65248a5d09f8fa5585bedd9
 2015-01-19 15:08:08 -06:00
Ron Anderson
596149053f Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data 
Change-Id: Ic12b1e257b7997fc2fbc5efd7a8833ac26366135

Former-commit-id: 653d8ec5a7adfc2ebb87ec6cbde2715f9c8fcfe9
 2015-01-19 14:02:42 -06:00
Ron Anderson
5dfd9d6f8c Omaha #3955 Move GridType enum into GridParmInfo where it belongs 
Change-Id: Ia9265527302d8ff9213e8f55f63e5b6b91bdcd98

Former-commit-id: 9bad7ebc912f6dbf9642f250494a992bc522252c
 2015-01-16 12:33:52 -06:00
Ron Anderson
899235138c Merge "Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards" into omaha_15.1.1 
Former-commit-id: c6cacfdda1724ff43da04221f5fc2fbb0d9e3ae2
 2015-01-16 11:03:14 -06:00
Richard Peter
a754644505 Merge "Omaha #3789 removed unnecessary arguments to uengine jetty endpoint" into omaha_15.1.1 
Former-commit-id: 7f514d51ea7858681fa22e923677e6f4e9d51631
 2015-01-15 13:43:12 -06:00
Brian Clements
44acb69ede Omaha #3789 removed unnecessary arguments to uengine jetty endpoint 
Change-Id: I9442351c05ecf4a67ea05b536ef94bbd26c214f3

Former-commit-id: 9f1eee3bcf4eb5e72c433055d2f2b5727056ee39
 2015-01-15 09:28:26 -06:00
Chris Cody
8b70f9f919 Omaha #3996 NullPointerException Occurs when Drawing and Issuing Hazards 
Change-Id: I2ccc6596bbff035a4904a1fa6b0fe45c3416c85e

Former-commit-id: 0b64b70ab9c1f518062fd8f0c78ac51abea6e11b
 2015-01-14 15:48:13 -06:00
Nate Jensen
05307be9d0 Omaha #3993 ensure important dataplugin utility folders are included in 
viz builds

Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747

Former-commit-id: 9f30c7195d6a62206bae05d6e17df4a8e068255e
 2015-01-13 16:47:04 -06:00
Fay.Liang
13fb781066 ASM #15311 - Merge changes from asm_14.4.1 into master_14.4.1 
Merge branch 'asm_14.4.1' into master_14.4.1

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java

Former-commit-id: 67315d8c5f28f5ed5e0870f65de30a9c2c2bd290
 2015-01-13 14:35:30 -05:00
Slav Korolev
9c57dab437 Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers. 
Former-commit-id: 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e
 2015-01-12 14:32:31 -05:00
Fay.Liang
c6bd5d7675 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: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
 2015-01-12 13:03:31 -05:00
Nathan Bowler
c75c052122 Omaha #3897 Better handle invalid Section 2 data. 
Change-Id: I50ce32553027d90e677f001efd6bc27fd6e9a091

Former-commit-id: c5ff89d216e9df47330efb6560d47406ac3601fe
 2015-01-12 11:27:55 -05:00
Nate Jensen
44f0f7aafc Merge "Omaha #3918 Fix for standalone clients not starting due to central registry non-existance. Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292" into omaha_14.4.1 
Former-commit-id: 5fc926b7e735f2c92b16a85a7ba5f663a443ea53
 2015-01-12 09:22:30 -06:00
Michael Gamazaychikov
bae8d9ea3f ASM #629 - GFE: when runProcedure terminates unexpectedly locks remain in gfelocktable. 
Change-Id: Ife5ecb2c5823d4d34c1b4af6dc53fa360074b7bb

Former-commit-id: 38eabd6196df1576970019f2b0255d3f39a825a9
 2015-01-09 15:07:29 -05:00
Nate Jensen
abedf22aca Merge "Omaha #3789 moved common.http to ufcore, reworked camel http endpoints" into omaha_15.1.1 
Former-commit-id: 125ef3257c2aeb59b8157b19c5f84342a832143b
 2015-01-09 10:18:20 -06:00
Brian Clements
35f38f99bf Omaha #3789 moved common.http to ufcore, reworked camel http endpoints 
Change-Id: Ie1363cb5198c3d90129f5d46465883234f06c58e

Former-commit-id: d81c8f6708e25c93df3dd199293d47f326dea61a
 2015-01-08 14:50:36 -06:00
Ying-Lian.Shi
3e1d1aa814 ASM #15035 - Add SFMG WNJ GFE Domain definition to baseline serverConfig, double quote to sigle quote 
Change-Id: I9c652fdc3440d8c15a0c443a6b80a8a10877693e

Former-commit-id: af67fa0f955b35c7b9b141fef507a5db805eaa27
 2015-01-08 15:28:54 +00:00
Brian Clements
d654550e11 Omaha #3692 alert alarm record is no longer a singleton 
Change-Id: Ib995bc47699c515c2702e5aab677929a939a62a8

Former-commit-id: ff9be6a031b01f96eca5c390d2c5156069cfc3bd
 2015-01-07 13:55:24 -06:00
Juliya Dynina
d0072cd181 Merge "ASM #632 -Filter erroneous RPG alert messages." into asm_14.4.1 
Former-commit-id: 503e8a59c9608c3094d817e3e2d5e07250c0e0e5
 2015-01-07 09:02:32 -05:00
Daniel.Huffman
9db291b296 ASM #632 -Filter erroneous RPG alert messages. 
Change-Id: Iacab9ba170ac0f267ac7eedeaf81113a687c988e

Former-commit-id: d7d3bc55053f16da410d3ebe1ef055e93d198790
 2015-01-07 00:41:35 +00:00
Dave Hladky
66aa4b2fbf Omaha #3918 Fix for standalone clients not starting due to central registry non-existance. 
Change-Id: I78ed5dd75e94d567d934acfae098d59364a62292

Former-commit-id: d8a52577bbe13f53f9afbbae354e8bc58e11a0ed
 2015-01-06 14:37:01 -06:00
Brian Clements
acc9e8630d Omaha #2707 replaced LSR officeId constraint with stationId 
Change-Id: I05fef0c56801fa907e45da3400437e71ce0e38dd

Former-commit-id: e0cd69f020d351f0aaefd5b35ffb369e44a04e48
 2015-01-06 12:33:06 -06:00