Brian Clements
|
42cefd3655
|
Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac
Former-commit-id: ccd1d646a175e6a2493def2fb3a22d7109e225a7
|
2014-10-07 13:28:34 -05:00 |
|
Steve Harris
|
2db03d95b3
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
|
2014-10-06 13:57:59 -05:00 |
|
Nate Jensen
|
de8b9cf0b8
|
Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: 45140e7bd5ac2dcc51351d74dc87119aeac98f3b
|
2014-10-06 11:37:54 -05:00 |
|
Nate Jensen
|
23c5ea21e4
|
Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: 73be758f4ae461539c4a622cf52b7bc73705fc50
|
2014-10-06 09:07:38 -05:00 |
|
Steve Harris
|
2616fe04b6
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd
|
2014-10-03 10:18:34 -05:00 |
|
Brian.Dyke
|
20dd249d2c
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 441fc7561a8526422f9b73b9c47cd220f0babb54
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
f3f95aabb0
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 8fa6749e28cb247ae63307f1423351c23ec0eb87
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
2ac30f6c22
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ece734cb6218a80fa2dda1b3c43673dc5a31bfbb
|
2014-10-02 10:24:04 -04:00 |
|
Nate Jensen
|
33e3281d55
|
Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh
Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662
Former-commit-id: 690868294ab74d5c3b73c12f81534d685bb652aa
|
2014-10-02 08:49:32 -05:00 |
|
Nate Jensen
|
b5d8e0a423
|
Omaha #3675 remove -clean option from installed caves
Change-Id: I2dc8f63d34e4247ebaa26f23c954d082d7bc4419
Former-commit-id: 9519a47ea459390148d07e97189df86e094c037b
|
2014-10-02 08:30:25 -05:00 |
|
Nate Jensen
|
aa43004f85
|
Merge "Omaha #2975 fix mkdirs() bug" into omaha_14.4.1
Former-commit-id: c643d7c706ef39d1c17926b2a99bcfa2e52c3193
|
2014-10-02 07:57:30 -05:00 |
|
Nate Jensen
|
53f2bf8395
|
Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
Former-commit-id: 155fdc66bca15c242345858152fcf0b129e28a6d
|
2014-10-01 15:06:03 -05:00 |
|
Brian.Dyke
|
a4bfbea3c2
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 622e63224b6d6bf1d6ced874658bbd9db381799b
|
2014-10-01 15:36:06 -04:00 |
|
Andrew Benak
|
7c7510d471
|
Omaha #3638 plugin xml for *export.point is now properly included
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909
Former-commit-id: 8c3cb6032fe79f68f24eb5dee7f3a820aa475257
|
2014-10-01 14:30:28 -05:00 |
|
Nate Jensen
|
87d1286a0c
|
Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f
Former-commit-id: 3f63e3887f21b1cb5eb1ea1bb5225f492e161021
|
2014-10-01 14:22:22 -05:00 |
|
Nate Jensen
|
3146dd083c
|
Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: 227ab9d68d59a9899025055a51b278bbcd9123f5
|
2014-10-01 11:55:38 -05:00 |
|
Robert Blum
|
d5994a8a6b
|
Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b
|
2014-10-01 10:22:25 -05:00 |
|
Nate Jensen
|
41427a57bb
|
Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 501aa1ac560f34024ab906391dc8c22c422d8509
|
2014-10-01 09:46:56 -05:00 |
|
dmsys
|
9f4560c480
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
|
2014-09-30 13:45:54 -04:00 |
|
Nate Jensen
|
8c0a087bf0
|
Omaha #3663 move features that contain primarily ncep plugins to ncep
folder
Change-Id: I5d59e1c0618fa26c1f8b3e6f340f255119a72a40
Former-commit-id: f785d88ee1c388b564921c3ecd8c931329639f04
|
2014-09-29 17:24:34 -05:00 |
|
Ron Anderson
|
245804a21a
|
Merge "Omaha #2975 optimize lookup of edit areas and gfe configs" into omaha_14.4.1
Former-commit-id: 918dcb1b91fb45b84a82df42b7fe2d3fc2f86fa0
|
2014-09-29 16:10:37 -05:00 |
|
Steve Harris
|
3b6a8a1447
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
|
2014-09-29 12:58:56 -05:00 |
|
Nate Jensen
|
c3648d1989
|
Omaha #2975 optimize lookup of edit areas and gfe configs
Change-Id: Ic89c84e79a27476ebb28573d49f60429424d4c37
Former-commit-id: 860bcc70144d9a8478aef3cc9ebfe84e98b6c4a7
|
2014-09-29 12:29:25 -05:00 |
|
Ben Steffensmeier
|
5b10ac2f36
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
|
2014-09-29 10:49:14 -05:00 |
|
Brian.Dyke
|
46af1d0857
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
|
2014-09-29 11:20:57 -04:00 |
|
Brian.Dyke
|
142432ba5e
|
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 93ddf672c137c7221e9595e8b5c1b279084cb451
|
2014-09-26 16:14:06 -04:00 |
|
David Friedman
|
05707d0f20
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb
|
2014-09-26 20:05:46 +00:00 |
|
Brian.Dyke
|
f26fe97ec4
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 5b570e5229628de88068edee1c70c26eec13f71a
|
2014-09-26 14:19:03 -04:00 |
|
Brian.Dyke
|
a4f68caac6
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 6ed90023551e25216c10d05f2568593992326900
|
2014-09-26 13:02:49 -04:00 |
|
Brian.Dyke
|
bd983e1932
|
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7
|
2014-09-26 11:47:38 -04:00 |
|
David Friedman
|
db29ec9dec
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: c8aa2fbfc35c872e2d50de2212eaf16db9b5483d
|
2014-09-26 15:13:56 +00:00 |
|
David Friedman
|
c85b0d1cfd
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: 70b520c08670646047ffa753814f98c032938ff8
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
e82f96193e
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: 117c2f072b647e353456832f2f0088d51a660d65
|
2014-09-25 22:10:42 +00:00 |
|
David Friedman
|
8ab4649312
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 5048af915b004067ec8a6e788a0e9ad3e006c9d8
|
2014-09-25 21:07:16 +00:00 |
|
Qinglu.Lin
|
ef851d0016
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: 8b194664458246dad7509c44bcc07480cb088ddd
|
2014-09-25 15:16:42 -04:00 |
|
Ana Rivera
|
a72725f9ef
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: 833cff4f37542078578de96b3b59723f77c31f4c
|
2014-09-25 17:46:53 +00:00 |
|
Nate Jensen
|
987060f56c
|
Omaha #3571 better error handling of invalid geom with map caching
Change-Id: I3947613aab5a7789b32ea1d0e3a8e3091d9690d8
Former-commit-id: 0f2066e985dcbcedd2794ce226232efe999b1312
|
2014-09-25 11:30:27 -05:00 |
|
Nate Jensen
|
174b036c56
|
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
Former-commit-id: e2f23221c3f8301460df2945deb8c760cdf216e9
|
2014-09-25 08:44:50 -05:00 |
|
Slav Korolev
|
ce2ef5019b
|
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
Former-commit-id: d7a921d6206f5b09e7a6784c7e86b9167b74685f
|
2014-09-25 09:02:27 -04:00 |
|
Nate Jensen
|
36556fc48b
|
Omaha #3663 move airep and pirep plguins to ncep features
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219
Former-commit-id: 8f743862722b2af08e6659ca3beb0366095bcf79
|
2014-09-24 15:20:17 -05:00 |
|
Ana Rivera
|
9a0e9b17f4
|
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: 2c16492202230dcbec93cf390b47f400a77a545e
|
2014-09-24 20:11:29 +00:00 |
|
Brian.Dyke
|
87fa32d2d4
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: e04ad21771ce410beb25e15fe300a34796a1a062
|
2014-09-24 11:05:37 -04:00 |
|
Ying-Lian.Shi
|
12c545ef7a
|
ASM #16693 Fix spelling checker swear words
Change-Id: I0a31429fa35a5c5a8f4d2f000021db4e4304de9e
Former-commit-id: 1686a947c8a740c34339d9cf17749a6b92d776ab
|
2014-09-24 12:08:43 +00:00 |
|
Ron Anderson
|
c37618c16c
|
Issue #3648 Improve GFE error handling for getAllAvailableParms.
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf
Former-commit-id: b77b3c916b4dcc9034408220006f941cd301ed3c
|
2014-09-23 18:47:38 -05:00 |
|
Nate Jensen
|
e34c1a6fe8
|
Omaha #3009 make ffmp play nice with collaboration
Change-Id: Iccccec6dbe999d7677520a5b0f0464a2186f8174
Former-commit-id: ac15b82ed3c493a5ea8cca01ba304e95c965365e
|
2014-09-23 15:37:09 -05:00 |
|
David Friedman
|
2ee1ebe72d
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5
|
2014-09-23 18:39:22 +00:00 |
|
Steve Harris
|
b979960b7b
|
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
|
2014-09-23 11:41:10 -05:00 |
|
Lee Venable
|
114010674f
|
Merge "Omaha #3356 remove unnecessary import" into omaha_14.4.1
Former-commit-id: a158d4dbdf27311a04684bbda1afb3991fb0e09a
|
2014-09-23 10:56:20 -05:00 |
|
Nate Jensen
|
568559f2ce
|
Omaha #3356 remove unnecessary import
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac
Former-commit-id: ad3753d57709fe8efeab2fb400d92b6ec61c2a3e
|
2014-09-23 08:21:18 -05:00 |
|
Brian.Dyke
|
7996916e36
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 414a695e6423fa291936d15a999113f4a518b097
|
2014-09-22 16:51:47 -04:00 |
|