mjames-upc
a1b90f1b19
massive grid renaming incl. GFE
2016-05-03 16:14:14 -06:00
mjames-upc
e2d9ba9a4c
merge unidata_15.1.1 to unidata_16.1.4
...
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
2016-03-25 13:09:32 -05:00
mjames-upc
65e909d935
addback deltaScripts for 15.1.1
...
Former-commit-id: 200426ddef
2016-01-20 15:59:11 -06:00
mjames-upc
87d626a78b
cleanup unused and redundant directories on working branch
...
Former-commit-id: ca996a2a86
2015-12-30 14:02:46 -07:00
David Friedman
4bdfeb8da8
Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
...
Conflicts:
cave/build/static/linux/alertviz/alertviz.sh
cave/build/static/linux/cave/cave.sh
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226
Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
Loubna.Bousaidi
af4ee661d8
ASM #14104 delta script
...
Change-Id: I7cb3fb9b15fe5fe7815df5404ddfc4b22ce0f23a
Former-commit-id: 3e7e062396cd24a686325d079612229806667dc5
2015-07-06 20:20:51 +00:00
Richard Peter
f56c255ebd
Merge "Omaha #4537 HRRR changes for product and volume browsers." into omaha_16.1.1
...
Former-commit-id: 415a89a58f1f288dc3b7e9d031ad3a0eb7d1509a
2015-06-11 16:45:51 -05:00
Richard Peter
bbe2af840b
Merge "Omaha #4515 Removal of no longer needed xmit field." into omaha_16.1.1
...
Former-commit-id: 5d71d934829f993961fedbf8a0a9fe3fa9e2eef1
2015-06-11 11:20:21 -05:00
Roger Ferrel
3ec2a46074
Omaha #4515 Removal of no longer needed xmit field.
...
Change-Id: I73580d7776702c56c656db769f64e2eaa5a03eed
Former-commit-id: 3c26b3056dd8ff2c4937386d7046df41b7d6b02f
2015-06-10 08:35:03 -05:00
Benjamin Phillippe
b7f690d752
Omaha #4448 Changed integervalue column of ebxml.value to bigint
...
Former-commit-id: 7a7d4bdb43e7d72fa1c5adf060a95bd39e969725
2015-06-09 12:54:44 -05:00
Roger Ferrel
2deae07c1a
Omaha #4537 HRRR changes for product and volume browsers.
...
Former-commit-id: c769d769937c38842b1f07479fb3306199b27e53
2015-06-08 16:51:29 -05:00
Steve Harris
4de63454fc
Merge tag 'OB_15.1.1-16' into omaha_16.1.1
...
15.1.1-16
Conflicts:
cave/com.raytheon.viz.gfe/build.properties
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
2015-06-05 15:38:00 -05:00
Fay.Liang
a9a5aa6f70
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 6c8e5f9fba2f3f080287da9931dcbe1dee2545c6
2015-06-01 08:59:15 -04:00
Fay.Liang
38f31456ac
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: a9a5aa6f70
[formerly 6c8e5f9fba2f3f080287da9931dcbe1dee2545c6]
Former-commit-id: 897194214e
2015-06-01 08:59:15 -04:00
Fay.Liang
31496dac17
Merge tag 'OB_14.4.1-47' into int_15.1.1
...
14.4.1-47
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 602505383d4a1ec8a2cea08f94b7350cabae39b7
2015-05-29 15:42:40 -04:00
Fay.Liang
fc4955ec2b
Merge tag 'OB_14.4.1-47' into int_15.1.1
...
14.4.1-47
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 31496dac17
[formerly 602505383d4a1ec8a2cea08f94b7350cabae39b7]
Former-commit-id: 3a354bf7fb
2015-05-29 15:42:40 -04:00
Ron Anderson
66fa7c5132
Omaha #4522 Remove unnecessary command line parameters from delta script
...
Change-Id: If29e42102e2f5626f4bb0815e177d6c8d27987bd
Former-commit-id: 192cebd07f0f2195b8775afe66c5cca40828289d
2015-05-28 11:17:55 -05:00
Ron Anderson
90568a7fe8
Omaha #4522 Remove unnecessary command line parameters from delta script
...
Change-Id: If29e42102e2f5626f4bb0815e177d6c8d27987bd
Former-commit-id: 66fa7c5132
[formerly 192cebd07f0f2195b8775afe66c5cca40828289d]
Former-commit-id: 3cb3198666
2015-05-28 11:17:55 -05:00
Ron Anderson
75c224ead5
Omaha #4522 Add proper primary key to active table
...
Change-Id: Id1c6f4ce0b317211e3a1eed0240f2463bd842f40
Former-commit-id: 99243fee7951395b37730327a19c6391832cbc36
2015-05-27 13:56:14 -05:00
Ron Anderson
7bd2279d70
Omaha #4522 Add proper primary key to active table
...
Change-Id: Id1c6f4ce0b317211e3a1eed0240f2463bd842f40
Former-commit-id: 75c224ead5
[formerly 99243fee7951395b37730327a19c6391832cbc36]
Former-commit-id: f7d30d71bd
2015-05-27 13:56:14 -05:00
Slav Korolev
497fe6e160
Omaha #4380 - Added new hydro forecast issuance stage and flow
...
Former-commit-id: 544d831ab3467af567ced94f97fe479b667d915c
2015-05-21 08:57:22 -04:00
Steve Harris
9b3d8a8443
Merge tag 'OB_15.1.1-12' into omaha_16.1.1
...
15.1.1-12
Conflicts:
build/deploy.edex.awips2/esb/bin/setup.env
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.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/smartinit/Init.py
Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
Shawn.Hooper
003c528458
ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
...
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39
Former-commit-id: 721a43ed8a1c9fdd1e5c62827869a91a20bfb416
2015-05-12 11:30:23 -04:00
Shawn.Hooper
bb399532ea
ASM #17024 - Merge up to 14.4.1-38 into 15.1.1-10
...
Change-Id: Id4091550082328ce8a682db5ddd1a133fb7a5d39
Former-commit-id: 003c528458
[formerly 721a43ed8a1c9fdd1e5c62827869a91a20bfb416]
Former-commit-id: 292c824c03
2015-05-12 11:30:23 -04:00
Nate Jensen
7cc5e276a2
Omaha #3299 improved delta scripts from swebb
...
Change-Id: I00102c5951dd6bf72ba0802820333d1290a11cf1
Former-commit-id: c62e7b35374988f78dc63d5bc30102069d747298
2015-05-11 09:00:44 -05:00
Nate Jensen
94b9d7f11a
Omaha #3299 improved delta scripts from swebb
...
Change-Id: I00102c5951dd6bf72ba0802820333d1290a11cf1
Former-commit-id: 7cc5e276a2
[formerly c62e7b35374988f78dc63d5bc30102069d747298]
Former-commit-id: d2b63076c0
2015-05-11 09:00:44 -05:00
Robert Blum
b92be50c36
Omaha #4479 Delta Script for adding column to HS productData table.
...
Former-commit-id: 763a8264f47a7bf5f5b3924d5d0c81cdf0a5502e
2015-05-08 10:20:07 -05:00
Dave Hladky
a5cf15a518
Omaha #4381 Fixed guava message not being delivered, store table column not large enough.
...
Change-Id: I6e8d49321accd1efb3f1b694a936ac52bbd0fbfa
Former-commit-id: effffdcbd158dcf977ac7d7af928e42f448f0156
2015-05-06 12:59:17 -05:00
Roger Ferrel
c8a7c14fbd
Omaha #4462 delta script of populat blank sites' in stdtextproducts table.
...
Former-commit-id: 8845b12e74bd6183f86cdc998b2fde24dc9bf923
2015-05-05 15:43:38 -05:00
Roger Ferrel
2fbef85b74
Omaha #4462 delta script of populat blank sites' in stdtextproducts table.
...
Former-commit-id: c8a7c14fbd
[formerly 8845b12e74bd6183f86cdc998b2fde24dc9bf923]
Former-commit-id: 1b96c6acc7
2015-05-05 15:43:38 -05:00
Steve Harris
815a30871b
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
Former-commit-id: c6156764c2c4fb068f994cbb17d1f373d75f7070
2015-05-05 09:19:28 -05:00
Shawn.Hooper
48e06c41ad
ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33
...
Merge 14.4.1-33 into 15.1.1-8
Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c
Former-commit-id: 1f63e395c67afa5106bde7b96b72d4b3111221d3
2015-05-01 16:12:48 -04:00
Shawn.Hooper
d18a2fea70
ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33
...
Merge 14.4.1-33 into 15.1.1-8
Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c
Former-commit-id: 48e06c41ad
[formerly 1f63e395c67afa5106bde7b96b72d4b3111221d3]
Former-commit-id: 7eac415eaa
2015-05-01 16:12:48 -04:00
Fay.Liang
8447b70f93
Merge tag 'OB_14.3.3-7' into master_14.4.1
...
14.3.3-7
Former-commit-id: d1529f1c72bdf5a69ac611e0e93d936b6dc898f5
2015-04-27 10:20:49 -04:00
Fay.Liang
8de59f59fb
Merge tag 'OB_14.3.3-7' into master_14.4.1
...
14.3.3-7
Former-commit-id: 8447b70f93
[formerly d1529f1c72bdf5a69ac611e0e93d936b6dc898f5]
Former-commit-id: 6fc5cf9230
2015-04-27 10:20:49 -04:00
Rici.Yu
309b751381
ASM #17194 - add delta script to create/delete non-base files
...
Change-Id: Ic3dabdf70715b1b385b4cbc31aad805b937a4ba6
Former-commit-id: ea060273f714503a80f43ad2310a6b882cb8ab11
2015-04-24 15:35:56 -04:00
Rici.Yu
d3394c40ad
ASM #17194 - add delta script to create/delete non-base files
...
Change-Id: Ic3dabdf70715b1b385b4cbc31aad805b937a4ba6
Former-commit-id: 309b751381
[formerly ea060273f714503a80f43ad2310a6b882cb8ab11]
Former-commit-id: 620d6d007f
2015-04-24 15:35:56 -04:00
Steve Harris
5932df4786
Merge tag 'OB_15.1.1-6' into omaha_16.1.1
...
15.1.1-5
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
Former-commit-id: 97efa605a593b2ce6c9a9a97192ecc5223511e88
2015-04-20 08:09:45 -05:00
Steve Harris
4055d9135b
Merge tag 'OB_15.1.1-6' into omaha_15.1.1
...
15.1.1-5
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 830ba31d4a66ea4e3994ba136b5bed0f03a9d246
2015-04-20 08:00:07 -05:00
Steve Harris
4b51c7e49c
Merge tag 'OB_15.1.1-6' into omaha_15.1.1
...
15.1.1-5
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 4055d9135b
[formerly 830ba31d4a66ea4e3994ba136b5bed0f03a9d246]
Former-commit-id: 5b3c7a92b3
2015-04-20 08:00:07 -05:00
Steve Harris
7ec7cdf232
Merge tag 'OB_15.1.1-4' into omaha_16.1.1
...
15.1.1-4
Former-commit-id: c9f9bc2c612dae6d355fb3c5de313aa7274adc8b
2015-04-13 12:22:22 -05:00
Steve Harris
0db5e1ec86
Merge tag 'OB_15.1.1-4' into omaha_15.1.1
...
15.1.1-4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 8e57da4bb70fda78c3aaa91add874cd403286939
2015-04-13 12:13:02 -05:00
Steve Harris
1686645cdc
Merge tag 'OB_15.1.1-4' into omaha_15.1.1
...
15.1.1-4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 0db5e1ec86
[formerly 8e57da4bb70fda78c3aaa91add874cd403286939]
Former-commit-id: 42f66043f1
2015-04-13 12:13:02 -05:00
Fay.Liang
6cd66bff93
Merge tag 'OB_14.4.1-25' into master_15.1.1
...
This merge includes all changes in 14.4.1-22, -23, -24, and -25
Conflicts:
cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt
Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
2015-04-13 13:02:24 -04:00
Fay.Liang
f9d33d9a7d
Merge tag 'OB_14.4.1-25' into master_15.1.1
...
This merge includes all changes in 14.4.1-22, -23, -24, and -25
Conflicts:
cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt
Former-commit-id: 6cd66bff93
[formerly 857d0d89ae214ccf53713f74ef6778ba80c637fe]
Former-commit-id: c31d3f0910
2015-04-13 13:02:24 -04:00
Dave Hladky
d8e8abe20a
Omaha #4260 Added default model change script
...
Change-Id: Ibbae932e4832c16aeeb99790edd855a0ad775e84
Former-commit-id: 8fc0b9594a280d4b9b691df40de295e261fb5b24
2015-04-13 08:15:57 -05:00
Dave Hladky
45bfe27a59
Omaha #4260 Added default model change script
...
Change-Id: Ibbae932e4832c16aeeb99790edd855a0ad775e84
Former-commit-id: d8e8abe20a
[formerly 8fc0b9594a280d4b9b691df40de295e261fb5b24]
Former-commit-id: abfc0f513b
2015-04-13 08:15:57 -05:00
Fay.Liang
7349df3d27
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config
Former-commit-id: 9742125df2b54fe54e1e06dba554de21db52f5a0
2015-04-08 12:22:27 -04:00
Fay.Liang
9d752cfc41
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config
Former-commit-id: 7349df3d27
[formerly 9742125df2b54fe54e1e06dba554de21db52f5a0]
Former-commit-id: b0d72bf798
2015-04-08 12:22:27 -04:00
Richard Peter
4cd1e48fc9
Omaha #3722 - Update taf datauri fields to not be null in db.
...
Change-Id: I47aef4a6775e91a0d3b749252cf3726e38d6308e
Former-commit-id: 073e73dd86aee3c6d1731def225aad038cf877de
2015-04-02 13:41:00 -05:00