Shawn.Hooper
b4597dc021
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
...
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: 968a136e81b6247a03af9b78643c388d21a4218b
2014-04-25 10:40:43 -04:00
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
Dave Hladky
45059e722a
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 212e15c397fe22c3bc074e054d608c0094ce8dad
2014-04-21 12:26:47 -05: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
Ron Anderson
9f085a0856
Issue #3016 Fix ColormappedImage and ColorMapper.
...
Change-Id: Ic4828f393ef628b16a2a29e78446f3569974cc5b
Former-commit-id: f7d07544e07552c7fccf744c269ee4aa54dc745c
2014-04-15 17:22:12 -05: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
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
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
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
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
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
Brian.Dyke
07b2e04d7a
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
face1ebeeb
OB_14.1.1-24 baseline
...
Former-commit-id: 8b1e7457fc58021208e4233502f118cf34df7534
2014-03-21 12:43:50 -04:00
Ben Steffensmeier
effb0bfcd8
Issue #2932 improve compatibility of pop skewT and blended resources.
...
Former-commit-id: 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737
2014-03-20 13:18:40 -05:00
Nate Jensen
82ee3e7104
Issue #2919 fix windows error due to gempak library missing
...
Former-commit-id: 5a2ba132d9e32ce8a018f35ba2524881e5276120
2014-03-20 09:38:07 -05:00
steve.naples
1aa970164f
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
867f00b438
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
Qinglu.Lin
af82143e84
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
Steve Harris
24fe6a248f
Merge branch 'master_14.2.2' into omaha_14.2.2
...
Former-commit-id: 543090e28936ce680e21cda802cfac73ff31ca58
2014-03-17 15:53:31 -05:00
Matthew Howard
1d15cda9fd
Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2
...
Former-commit-id: 1b46d5c169709a9498a5eb9963286a6223089af4
2014-03-14 19:47:32 -05:00
Rici.Yu
58f9857344
ASM #84 - fix default time range for smart tools
...
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99
Former-commit-id: cfb3459d6314afa396c89b90bf42ab539fd15d8c
2014-03-14 14:39:56 -04:00
Brian.Dyke
30084d7f84
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
...
Former-commit-id: 39f4506422c590b7520957923a5b00fd16aa19d0
2014-03-14 10:15:53 -04:00
Brian.Dyke
f999e48df0
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
Kevin P. Johnson
4c833d3389
ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
...
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67
Former-commit-id: fad7cf2e6661aa0bcc9c37499e0560b708f192f0
2014-03-13 20:42:12 +00:00
Juliya Dynina
b296595184
Merge "ASM #380 - Hydro--TimeSeries:error thrown when click Table button" into asm_14.2.2
...
Former-commit-id: f28ab35657154bb028f3ca710ccc0b42d7c04b70
2014-03-12 11:36:38 -05:00
Loubna.Bousaidi
ce2bea0a04
ASM #380 - Hydro--TimeSeries:error thrown when click Table button
...
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09
Former-commit-id: d2161a0fdd0bad7f8266a8b30659021edecaa549
2014-03-11 18:58:26 +00:00
Nate Jensen
afbdf6962c
Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1
...
Former-commit-id: d463531d4cf3bce8862ce1c29b12e9a594d8c63b
2014-03-11 12:35:44 -05:00
Ben Steffensmeier
560fc688bc
Issue #2896 Fix sat best res on weird projections
...
Former-commit-id: 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb
2014-03-11 11:07:43 -05:00
Nate Jensen
5eb892f4cf
Issue #2779 update memory settings for renamed NC perspective
...
Former-commit-id: bc1c10ee0039906ec0b48e834e533332611ac0d3
2014-03-11 10:28:01 -05:00
brian.dyke
b1b216f196
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.naples
20582ab173
ASM #337 MeanMonthlyPrecip updated to handle precip values from PRISM data less than 1 inch.
...
Change-Id: Iffa8644f68df362d4f988fa3d1a9bd16acd4be97
Former-commit-id: cd7d6876338b98c320a8d7559c518e32e90e3000
2014-03-10 17:47:25 +00:00
steve.naples
7432b146ed
ASM #336 MPEFieldResource updated to add case for PRISM data unit conversion.
...
Change-Id: I8f129902079c051ca4fb508e43b8bf892cb19e0e
Former-commit-id: 482547a4f4eaff0fc24b6d3f1103a38a9f3aa314
2014-03-10 17:40:35 +00:00
Nate Jensen
d599db4af2
Issue #2779 add .ini generation of memory settings for other components
...
Former-commit-id: 71a7f485c5a32caeabc98f23164c9fc87cfa1787
2014-03-10 10:03:02 -05:00
Steve Harris
40b543f9a8
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: 81f446dbc2ae8f8c54cba5b29ed57f113d318160
2014-03-07 15:16:18 -06:00
