Ron Anderson
|
6e0147169f
|
Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: f7d07544e07552c7fccf744c269ee4aa54dc745c
|
2014-04-15 17:22:12 -05:00 |
|
Ben Steffensmeier
|
ecbe6fd2d7
|
Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc
|
2014-04-15 13:29:05 -05:00 |
|
Steve Harris
|
eb2f2865fe
|
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: f4c8ce899d312b389aff32d052564559e79904be
|
2014-04-15 09:39:33 -05:00 |
|
Benjamin Phillippe
|
3db751fc5b
|
Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 92c584179ddbad65c115092d3bf82ca6fe114b09
|
2014-04-15 09:15:12 -05:00 |
|
brian.dyke
|
fb1c399d4d
|
Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: 14cd23697c705352544609e7ba7a3afdf5d778b1
|
2014-04-14 15:29:23 -04:00 |
|
Zhidong.Hao
|
0b499061da
|
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: 015d4307168ca7fbc70bf0ae0e2e9abd24463d90
|
2014-04-11 15:51:12 -04:00 |
|
Zhidong.Hao
|
009c6e067a
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 30eba1a2397c41fed1b564af4c31791040b14eac
|
2014-04-11 15:34:06 -04:00 |
|
Brian.Dyke
|
192a5513df
|
ASM #465 - Update capture script to prevent hanging when running psql
Change-Id: I74c9fe349509850522a8bee37f34664559435d3c
Former-commit-id: 17ab69323dd1b420662db25e09b05e3408d3f2ab
|
2014-04-11 11:18:06 -04:00 |
|
Brian.Dyke
|
8c2f601b59
|
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: 4e5541582b38abcd744cf25549d007c9e8f1a104
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
95eba8dcf6
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
947194c998
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 082b54dc10676b7090f8a1c9a01929a6d7da2667
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
20fef0f15b
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35
|
2014-04-08 13:05:12 -04:00 |
|
Brian.Dyke
|
6a28fcb156
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 407b42b0eff676a95483e219d6be899e45effd6c
|
2014-04-04 12:57:32 -04:00 |
|
Richard Peter
|
53d5000261
|
Issue #2509: Fix stitched grid notifications
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: 861f0c09baa01e191b430bce6699c0f1c95a52d2
|
2014-04-01 14:44:05 -05:00 |
|
David Gillingham
|
a529bc8cad
|
Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: e820f7ea4046e42ae1112fe8b1a0f8455dbc997d
|
2014-03-31 15:49:33 -05:00 |
|
David Friedman
|
fd900e38c2
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: cf35c1870fc4b6b3c2ceaf038274c4701f8046b1
|
2014-03-27 19:17:03 +00:00 |
|
Brian.Dyke
|
6346c9776b
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 3b24535fec4e47c1eb0bb845f77dd2f407ecf412
|
2014-03-27 10:22:26 -04:00 |
|
Steve Harris
|
4879520391
|
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: 42a1ec47aa72a882d0f53f94eba3284dccd89b21
|
2014-03-26 15:51:32 -05:00 |
|
Richard Peter
|
390e73af44
|
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
Former-commit-id: 5fee1c62ae87e59007b57ba74268b5f272648127
|
2014-03-24 09:53:13 -05:00 |
|
Dave Hladky
|
3ac04dd071
|
Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 4105db3604440c6c01b99a11fdc0573e6934376c
|
2014-03-24 08:27:12 -05:00 |
|
Mike Duff
|
73a011b940
|
Issue #2941 - Sort data before returning
Former-commit-id: 6c9ebb120761257af5e8d6ec08fa9634e5e55185
|
2014-03-24 08:19:21 -05:00 |
|
Brian.Dyke
|
06ee9a6384
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 34f830b4933bd6c7149757ce34136c7a18d030bf
|
2014-03-24 07:01:29 -04:00 |
|
Brian.Dyke
|
37b6368268
|
OB_14.1.1-24 baseline
Former-commit-id: 8b1e7457fc58021208e4233502f118cf34df7534
|
2014-03-21 12:43:50 -04:00 |
|
steve.naples
|
d0f4df4ad9
|
ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204
Former-commit-id: e51a12ae977528eb85d2c59505ac5be92d945cfe
|
2014-03-19 18:16:41 +00:00 |
|
Juliya Dynina
|
9aa170ca5f
|
Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2
Former-commit-id: 8f842b0defba552ebbbe980b42dfb7618a2a7ccd
|
2014-03-18 13:52:48 -05:00 |
|
steve.naples
|
309ff4e7f7
|
ASM #338 Updated HRAPCoordinates to not parse whitespace
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6
Former-commit-id: 220ef7b1195366834c9f85b828862f128dd3fea1
|
2014-03-18 15:40:13 +00:00 |
|
Juliya Dynina
|
85fd3b3888
|
Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2
Former-commit-id: 0d338537015e8e8a98fa67bc658fa3a4ed0f15f0
|
2014-03-18 08:47:22 -05:00 |
|
Juliya Dynina
|
c735051e00
|
Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
Former-commit-id: 669d66d3b8279833df4a361c961c113e653a542d
|
2014-03-18 08:13:51 -05:00 |
|
David Friedman
|
15ca9f4dcc
|
ASM #330 - Fix reloading of TextDB static files
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5
Former-commit-id: 0a94094f0f140de68da634cbc6c79039507712ca
|
2014-03-18 13:12:40 +00:00 |
|
Qinglu.Lin
|
4b3c821ce0
|
ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: f114aa5e7348f0feb5d9da66b5cd389dfb21275a
|
2014-03-17 18:17:49 -04:00 |
|
Brian.Dyke
|
d23acbdd48
|
Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 0ea874227f20f9f7fe19fc8371e10711023c3f53
|
2014-03-14 11:13:30 -04:00 |
|
Brian.Dyke
|
d4b6d22ae2
|
Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 3605f0373a6ce7b417d942991e50029c2d0c964b
|
2014-03-14 08:44:39 -04:00 |
|
Brian.Dyke
|
dcc2e4fd61
|
OB_14.1.1-23 baseline
Former-commit-id: b3292d88eee345fca27d9ca645ec2686d0114e5c
|
2014-03-14 08:18:16 -04:00 |
|
Ben Steffensmeier
|
77041e5b17
|
Issue #2528 Fix satellite units/style.
Former-commit-id: 7e38454a31aa55c606c155a108253c0433ecb517
|
2014-03-12 14:19:49 -05:00 |
|
Richard Peter
|
18234c5d73
|
Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
Former-commit-id: 555358125bfb925a2c8ed0d393911b4d045d18b1
|
2014-03-11 16:43:37 -05:00 |
|
Dave Hladky
|
3500ad262a
|
Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: 31a35e35b75bc9e6efc43af1da0b184c1828ff45
|
2014-03-11 15:53:59 -05:00 |
|
David Gillingham
|
b0783b64ce
|
Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68
Former-commit-id: 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7
|
2014-03-11 11:54:25 -05:00 |
|
Juliya Dynina
|
6bbd88e62c
|
Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
Former-commit-id: a167748b77baad66784893304a18e8866f5471f1
|
2014-03-11 09:24:12 -05:00 |
|
brian.dyke
|
654778bb0d
|
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
Former-commit-id: 9dba33a7122e20c0502b2bf8036ec875e957798b
|
2014-03-10 15:36:56 -04:00 |
|
Steve Harris
|
92232fa063
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 81f446dbc2ae8f8c54cba5b29ed57f113d318160
|
2014-03-07 15:16:18 -06:00 |
|
Shawn.Hooper
|
41a4905f9f
|
ASM #224 - WarnGen: OB13.5.2 Template Errors
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28
Former-commit-id: b18b8f64040b1c41810f391b8ed785327b6e5d59
|
2014-03-07 14:53:54 -05:00 |
|
David Friedman
|
2c1a3442d6
|
ASM #349 - Workaround for QPID-5569
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: 18d692c17ea11537d0eb832fbe63a04b59b0040c
|
2014-03-07 14:58:09 +00:00 |
|
Steve Harris
|
069093884f
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 889200c9eb3fbb835f8fef067476799f30a7a7e0
|
2014-03-06 08:39:43 -06:00 |
|
Benjamin Phillippe
|
59323be87e
|
Issue #2769: Added batching to registry sync
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db
Former-commit-id: a265027cacde7690171d30455227c5a843e0d397
|
2014-03-04 13:31:41 -06:00 |
|
Richard Peter
|
aa8e1a3625
|
Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
Former-commit-id: 26cbe68f0a86660968016da88a4b51d1735e8227
|
2014-03-04 12:54:23 -06:00 |
|
John.McPherson
|
bdbe5577e9
|
ASM #113 DR 16464 rsync_parms.site may not always exist for Service Backup
Change-Id: I2abbb68dcbd064483a262ddba4b9ab9e0dee211a
Former-commit-id: 4d9b74dc181c359681eda8bae04f7c46f41d5769
|
2014-03-04 17:24:00 +00:00 |
|
Nate Jensen
|
0ec866f1d2
|
Issue #2813 fix subscription package names
Former-commit-id: 081b621b5932d77c03117840e887ed7017f1d48b
|
2014-03-04 10:53:58 -06:00 |
|
Brian.Dyke
|
1d92e5bab6
|
OB_14.1.1-21 baseline
Former-commit-id: d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b
|
2014-03-04 11:47:42 -05:00 |
|
Benjamin Phillippe
|
ed050996a2
|
Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0
Former-commit-id: a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e
|
2014-03-03 10:57:16 -06:00 |
|
Juliya Dynina
|
0130876a7a
|
Merge "ASM #78 - Fix MDCRS display" into asm_14.2.2
Former-commit-id: 081b98f0e1a2dad2d4aff981cbe9980e0c97e12a
|
2014-03-03 11:27:39 -05:00 |
|