Fay.Liang
a204a6210e
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Former-commit-id: 5e481a056337b7f502921886725382258c6e29d1
2015-04-01 13:04:48 -04:00
Nate Jensen
992c55665c
Merge "Omaha #4259 fix pyjlist slice assignment" into omaha_16.1.1
...
Former-commit-id: a54f6a7bd5f638991593ffc1eb2f0a5789d108db
2015-04-01 12:01:32 -05:00
Shawn.Hooper
cc91b1a5df
ASM #14920 - Re-commit original change to Init.py (only file change needed for this DR)
...
Change-Id: I5258489f4eeac43771dccc87a97100676b0bd317
Former-commit-id: 7af1276495ce7f6a1a8cc5679f42e4a64dbd3dff
2015-04-01 12:42:35 -04:00
Shawn.Hooper
714044cb9b
ASM #14920 - Revert "ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly"
...
This reverts commit 3c532660b0
[formerly 5c2d02a67bd5b4594c6d90afcbae4e8159e0edd1].
There were nativeLib files inadvertently committed to this DR.
They will be reverted and only the correct file will be committed.
Change-Id: I72750a5cc4a47603396cf89cd822d7cb0c53f55b
Former-commit-id: aed96fb67913e5a300f5b201838ac3dd96d5f72b
2015-04-01 12:39:52 -04:00
Greg Armendariz
1387d6117e
Omaha #4103 - Remove svcbu.properties from RPM package list
...
Former-commit-id: d2af97d5e158148cdaafb2c619b4f393e99d4483
2015-04-01 11:12:04 -05:00
Bruce.Hundermark
7647f6bc67
ASM #17288 - GFE: Implement missing RTMA/URMA parameters
...
Change-Id: If7824ab1a777d21209750bedf2a6c9cf219eaaf5
Former-commit-id: b3a14027d7b87055b51c7bb8ea85c0a5412c5888
2015-04-01 16:08:41 +00:00
David Gillingham
afc6b45fa0
Omaha #4103 : Create delta script to migrate svcbu.properties file.
...
Change-Id: Id6788242786717c2ebecb96b48061a5f2e41af0a
Former-commit-id: 71a72608de003c45cf6026849b2825d64e8b56b3
2015-04-01 11:00:35 -05:00
Nate Jensen
c272828c3a
Merge "Omaha #4347 Adding delta script for change to HS productData table." into omaha_16.1.1
...
Former-commit-id: d2bdf9275e23d32c899e8607ee333d2b9cf20c7a
2015-04-01 10:59:35 -05:00
Nate Jensen
4d59a38a3d
Omaha #4259 fix pyjlist slice assignment
...
Change-Id: Ida83669d57ee2f135d125071a57e3c5b004e31b1
Former-commit-id: e350bd0098041ef73ea0d9d2db0e1d39e3d24eb5
2015-04-01 10:53:58 -05:00
Nathan Bowler
376bd37137
Omaha #3977 Rename the status handler.
...
Change-Id: I04b861132d4a75e6aad4c40d1534015ed82dabae
Former-commit-id: 7ffc96344ea9787d6dccc8d8ad546a8e2f1d3386
2015-04-01 11:06:58 -04:00
Fay.Liang
77002144a1
Merge tag 'OB_14.4.1-21' into master_15.1.1
...
14.4.1-21
Former-commit-id: f13fe9af9cb5278362da4b3c67c5997b8ecedd1a
2015-04-01 10:27:48 -04:00
Brian Rapp
42d6b54078
ASM #17251 - "Final check-in"
...
Change-Id: Ia349e87470ee17ced61b00b69d3ff2ddfc3d5310
Former-commit-id: 82b137390073bf20e37f4e67bb87b899030d1c6f
2015-03-31 17:04:05 -04:00
Fay.Liang
08b89e7978
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 4a76f9bb72ade29ca23a158c0cb2ef038905fd07
2015-03-31 15:02:33 -04:00
Richard Peter
909aba7276
Merge "Omaha #4319 Set default volumescannumber in upgrade script." into omaha_15.1.1
...
Former-commit-id: 20cedd4cfb5ce55c3407805afa7067b0ea89aa9f
2015-03-31 14:00:37 -05:00
Robert Blum
1c1636971d
Omaha #4347 Adding delta script for change to HS productData table.
...
Change-Id: I8a322ac1ba5784faec7b4567b97791302907473e
Former-commit-id: 594812ef1bd43a898e3ca48c1a8055b0399a9a42
2015-03-31 13:45:15 -05:00
Nathan Bowler
2e18fccee8
Omaha #3977 Limit distance to avoid errors around poles. Better handle invalid geojson files.
...
Change-Id: I59714561a94ff9cfda3c219c8df306defc9c0884
Former-commit-id: 7742820ebb8dbf54d9f2f047645b42b93dbfc7d4
2015-03-31 14:43:20 -04:00
Nate Jensen
2cf7e1e79a
Merge "Omaha #4198 Add User Permissions for editting Hazard Services settings" into omaha_15.1.1
...
Former-commit-id: 9098c246c70ae481b75f7f968f0d3ae0253f2d5c
2015-03-31 10:51:10 -05:00
Nate Jensen
99b5d09d9d
Omaha #4259 native java.util.List support in JEP
...
Change-Id: If0706318fd409884933433a8edf279e1f6659621
Former-commit-id: 4921ee47a87af497fdc2be53f6bde67b857587b8
2015-03-31 10:44:18 -05:00
Ben Steffensmeier
888da5052c
Omaha #4319 Set default volumescannumber in upgrade script.
...
Former-commit-id: 63c6cf4c36b27bd0c9b5c5dd31c4dd463b5c3343
2015-03-31 10:33:12 -05:00
Ron Anderson
cbca87a1b7
Merge "Omaha #4103 : Move svcbu.properties into the localization store." into omaha_15.1.1
...
Former-commit-id: 326344df5c72d2c77f30dd7e6d030e3f9e5aeef5
2015-03-30 16:24:57 -05:00
David Gillingham
806583afd9
Omaha #4103 : Move svcbu.properties into the localization store.
...
Change-Id: I95001ee02f06594b15a451f938736bc7cb93d8be
Former-commit-id: 4b201b0a5cee53f2ffd8427d08252f6d0c83f47c
2015-03-30 16:05:57 -05:00
Chris Cody
dd65f28842
Omaha #4198 Add User Permissions for editting Hazard Services settings
...
Former-commit-id: 34bcb22edb08289c1b4538c3ecafac233f2e9103
2015-03-30 16:04:23 -05:00
Ana Rivera
9172a3bdd4
VLab Issue #7280 - NWPS:Add missing smartinit file (nwpsTrkngCG0.py) and remove extra parenthesis in nwpsCG1.py
...
Change-Id: I4dd0e31e936720c07b40a905017958d3f4def649
Former-commit-id: e3b0aef8afd48c54a3d947e5bbbe67c238f1fdd2
2015-03-30 20:51:57 +00:00
Fay.Liang
133a603566
Merge tag 'OB_14.4.1-20m' into master_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
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: 1d282a64da2998d91040a7c97f2e81beea0a8da4
2015-03-30 14:28:30 -04:00
David Gillingham
2e460f4700
Issue #4344 : Make suggestion blacklist for spellchecker configurable via localization.
...
Change-Id: I1e73afcc2433329bb6b3c3200d776711dc1d7600
Former-commit-id: 44e092d35e214c8f11fedb1c4aee0f78e4f82acc
2015-03-30 11:57:33 -05:00
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
Yun.Teng
db554cf9ce
ASM #17206 - Change some parametes that are not rate parameters
...
Change-Id: I8420e3d3b85e32420c5c91b802f7cdccc035bc2f
Former-commit-id: 23927a6c91076fedc6d53eb5ba2882166814134a
2015-03-30 16:39:34 +01:00
Steve Harris
963f457d65
Omaha #4343 - fixed merge error in p2-build.xml
...
Former-commit-id: c19ced2dcc9642fe2a0fbdf79f9946ae28429b85
2015-03-27 16:04:48 -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
fed293e459
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 61ce9a778c934223e30012c15000bf82f9a19ffe
2015-03-27 15:11: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
Dave Hladky
14a05b15c6
Omaha #4260 Added default Model
...
Former-commit-id: 86b1776063d04edb6133f57fabdaf04840880774
2015-03-27 13:44:17 -05:00
Dave Hladky
8310978ca5
Omaha #4138 Guava name change on Range package
...
Former-commit-id: 9efb67e2e5dceb777a2fd52874f9b7ecb2292693
2015-03-27 13:35:46 -05:00
Ana Rivera
3791f15203
Merge "VLab Issue #7249 - Removed extra dashes from baseTDLSurface.xml commented code; fixes #7249 " into field_15.1.1
...
Former-commit-id: aabaec95f61e69d40604b1e1a0c69d83de4a901a
2015-03-27 18:03:19 +00:00
Richard Peter
d7764b8b3b
Merge "Omaha #4297 - Ingest and display of ECMWF wave guidance" into omaha_16.1.1
...
Former-commit-id: 1d03bd854c76f316a8fdf2418f21571897e8b013
2015-03-27 11:05:11 -05:00
Joshua Watson
216de7743b
VLab Issue #7249 - Removed extra dashes from baseTDLSurface.xml commented code; fixes #7249
...
Change-Id: Ifda3cd240b123f2f82b67e7978d2abfee12b247d
Former-commit-id: d5225988678e3bd26470ceb40a24bb7dc6a58af0
2015-03-27 11:53:52 -04: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
Ron Anderson
ea0b02bedd
Omaha #4027 Convert all GFE text products to mixed case
...
Change-Id: I94275b65e8733d5bed1242f78503f1613b2e0aff
Former-commit-id: 07088e71d78d6302da23683894d96d72e4f69a96
2015-03-26 18:30:39 -05:00
Nathan Bowler
9fbc54b6a8
Omaha #3977 Move damage path to own feature to hopefully fix the build.
...
Change-Id: I0b492538448a2456ff8410c2c460cafa291a030d
Former-commit-id: addfefc19ab515970a64b09ebcca82dde0ba2cf6
2015-03-26 17:04:14 -04:00
Steve Harris
f961e64ca4
Merge "Omaha #4337 - merge modification of logback.xml" into omaha_15.1.1
...
Former-commit-id: 556a47e626b3b90b46ece02451c580d95734377a
2015-03-26 16:02:10 -05:00
Steve Harris
9f26e02dc6
Omaha #4337 - merge modification of logback.xml
...
Former-commit-id: 8f555a33c557fabce3c9035bdd91c8627362cf50
2015-03-26 15:56:04 -05:00
Slav Korolev
5454637848
Omaha #4297 - Ingest and display of ECMWF wave guidance
...
Former-commit-id: 06c58d85cb62fad4fe6fffdcd319fdd9356f1ff7
2015-03-26 14:19:39 -04:00
Matthew Howard
3b1fb9367b
Merge "ASM #17144 - GFE: Add Capabilities for CONUS Real-Time Mesoscale Analysis at 2.5km" into asm_15.1.1
...
Former-commit-id: 6ade9593a6d691196f0092398e88eacb00ae342e
2015-03-26 13:05:33 -05:00
David Gillingham
816605d1f3
Omaha #4324 : Improve handling of all 0s time values in HVTEC strings.
...
Change-Id: Ifc7a4ba47a398e6bdf5ba1ee89568e3445f58ca9
Former-commit-id: a0506466dd82a795937d05793a3fd14119ee0764
2015-03-26 11:45:26 -05:00
Bruce.Hundermark
0e155b267e
ASM #17144 - GFE: Add Capabilities for CONUS Real-Time Mesoscale Analysis at 2.5km
...
Change-Id: I7074e60477da457820615d67b84394afb2cc5d5e
Former-commit-id: d8f747df842ba808a8df09392ff60071b0d3e987
2015-03-26 16:04:33 +00:00
Nate Jensen
146a4e91f1
Merge "Omaha #4319 Save volume scan number" into omaha_15.1.1
...
Former-commit-id: 21c3e07d51bab18272d24cef6baf1dcf615ace69
2015-03-26 10:57:34 -05: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 Gillingham
6569868378
Omaha #4320 : fix grammar error in javadoc.
...
Change-Id: I16dc49753d31f6510d883a4b48421e44d113b428
Former-commit-id: e9f57c24bb73378eef489c56dadf8661979bfdc9
2015-03-26 09:54:49 -05:00