Ron Anderson
|
2a482bac00
|
Omaha #4547 Fix letter case in nonCOnvectiveFlashFloodWarningFollowup.vm
Change-Id: I3a79c15b430cd65f9f8618be91adf6cc0a7b5dac
Former-commit-id: 9d7fb2c428199d0484c9889af18c02947d0e706c
|
2015-09-16 14:38:18 -05:00 |
|
Ron Anderson
|
5aadd51c5e
|
Omaha #4547 Fixed CTA heading in arealFloodWarning.vm
Change-Id: I4c6745ef9750c9bfd45bf27fbf3bc5c3a0a9bf47
Former-commit-id: a045db497ccdcd9148916a7ff8017288fdbe3607
|
2015-09-16 09:19:08 -05:00 |
|
Steve Harris
|
8f54379d58
|
Merge tag 'OB_16.1.1-11' into omaha_16.1.1
16.1.1-11
Former-commit-id: 5f39908c1c626e93fdd0ed1aabfd4dabba14a540
|
2015-09-15 15:35:34 -05:00 |
|
Richard Peter
|
600b2a7bdf
|
Omaha #4846 - Fix GAFFDB sql grammar
Change-Id: Iccf1a1b604c8f903b506c20b9fd50162ea9c35ea
Former-commit-id: 8e1c394eb1ccf6d81ebd950a3fd478237f09b51d
|
2015-09-08 13:59:20 -05:00 |
|
Dave Hladky
|
aefdedeb49
|
Omaha #4774 removed com.raytheon.uf.edex.registry.request jar reference from edex registry server feature
Former-commit-id: 9e1e5203f5907005fc0377255234bd08fcfd331a
|
2015-09-03 09:24:41 -05:00 |
|
Steve Harris
|
64eded41d2
|
Merge tag 'OB_16.1.1-9' into omaha_16.1.1
16.1.1-9
Former-commit-id: 165346de36e595241b3969d668961c1763afb025
|
2015-09-01 16:01:02 -05:00 |
|
Shawn.Hooper
|
68db1d660f
|
Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: 0d7cc63f398d9d948ff81948f54684a0c553532a
|
2015-09-01 16:35:03 -04:00 |
|
Shawn.Hooper
|
06ed6117c1
|
Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: 48b3d8dd00136b08c400686303c4df3eadd2b55b
|
2015-09-01 16:16:26 -04:00 |
|
Dave Hladky
|
0de9dd780d
|
Omaha #4774 Added additional bean to ebxml-modes.xml
Former-commit-id: 9323b1dc3277322f375f12bacd15ef8c4bd0c4a5
|
2015-09-01 14:33:19 -05:00 |
|
Matthew Howard
|
6a1d6249a8
|
Merge "ASM #17443 Bug in scripts results in rsync_parms.ccc file not getting used" into asm_16.1.1
Former-commit-id: d96d7a7757a1356c739fde8d21688f28e1645415
|
2015-08-31 11:07:23 -05:00 |
|
Ying-Lian.Shi
|
c5fac6ac6a
|
ASM #17443 Bug in scripts results in rsync_parms.ccc file not getting used
Change-Id: Ie8d92183633ea258cb123a9eb9b73f263f709f09
Former-commit-id: 8b8ebbe8975f5f3b012b22606b259ed2cf877eef
|
2015-08-31 15:15:45 +00:00 |
|
Shawn.Hooper
|
db4b18db3a
|
Merge branch 'master_16.1.1' into asm_16.1.1
Former-commit-id: cf6eed082bf8d7252952225a4e6f4f155c106a67
|
2015-08-27 16:05:42 -04:00 |
|
Shawn.Hooper
|
90b248db2a
|
Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: c5d332ccda6c6eeebb523f4cd950f9d1b066107f
|
2015-08-27 15:44:03 -04:00 |
|
Ron Anderson
|
a7d109fae7
|
Merge "Omaha #4812 Fixed sendGridsToNDFD" into omaha_16.1.1
Former-commit-id: 649c921c381c0c1ce863bf1e5dbb715676f7b51d
|
2015-08-27 14:40:49 -05:00 |
|
Ron Anderson
|
cee3eef805
|
Omaha #4812 Fixed sendGridsToNDFD
Change-Id: I1df29706f60b4d15fb2ab58ba8f7dfd40e77e248
Former-commit-id: 43c26891790f85a67aba894a0428fa8239b0d972
|
2015-08-27 14:30:12 -05:00 |
|
Dave Hladky
|
d8dd0ec166
|
Omaha #4774 Separation of features for dual local and multiple deployments.
Change-Id: I8333333ade7b14624daec3d91fa8553041b736ed
Former-commit-id: 050cdd0d8ae6e4b7ac5ca6a450ae2c8bc1f89ec6
|
2015-08-27 14:02:02 -05:00 |
|
Melissa Porricel
|
752f55f745
|
ASM #17959 - EDEX unable to ingest raw dual pol products
Change-Id: I337038a1360a7e1179bdd2ae5b8776436c45fb93
Former-commit-id: 56233e7cca8108ab018d842ba82f9a6c88f0552d
|
2015-08-27 13:55:03 -04:00 |
|
Dave Hladky
|
e7def35ab3
|
Omaha #4774 added .project file
Former-commit-id: 049078d87cc5563f0d0d5316260aaea361a723c8
|
2015-08-27 11:20:22 -05:00 |
|
Yun.Teng
|
a68697ffce
|
ASM #17647 - Correct end time of grid from ViewWCL procedure
Change-Id: I854ed40bd21e4286263eb70f08be9b236ec184fe
Former-commit-id: 2f61d67b2949ce1ae504531ca3849b9efac27753
|
2015-08-26 20:25:55 +01:00 |
|
Dave Hladky
|
0a29df8b76
|
Omaha #4774 plugin placement wrong.
Former-commit-id: 6d126dc07df8f12aace4e96bebe89da50c72378c
|
2015-08-25 12:51:33 -05:00 |
|
Dave Hladky
|
3a9febd758
|
Omaha #4774 Fixed deployment bug for DD and HS
Change-Id: I76b34d0f0f657b11990f5fd1a9d77733b48791e2
Former-commit-id: ac5a683b9a945c88fbb8a10ac7a363e335a71941
|
2015-08-24 15:23:49 -05:00 |
|
Bryan Kowal
|
f78f5a9680
|
Merge "Omaha #4735 - added missing includes to hydro modes for ALR EDEX." into omaha_16.1.1
Former-commit-id: cfbeee73ef5dd115c004c0386d9bfd363ef3b269
|
2015-08-24 14:25:12 -05:00 |
|
Bryan Kowal
|
db52a9bc15
|
Omaha #4735 - added missing includes to hydro modes for ALR EDEX.
Former-commit-id: f944294e35cc09bf7f9863d4762f48f102686ed9
|
2015-08-24 10:40:00 -05:00 |
|
Mark Peters
|
409baa5ba6
|
Omaha #4409 Alias geometry column names to make sure all requested columns are unique
Change-Id: Ida92adaf87fae3e082a7ed161ab4725ee5fb0b61
Former-commit-id: 8e593a05b3872e19bd0bbcc35fed8b557a578484
|
2015-08-21 15:47:45 -05:00 |
|
Shawn.Hooper
|
24a6a476f8
|
Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: fcf60cfd5d3e5d9e64b5ea4d85bd85908de2b254
|
2015-08-21 11:16:20 -04:00 |
|
Shawn.Hooper
|
5759470634
|
Merge tag 'OB_15.1.1-32' into master_16.1.1
15.1.1-32
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MakeHazard.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
Former-commit-id: f925ff11b783389e5ca32a2d7cd1ec5edfa835db
|
2015-08-19 14:58:31 -04:00 |
|
Steve Harris
|
d6ab160019
|
Merge tag 'OB_16.1.1-6' into omaha_16.1.1
16.1.1-6
Former-commit-id: 002910fe88718d1801018450799a658b42a6a696
|
2015-08-19 13:40:43 -05:00 |
|
Roger Ferrel
|
e6962d2c5e
|
Omaha #4753 Fix accidental rename of BL0180.
Former-commit-id: c7c625229e440115f0d8d80e174ed811b0fd0666
|
2015-08-17 11:03:52 -05:00 |
|
Shawn.Hooper
|
236f89aa25
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 18f49fbd5db098a59e0366c3c59d803da8ab6a4a
|
2015-08-13 15:40:14 -04:00 |
|
Shawn.Hooper
|
77b4ce8a0b
|
Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: c199e711f1d1141a00876f4c93afdb2e6a7777b2
|
2015-08-13 14:34:17 -04:00 |
|
Sean.Webb
|
fb78df96fc
|
ASM #17882 - Added -q to ssh command
Change-Id: I77618654b2947fd2e9cb7b8bcb3f0aa3499832e0
Former-commit-id: 06e53fa398363b0ea64b6d9c3fdd4c666890a024
|
2015-08-13 12:16:11 -04:00 |
|
Shawn.Hooper
|
2aa45202ab
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: ee7e901bc1e9935b3afee7964cd6f6853121c97b
|
2015-08-12 12:52:01 -04:00 |
|
Matthew Howard
|
952a221aa0
|
Merge "ASM #17443 GFE Svcbu: Bug in scripts results in rsync_parms.ccc file not getting used" into asm_16.1.1
Former-commit-id: ce62c37738eb4483ea2e79ac96d4b0e5377393d9
|
2015-08-12 09:34:50 -05:00 |
|
Juliya Dynina
|
623125479e
|
Merge "ASM #17841 - WarnGen can format a duplicate second time zone time" into asm_15.1.1
Former-commit-id: 260760387303ed41084aa2d8513ae4d37bab2611
|
2015-08-12 07:17:28 -05:00 |
|
David Friedman
|
bf77ad45c5
|
ASM #17841 - WarnGen can format a duplicate second time zone time
Change-Id: Ib6462575756af85757f1c4de79f4936c10300b48
Former-commit-id: 2bcda119b2d8cfb9b831868b4ef4df4b3fcae9f6
|
2015-08-11 21:08:17 +00:00 |
|
Shawn.Hooper
|
6c30246931
|
ASM #17883 - Update mping feature.xml file
Change-Id: I44fb67d8d86c3eca661bcd09814b736794bacb47
Former-commit-id: 34c8d2ef320b0d8336f8ae3da9ba803f7ee66265
|
2015-08-11 16:17:31 -04:00 |
|
Sean.Webb
|
63d34b08dc
|
Merge "ASM #17882 - Changed scp commands to scp -q" into asm_15.1.1
Former-commit-id: dd0a7086a5cc5c829a1c31853d5022f47f8bbb93
|
2015-08-11 14:17:02 -05:00 |
|
Sean.Webb
|
b2ef13cb19
|
ASM #17882 - Changed scp commands to scp -q
Change-Id: Ibb9032c38e13191e2b45ea18419d321c338608fc
Former-commit-id: d6c03b3f9a8e4d4fcb6819c802fe0c1d53e6d448
|
2015-08-11 14:09:01 -04:00 |
|
David Friedman
|
98489c92c4
|
ASM #17672 - (Additional fix for TDWR)
Change-Id: Id256bc4a6a8dcbe19cdda7d4ba77950065639ede
Former-commit-id: 8ed4346813b2a4d5ddd810098707f67eb80e3e44
|
2015-08-10 21:08:13 +00:00 |
|
Ying-Lian.Shi
|
4d892154a5
|
ASM #17443 GFE Svcbu: Bug in scripts results in rsync_parms.ccc file not getting used
Change-Id: Ie4b48937b845165a3e4c4508abb0e322474193f4
Former-commit-id: 2ad5b3868b58bb8b48860ddd1bea94887f42df58
|
2015-08-10 18:09:27 +00:00 |
|
Ron Anderson
|
ea8812f51c
|
Omaha #4547 More template fixes
Change-Id: Ifbf3341f669682157fd95d64bcccfd7c1b4243e7
Former-commit-id: 5a02fe4695575b841675dfde6ec3a7ce38c028b8
|
2015-08-10 11:58:14 -05:00 |
|
Shawn.Hooper
|
ffd636edc2
|
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: c445946349f2bb2e6adeeed23f55d37727db8b04
|
2015-08-06 10:27:01 -04:00 |
|
Shawn.Hooper
|
1aaa183f60
|
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: e012c671990c5c629048f88f5bac9eedbf048593
|
2015-08-05 09:40:15 -04:00 |
|
Steve Harris
|
d69d6103ca
|
Merge tag 'OB_15.1.1-28' into omaha_15.1.1
15.1.1-28
Former-commit-id: 41d9ebaa99304437132ec599c5c30967960272c9
|
2015-08-05 08:33:13 -05:00 |
|
Steve Harris
|
380c76a769
|
Merge tag 'OB_16.1.1-3' into omaha_16.1.1
16.1.1-3
Former-commit-id: cf16b85be683f57537a2913627489d9c490a972b
|
2015-08-04 12:53:30 -05:00 |
|
Steve Harris
|
7b0c814fd0
|
Merge tag 'OB_16.1.1-2' into omaha_16.1.1
16.1.1-2
Former-commit-id: afbe137f83e60abbabd7a38890a1d3bde5f96555
|
2015-08-03 16:39:02 -05:00 |
|
Fay.Liang
|
5c5bc3a5b5
|
Merge branch 'field_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
Former-commit-id: 061ce49506ae6b538dad609a3be711aec3efae80
|
2015-07-31 16:53:30 -04:00 |
|
Fay.Liang
|
b60abcd015
|
Merge branch 'ncep_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
Former-commit-id: e1a18a5546a67d11e9ba48a7a00646c1a0d08249
|
2015-07-31 16:12:28 -04:00 |
|
Fay.Liang
|
e0b8b2f813
|
Merge remote-tracking branch 'origin/master_14.4.2' into master_15.1.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: 39babf90e69c4b8d3319cc385bb6a19bb3f93aad
|
2015-07-31 09:56:36 -04: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 |
|