Nate Jensen
71b4227061
Issue #2060 fill in units on GridRecords created from URIs
...
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 949d132cf3260db5f75ea665f21601ab91440958
2014-05-06 12:26:21 -05:00
Brian.Dyke
238e8f7ba1
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: c6ba49e1206ed113b57a9fa39f5720ee9b3b979a
2014-05-06 11:34:46 -04:00
Richard Peter
501980904d
Issue #3102 : Fix edexBridge connection leak
...
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: 79c52892667d34abb651a36f7f5bd89f4143ffff
2014-05-06 10:32:31 -05:00
Brian.Dyke
90fecdc71e
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
...
Former-commit-id: 9adc24725f9bd3499d8f498990413df7718de83e
2014-05-06 11:25:15 -04:00
Chip Gobs
65d2135ac2
VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168 ) and PostAnalysis (DR #9784 ) )
...
Change-Id: Id96c25de545144d769309fef608c431d67d1bada
Former-commit-id: 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734
2014-05-06 10:48:35 -04:00
Richard Peter
b148d11ec9
Issue #2726 : Autoset route startup order.
...
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc
Former-commit-id: 9b9d2b475f4777febf125e4013cba0d971eaf8e8
2014-05-06 09:46:41 -05:00
Brian Clements
f545c548cc
Issue #3076 added clear all to shared display sessions
...
Former-commit-id: 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb
2014-05-06 09:30:07 -05:00
Lee Venable
a6c2260dd1
Issue #3109 - removed code that sets the Cave cursor.
...
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: d875f73ff44986b2c7862f0dee06504d576fd96b
2014-05-05 16:13:31 -05:00
Melissa Porricel
42c36a5e80
ASM #481 - Add Guam GFSDNG to AWIPS
...
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca
Former-commit-id: 012fa438f085498027402c1cd0897dd13c0d4edc
2014-05-05 14:56:58 -04:00
Sathya.Sankarasubbu
edd543c48d
ASM #560 - LDM 6.11.5 GRIB library causing crash
...
Modified Release number in component.spce from 10 to 11
Change-Id: I2f011e472688fa63d605db5d715f1aef6589a966
Former-commit-id: cdeb7f00af695c6d0a79958af23862bd6f3c7ee5
2014-05-05 14:33:20 -04:00
Nate Jensen
0cf0f724f4
Issue #2060 fix sat precip for grid data URI removal
...
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58
Former-commit-id: cf0bb31583f0ec0b2135aa9101f3247e88e877d0
2014-05-05 13:06:08 -05:00
Dave Hladky
333bf8b36d
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 2e5ee5565d1847490e46c59866b14f77555e2a7e
2014-05-05 12:15:14 -05:00
Qinglu.Lin
18e92f03c1
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
...
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: 66a6c50cd501358e0c8c993631b288aa78dfdc97
2014-05-05 11:54:56 -04:00
Nate Jensen
e9b3041170
Merge "Issue #2956 more safety checks" into omaha_14.3.1
...
Former-commit-id: c4d06eea732629d5fac66593269ec82b9ee6463d
2014-05-05 09:45:11 -05:00
Steve Harris
6ef3b9f1e5
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: c782956ef32875130bd97a0bdbffdf005e1940e3
2014-05-05 08:21:02 -05:00
Xuezhi.Wei
fb359316c8
ASM #579 Shef Ingest ProcessUtil configuration update
...
Change-Id: Idc121a2b4b303e53ac2f9a7fc0dc2cb045b08150
Former-commit-id: ddda775e85dd8cba5f4342de330d1446647c621c
2014-05-02 19:48:55 +00:00
Juliya Dynina
cf742e4dc0
Merge "ASM #545 Hydrobase IngestFilter GUI fixes" into asm_14.3.1
...
Former-commit-id: b2e7c4aa26c341caae58f9007d070c873c2d94ab
2014-05-02 12:37:00 -05:00
Xuezhi.Wei
c4fc2f169b
ASM #545 Hydrobase IngestFilter GUI fixes
...
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8
Former-commit-id: a8710a68e4aa28861c03c5d988bc36a553704c31
2014-05-02 16:55:36 +00:00
Shawn.Hooper
76d4a7ac73
ASM #131 - Additional fix for Lightning Data Decoder
...
Change-Id: I014a5ce61e495c2339f17ef22f706a3ad1a1ee72
Former-commit-id: 4bada72eef85bf38522b40526643ebd8bddc9005
2014-05-02 12:48:18 -04:00
steve.naples
b58b7d3d5a
ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
...
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316
Former-commit-id: 2f608451c941efcc5372f0d0870ac72409f518e3
2014-05-02 16:15:04 +00:00
Richard Peter
dc0b598fd4
Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
...
Former-commit-id: 28b33188773001c34946464093319dc2a1117be9
2014-05-02 10:05:59 -05:00
Richard Peter
51ba60d62b
Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
...
Former-commit-id: cab873d5b9437b8abd22adb65c42b886710e50a9
2014-05-02 10:05:29 -05:00
Richard Peter
478cedd3a3
Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
...
Former-commit-id: f124cee1070a3dd0e09cb54f773f63095f18bd16
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
6bdaba048c
Issue #3095 Update JGridData for creation of numeric java package.
...
Former-commit-id: a3081bf46908788e78c707bf51e08f6c98d997bc
2014-05-01 18:02:08 -05:00
Richard Peter
a9b088146c
Issue #2854 : Pack commons.lang for alertviz
...
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166
Former-commit-id: 7d69b9fdc60b0c07121eab0119cf45b1624653cd
2014-05-01 16:30:21 -05:00
Nate Jensen
f4d20c41f4
Issue #2956 more safety checks
...
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: a24190f35b87351a5f699ac05041bec7a13a1cdb
2014-05-01 16:28:16 -05:00
Nate Jensen
137818d03a
Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
...
Change-Id: I25bd1305568d26940b69565f53a06661955f240b
Former-commit-id: 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64
2014-05-01 16:20:35 -05:00
David Gillingham
aa78ed1b69
Issue #3105 : Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
...
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf
Former-commit-id: 3d8a23e2e2802d19768de47c61cedb723ec53c8f
2014-05-01 16:19:51 -05:00
Matthew Howard
55b1198186
Merge "ASM #507 - Fix incorrect FFMP gap calculation" into asm_14.3.1
...
Former-commit-id: ef1c0313455700304e9dc8e130f2b8658fdd1ed7
2014-05-01 16:07:11 -05:00
Richard Peter
4056f53fa2
Issue #2854 : Fix features.
...
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe
Former-commit-id: 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b
2014-05-01 14:47:41 -05:00
brian.dyke
5d7b8eca6a
Merge branch 'master_14.3.1-3' into asm_14.3.1
...
Former-commit-id: c31c7837568ec4a8fd1516a9e9cd115df30cee40
2014-05-01 15:20:36 -04:00
Ben Steffensmeier
d98bdd64d8
Issue #3100 Time match mosaics on data update.
...
Former-commit-id: 3655558c91224a57a31cfb25389cee33258e0227
2014-05-01 14:17:33 -05:00
Qinglu.Lin
e489658072
ASM #123 Zone UGC line not locked
...
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: 108895dccefb42c71d0f47b13bfd64591e8dca98
2014-05-01 14:49:27 -04:00
Steve Harris
c8ba70a146
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
...
Former-commit-id: 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8
2014-05-01 13:25:15 -05:00
Nate Jensen
b7536a398b
Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
...
Former-commit-id: 1ccbd542f3a5025ba0e0c8d640170972823a583d
2014-05-01 12:40:41 -05:00
Brian Clements
3ca4f8cc52
Issue #2903 changed commons.lang to match other unpacking foss
...
Former-commit-id: ee24eaf54704dcfdf698089a8269e055f7856c80
2014-05-01 12:34:09 -05:00
Bryan Kowal
5eac78f0e0
Issue #3099 - handle empty location name lists in the data request
...
Former-commit-id: 79603ec579d6ebcd1ef707f637e1b207ae18f803
2014-05-01 12:12:42 -05:00
Nate Jensen
7fbdb9ff83
Merge "Issue #2854 : Reorganize deltaScripts" into omaha_14.3.1
...
Former-commit-id: a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2
2014-05-01 12:06:13 -05:00
Nate Jensen
b28e5291d6
Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
...
Former-commit-id: c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa
2014-05-01 11:21:54 -05:00
Nate Jensen
2a0775e748
Issue #3101 safe cast numpy shape values to Number
...
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c
Former-commit-id: 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb
2014-05-01 11:01:37 -05:00
Gang.Zhang
74dc7a5d7c
ASM #507 - Fix incorrect FFMP gap calculation
...
Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25
Former-commit-id: 9b33d5187b4535d5500762e15e35e89ccbf5f5da
2014-05-01 15:49:48 +01:00
Dave Hladky
23433f628d
Issue #2992 Missed perl script
...
Former-commit-id: b2c19dd8cfa3eee138f2b9abf7289d464d94ef46
2014-05-01 08:48:38 -05:00
Greg Armendariz
1e48076fb2
Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
...
Former-commit-id: b4c0a78c01c9048ccac6fcd098d274380159fd0c
2014-04-30 19:34:43 -05:00
Brian Clements
873efa1c64
Issue #2903 set commons.lang to unpack in feature to fix odd bug
...
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help
Former-commit-id: b27a714c2cbdf2f13eb0c494ace4cbd016ef8132
2014-04-30 17:52:43 -05:00
Richard Peter
de9eb60629
Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
...
Former-commit-id: 4e6364a24d5f9354946455218cc394fbda4a11ed
2014-04-30 17:43:50 -05:00
Greg Armendariz
4d76163f10
Merge "Issue #2571 - Update maps.db snapshot and lake shapefile" into omaha_14.3.1
...
Former-commit-id: a93dfbbea0f33fae158cbb1339293334dec0a2c3
2014-04-30 17:42:26 -05:00
Dave Hladky
c352643c79
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a34955102d1316135c4151210daba0e5807ff6c9
2014-04-30 17:38:28 -05:00
Brian Clements
57f5ac701c
Issue #3089 fixed init.d script for collaboration dataserver RPM
...
Former-commit-id: 9cdef44104a7453a4b968afd1f3845b1ba69ba06
2014-04-30 16:41:14 -05:00
Greg Armendariz
4981b6a438
Issue #2571 - Update maps.db snapshot and lake shapefile
...
Former-commit-id: c223bac540568492253cf70a7c7d7521eda3a62d
2014-04-30 15:42:42 -05:00
Nate Jensen
1eade4f434
Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
...
Former-commit-id: aebaae7802e5429eed3ebc39ae9be45568912d8a
2014-04-30 15:16:11 -05:00
