Brian.Dyke
e82fc8f89c
Merged 13.5.5 -2 and -3 into 1412
...
Former-commit-id: 4e921dbeab89e61635144b441ae0015155376c59
2014-04-24 13:01:50 -04:00
Brian.Dyke
a7c9ddc05e
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 64ca88d2ed7de18f9ed1f57edd2286bbc552135f
2014-04-23 14:05:50 -04:00
Ron Anderson
859d709a03
Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
...
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052
Former-commit-id: 6f141288cae462aac8c1ea8c77dd7f88a33c382a
2014-04-22 14:38:54 -05:00
Zhidong.Hao
0177756f97
ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
...
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303
Former-commit-id: 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4
2014-04-22 14:31:14 -04:00
Dave Hladky
45059e722a
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 212e15c397fe22c3bc074e054d608c0094ce8dad
2014-04-21 12:26:47 -05:00
Richard Peter
1e33125cb7
Merge "Issue #3011 Fixed slot cleanup" into omaha_14.2.1
...
Former-commit-id: 8b8523aa60fa649a3208a5f3ae7dcb1fded3f0e6
2014-04-18 15:15:13 -05:00
Benjamin Phillippe
b86fae838f
Issue #3011 Fixed slot cleanup
...
Change-Id: I346b0e2c17bcc0f3bcf946772694c127e8baffa5
Former-commit-id: 4ac3c1a55fe7e99d7e9049ffb401b8ea3caf7983
2014-04-18 15:10:46 -05:00
Steve Harris
5b9cbd8ce4
Merge branch 'master_14.2.2' (14.2.2-4) into omaha_14.2.2
...
Former-commit-id: 26e51b0d60276597388fb3ad49fed4dddaa8a2ca
2014-04-18 14:38:54 -05:00
Brian.Dyke
9943a331c3
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: d07d06f5e4b3c1dbf7d165ad97b9b114a4819011
2014-04-18 07:53:10 -04:00
Brian.Dyke
645fe64a4a
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 178acb792036869e903beea636c7216e1d3a4f58
2014-04-17 14:42:44 -04:00
Brian.Dyke
b8829139a2
Merged 14.2.1 -17, -18 into 1422-3
...
Former-commit-id: 712064db471de93da585f9c765bb4dfbe510df53
2014-04-17 14:42:35 -04:00
Nate Jensen
8ba6b2722d
Issue #3018 addressing code review comments
...
Former-commit-id: 85d9dd0158ab873e1e9b76805853c712bb0c7c2c
2014-04-17 09:28:47 -05:00
Ron Anderson
1ba72371be
Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1
...
Former-commit-id: 6813b32786289503950322c02e32803299566c5d
2014-04-16 18:02:11 -05:00
Nate Jensen
c362af04f3
Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock
...
Former-commit-id: 7384a2d32ef554362a0693038e9b60a589afb86a
2014-04-16 17:25:09 -05:00
Nate Jensen
31fb61e824
Issue #3039 fix ifpImage class cast exception
...
Former-commit-id: a2fd849c603aebacce09662557bf1f008d379982
2014-04-16 16:17:05 -05:00
Brian.Dyke
35ad867281
Merged 13.5.5-1 into 1412
...
Former-commit-id: f44629e87a6401a5b872c050b9cf79defd306171
2014-04-16 12:09:12 -04:00
Nate Jensen
e0ae9e5f8f
Merge "Issue #3017 Update SatSpatialFactory to have more specific methods." into omaha_14.2.1
...
Former-commit-id: 8e8bc62e063da4a8a864496ac6dbd73e798e45ed
2014-04-16 08:41:54 -05:00
Ron Anderson
9f085a0856
Issue #3016 Fix ColormappedImage and ColorMapper.
...
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: f7d07544e07552c7fccf744c269ee4aa54dc745c
2014-04-15 17:22:12 -05:00
Ben Steffensmeier
6ea38cfbb2
Issue #3017 Update SatSpatialFactory to have more specific methods.
...
Former-commit-id: 08555e628c8caa41dc312ed91e3ecc9a39a1b5dc
2014-04-15 13:29:05 -05:00
Steve Harris
5bf5bdb6b0
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
62062bf288
Issue #3011 Fixed replication slowdown
...
Change-Id: I176d5080a5ccd533099c8f84a779b9d6f8340109
Former-commit-id: 92c584179ddbad65c115092d3bf82ca6fe114b09
2014-04-15 09:15:12 -05:00
brian.dyke
a6708cc174
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
9c18f60924
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
1a91b820d9
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
deff8ed340
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
a8d6d58f31
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: 274338d3dfb6a839a59da8740ed968d8f0779d7d
2014-04-11 10:58:48 -04:00
Brian.Dyke
9cce8eb0d1
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
b15d288530
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
Steve Harris
2ea3d45ecc
Merge branch 'master_14.2.2' (14.2.2-3) into omaha_14.2.2
...
Former-commit-id: 0b9acf9e28c1048bd3b98af7c04e6953c8425e81
2014-04-09 13:24:52 -05:00
Brian.Dyke
929b736038
Merged 1354 -7 and -8 into 1412
...
Former-commit-id: 082b54dc10676b7090f8a1c9a01929a6d7da2667
2014-04-09 11:39:07 -04:00
Brian.Dyke
79c7ec7ae9
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 92976dff4bbc7ed3c73600f061b5d8ba58dbeb35
2014-04-08 13:05:12 -04:00
Ben Steffensmeier
000f259cf4
Issue #2973 Use correct area for expanding subgrid requests.
...
Former-commit-id: 3cc81be3ed534aed54bf80b0654f28f7fd86cc8b
2014-04-04 13:17:36 -05:00
Brian.Dyke
dd98c213c7
Merged 1354 -5 and -6 into 1412 based on 1411-25
...
Former-commit-id: 407b42b0eff676a95483e219d6be899e45effd6c
2014-04-04 12:57:32 -04:00
steve.naples
7624f7ab75
ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly.
...
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5
Former-commit-id: 1c71a34944c7d823742b98dc65e19fe1f478eef0
2014-04-04 15:30:18 +00:00
Steve Harris
58b8f72755
Merge branch 'master_14.2.2' (14.2.2-1,2) into omaha_14.2.2
...
Former-commit-id: dd2ee3c6bb1fa1e3f1cde475da50d5e545446ed8
2014-04-03 13:08:28 -05:00
Steve Harris
cb2d69e338
Merge branch 'master_14.2.1' (14.2.1-16) into omaha_14.2.1
...
Former-commit-id: ce1a2d441c1c882209f56fcb82f79edad51ff114
2014-04-03 13:00:11 -05:00
Ron Anderson
d556055299
Issue #2969 Fixed error when Topo parm is unloaded.
...
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5
2014-04-02 09:07:22 -05:00
Greg Armendariz
0d0d7bd513
Merge "Issue #2949 Updated scripts Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80" into omaha_14.2.1
...
Former-commit-id: 8d8277705568c04ac37bbe8f09bf7f38f2f0521f
2014-04-01 19:33:30 -05:00
Richard Peter
f99875040c
Issue #2509 : Fix stitched grid notifications
...
Change-Id: Ib4581f8c8d3f3eae15d22601cfc35732acd849a4
Former-commit-id: 861f0c09baa01e191b430bce6699c0f1c95a52d2
2014-04-01 14:44:05 -05:00
Brian.Dyke
1f5c6139e3
Merge branch 'omaha_14.2.2' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.2 into master_14.2.2
...
Former-commit-id: 5dbe50379db1558323dff2ffdc541cd81adfea4b
2014-04-01 14:29:33 -04:00
Dave Hladky
ede510dd91
Issue #2949 Updated scripts
...
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80
Former-commit-id: afcfc72329522c2d731a4afe9353632effb9cb23
2014-04-01 12:33:48 -05:00
David Gillingham
70b28b4e1e
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
f146c7bcd0
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
3b639347f8
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
e5910b6c60
Merge branch 'master_14.2.2' into omaha_14.2.2
...
Former-commit-id: b0b18895aa445ee9b29674443529558b2141c042
2014-03-26 16:13:59 -05:00
Steve Harris
a7efde7cf4
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
Brian.Dyke
a0e7cb624a
Fixed comment merge conflicts added .gitignore
...
Former-commit-id: 6093428342170b9fd8deb741a5721375e80bc955
2014-03-25 15:41:58 -04:00
Brian.Dyke
074abeb0fa
OB_14.1.1-25 baseline
...
Former-commit-id: dd2417b58b33005985f80cc83b45134132b3e5a1
2014-03-25 13:55:54 -04:00
Richard Peter
897980da08
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
9f3c5dcc42
Issue #2939 Madis data mismatches
...
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 4105db3604440c6c01b99a11fdc0573e6934376c
2014-03-24 08:27:12 -05:00
