Brian.Dyke
|
c5e29cc46a
|
Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: bdda2e9a7a [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]
Former-commit-id: 35b637c3e2
|
2014-04-29 12:07:21 -04:00 |
|
Brian.Dyke
|
a5c9321a8d
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: ac74878ae2 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]
Former-commit-id: a61af3e6d3
|
2014-04-24 13:28:31 -04:00 |
|
Brian.Dyke
|
88d44a3129
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: a7c9ddc05e [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]
Former-commit-id: 2a4fe3dbae
|
2014-04-23 14:05:50 -04:00 |
|
Ron Anderson
|
db978fff9a
|
Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052
Former-commit-id: 859d709a03 [formerly 6f141288cae462aac8c1ea8c77dd7f88a33c382a]
Former-commit-id: b12a6cd828
|
2014-04-22 14:38:54 -05:00 |
|
Zhidong.Hao
|
f16936223a
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: 0177756f97 [formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]
Former-commit-id: e1d5aa284d
|
2014-04-22 14:31:14 -04:00 |
|
Dave Hladky
|
91bd735d47
|
Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]
Former-commit-id: 61fc2fea51
|
2014-04-21 12:26:47 -05:00 |
|
Richard Peter
|
dc41da4a65
|
Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
Former-commit-id: 1e33125cb7 [formerly 8b8523aa60fa649a3208a5f3ae7dcb1fded3f0e6]
Former-commit-id: 9dc957f1a1
|
2014-04-18 15:15:13 -05:00 |
|
Benjamin Phillippe
|
b0d162ccba
|
Issue #3011 Fixed slot cleanup
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: b86fae838f [formerly 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983]
Former-commit-id: b2686e46cf
|
2014-04-18 15:10:46 -05:00 |
|
Brian.Dyke
|
3b90abdf7a
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 9943a331c3 [formerly d07d06f5e4b3c1dbf7d165ad97b9b114a4819011]
Former-commit-id: 880329e4ae
|
2014-04-18 07:53:10 -04:00 |
|
Brian.Dyke
|
53ce26a9b6
|
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
Former-commit-id: 645fe64a4a [formerly 178acb792036869e903beea636c7216e1d3a4f58]
Former-commit-id: 1aec3b3698
|
2014-04-17 14:42:44 -04:00 |
|
Brian.Dyke
|
9df6fb2d4d
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]
Former-commit-id: 12a482e1d7
|
2014-04-17 14:42:35 -04:00 |
|
Nate Jensen
|
9ebedf0b98
|
Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
Former-commit-id: e0ae9e5f8f [formerly 8e8bc62e063da4a8a864496ac6dbd73e798e45ed]
Former-commit-id: d121f07e76
|
2014-04-16 08:41:54 -05:00 |
|
Ron Anderson
|
2a68e875a5
|
Issue #3016 Fix ColormappedImage and ColorMapper.
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: 9f085a0856 [formerly f7d07544e07552c7fccf744c269ee4aa54dc745c]
Former-commit-id: 6e0147169f
|
2014-04-15 17:22:12 -05:00 |
|
Ben Steffensmeier
|
49ca556b33
|
Issue #3017 Update SatSpatialFactory to have more specific methods.
Former-commit-id: 6ea38cfbb2 [formerly 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc]
Former-commit-id: ecbe6fd2d7
|
2014-04-15 13:29:05 -05:00 |
|
Steve Harris
|
9132d9004e
|
Merge branch 'master_14.2.1' (14.2.1-17,18) into omaha_14.2.1
Former-commit-id: 5bf5bdb6b0 [formerly f4c8ce899d312b389aff32d052564559e79904be]
Former-commit-id: eb2f2865fe
|
2014-04-15 09:39:33 -05:00 |
|
Benjamin Phillippe
|
490413551b
|
Issue #3011 Fixed replication slowdown
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 62062bf288 [formerly 92c584179ddbad65c115092d3bf82ca6fe114b09]
Former-commit-id: 3db751fc5b
|
2014-04-15 09:15:12 -05:00 |
|
brian.dyke
|
5fc07cafc8
|
Merge branch 'master_14.2.1' into asm_14.2.1
Former-commit-id: a6708cc174 [formerly 14cd23697c705352544609e7ba7a3afdf5d778b1]
Former-commit-id: fb1c399d4d
|
2014-04-14 15:29:23 -04:00 |
|
Zhidong.Hao
|
f5877f5fb0
|
ASM #474 - GFE ISC: AttributeError results in failure to process ISC grid
Change-Id: I5e5681f2647abfcd9cd8d97e6189c484b60e8fe1
Former-commit-id: 9c18f60924 [formerly 015d4307168ca7fbc70bf0ae0e2e9abd24463d90]
Former-commit-id: 0b499061da
|
2014-04-11 15:51:12 -04:00 |
|
Zhidong.Hao
|
48ee7712c7
|
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: Ib6114ba3cf11095fcfc2d89e356db53ca935244c
Former-commit-id: 1a91b820d9 [formerly 30eba1a2397c41fed1b564af4c31791040b14eac]
Former-commit-id: 009c6e067a
|
2014-04-11 15:34:06 -04:00 |
|
Brian.Dyke
|
af5cbe3321
|
ASM #465 - Update capture script to prevent hanging when running psql
Change-Id: I74c9fe349509850522a8bee37f34664559435d3c
Former-commit-id: deff8ed340 [formerly 17ab69323dd1b420662db25e09b05e3408d3f2ab]
Former-commit-id: 192a5513df
|
2014-04-11 11:18:06 -04:00 |
|
Brian.Dyke
|
73be1016c0
|
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: 9cce8eb0d1 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]
Former-commit-id: 8c2f601b59
|
2014-04-10 13:26:42 -04:00 |
|
Richard Peter
|
5676090443
|
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: b15d288530 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]
Former-commit-id: 95eba8dcf6
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
e4136f79dd
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 929b736038 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]
Former-commit-id: 947194c998
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
529059851a
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 79c7ec7ae9 [formerly 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35]
Former-commit-id: 20fef0f15b
|
2014-04-08 13:05:12 -04:00 |
|
Brian.Dyke
|
17477e7db1
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: dd98c213c7 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]
Former-commit-id: 6a28fcb156
|
2014-04-04 12:57:32 -04:00 |
|
Richard Peter
|
bfba75f73f
|
Issue #2509: Fix stitched grid notifications
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: f99875040c [formerly 861f0c09baa01e191b430bce6699c0f1c95a52d2]
Former-commit-id: 53d5000261
|
2014-04-01 14:44:05 -05:00 |
|
David Gillingham
|
402adfeddb
|
Issue #2418: Re-implement GFE support for pSurge 2.0 data to match A1.
Change-Id: I984a4c3e62a1fd5a18610146fa1dd35b9050a8f9
Former-commit-id: 70b28b4e1e [formerly e820f7ea4046e42ae1112fe8b1a0f8455dbc997d]
Former-commit-id: a529bc8cad
|
2014-03-31 15:49:33 -05:00 |
|
David Friedman
|
32a7adbe4b
|
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: f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]
Former-commit-id: fd900e38c2
|
2014-03-27 19:17:03 +00:00 |
|
Brian.Dyke
|
a1b980a15d
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 3b639347f8 [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]
Former-commit-id: 6346c9776b
|
2014-03-27 10:22:26 -04:00 |
|
Steve Harris
|
9cf3600ff6
|
Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: a7efde7cf4 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]
Former-commit-id: 4879520391
|
2014-03-26 15:51:32 -05:00 |
|
Richard Peter
|
6236137635
|
Merge "Issue #2939 Madis data mismatches Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2" into omaha_14.2.1
Former-commit-id: 897980da08 [formerly 5fee1c62ae87e59007b57ba74268b5f272648127]
Former-commit-id: 390e73af44
|
2014-03-24 09:53:13 -05:00 |
|
Dave Hladky
|
39343e1801
|
Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 9f3c5dcc42 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]
Former-commit-id: 3ac04dd071
|
2014-03-24 08:27:12 -05:00 |
|
Mike Duff
|
ff07b90659
|
Issue #2941 - Sort data before returning
Former-commit-id: 4db73e42a5 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]
Former-commit-id: 73a011b940
|
2014-03-24 08:19:21 -05:00 |
|
Brian.Dyke
|
50e5f4f78d
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 07b2e04d7a [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]
Former-commit-id: 06ee9a6384
|
2014-03-24 07:01:29 -04:00 |
|
Brian.Dyke
|
37e9d48d45
|
OB_14.1.1-24 baseline
Former-commit-id: face1ebeeb [formerly 8b1e7457fc58021208e4233502f118cf34df7534]
Former-commit-id: 37b6368268
|
2014-03-21 12:43:50 -04:00 |
|
steve.naples
|
64b19f2e41
|
ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204
Former-commit-id: 1aa970164f [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]
Former-commit-id: d0f4df4ad9
|
2014-03-19 18:16:41 +00:00 |
|
Juliya Dynina
|
34b6972f79
|
Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2
Former-commit-id: 7a14dfb5a9 [formerly 8f842b0defba552ebbbe980b42dfb7618a2a7ccd]
Former-commit-id: 9aa170ca5f
|
2014-03-18 13:52:48 -05:00 |
|
steve.naples
|
46675eec43
|
ASM #338 Updated HRAPCoordinates to not parse whitespace
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6
Former-commit-id: 75e8a907fe [formerly 220ef7b1195366834c9f85b828862f128dd3fea1]
Former-commit-id: 309ff4e7f7
|
2014-03-18 15:40:13 +00:00 |
|
Juliya Dynina
|
30545f79c5
|
Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2
Former-commit-id: ef873880b6 [formerly 0d338537015e8e8a98fa67bc658fa3a4ed0f15f0]
Former-commit-id: 85fd3b3888
|
2014-03-18 08:47:22 -05:00 |
|
Juliya Dynina
|
d6e2b7f741
|
Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
Former-commit-id: 867f00b438 [formerly 669d66d3b8279833df4a361c961c113e653a542d]
Former-commit-id: c735051e00
|
2014-03-18 08:13:51 -05:00 |
|
David Friedman
|
fd203b5999
|
ASM #330 - Fix reloading of TextDB static files
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5
Former-commit-id: decdadce01 [formerly 0a94094f0f140de68da634cbc6c79039507712ca]
Former-commit-id: 15ca9f4dcc
|
2014-03-18 13:12:40 +00:00 |
|
Qinglu.Lin
|
09e90dfe43
|
ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: af82143e84 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]
Former-commit-id: 4b3c821ce0
|
2014-03-17 18:17:49 -04:00 |
|
Brian.Dyke
|
9f332e938c
|
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: 9c412e444e [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]
Former-commit-id: d23acbdd48
|
2014-03-14 11:13:30 -04:00 |
|
Brian.Dyke
|
4e3096631d
|
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: f999e48df0 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]
Former-commit-id: d4b6d22ae2
|
2014-03-14 08:44:39 -04:00 |
|
Brian.Dyke
|
55918ee421
|
OB_14.1.1-23 baseline
Former-commit-id: bc6a7bf946 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]
Former-commit-id: dcc2e4fd61
|
2014-03-14 08:18:16 -04:00 |
|
Ben Steffensmeier
|
e6cd8b3167
|
Issue #2528 Fix satellite units/style.
Former-commit-id: 75120a09cd [formerly 7e38454a31aa55c606c155a108253c0433ecb517]
Former-commit-id: 77041e5b17
|
2014-03-12 14:19:49 -05:00 |
|
Richard Peter
|
e981ce3e36
|
Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1
Former-commit-id: f59d1433db [formerly 555358125bfb925a2c8ed0d393911b4d045d18b1]
Former-commit-id: 18234c5d73
|
2014-03-11 16:43:37 -05:00 |
|
Dave Hladky
|
7cd4304140
|
Issue #2678 end retrieval double clutching
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc
Former-commit-id: 76e216d319 [formerly 31a35e35b75bc9e6efc43af1da0b184c1828ff45]
Former-commit-id: 3500ad262a
|
2014-03-11 15:53:59 -05:00 |
|
David Gillingham
|
e3a3cf7bad
|
Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68
Former-commit-id: 187196b519 [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]
Former-commit-id: b0783b64ce
|
2014-03-11 11:54:25 -05:00 |
|
Juliya Dynina
|
b3ec4c363f
|
Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1
Former-commit-id: 7952862443 [formerly a167748b77baad66784893304a18e8866f5471f1]
Former-commit-id: 6bbd88e62c
|
2014-03-11 09:24:12 -05:00 |
|