Commit graph

1478 commits

Author SHA1 Message Date
Nate Jensen
f0abb60a1b Issue #1855 fix python threading in GFE procedures and smart tools
Change-Id: I6420338991c1961ce63ff944b516925f83a12994

Former-commit-id: 5c830c3c9c [formerly e3462292ab] [formerly 5c830c3c9c [formerly e3462292ab] [formerly fe24e34163 [formerly c4549e0279a3026adc2f7b40bb272fc4f59acf59]]]
Former-commit-id: fe24e34163
Former-commit-id: 1c6643e7de [formerly e18e798a94]
Former-commit-id: 01b25904ad
2013-04-03 14:33:24 -05:00
Nate Jensen
0e25d15232 Issue #1562 max's fix for topo with custom colormaps
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e

Former-commit-id: d64e0a2a39 [formerly 057a929903] [formerly d64e0a2a39 [formerly 057a929903] [formerly 6c711f037c [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]]
Former-commit-id: 6c711f037c
Former-commit-id: 6ca17c5a2a [formerly 616612e550]
Former-commit-id: fb5bce6afe
2013-04-03 14:10:53 -05:00
Mike Duff
aef1bc779f Issue #1731 - fix problem with dmd updating.
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6

Former-commit-id: c3ab8259d5 [formerly 64cdb3c7fd] [formerly c3ab8259d5 [formerly 64cdb3c7fd] [formerly 23c8085402 [formerly a8c25cfced44c7e3edfd1b37af73b2af8753212b]]]
Former-commit-id: 23c8085402
Former-commit-id: bb14757eed [formerly 3f2f0937ce]
Former-commit-id: 5298fb6633
2013-04-02 16:22:23 -05:00
Steve Harris
e74f4ae39e Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
Conflicts:
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Former-commit-id: 3b722f1076 [formerly 74a47b9bd9] [formerly 3b722f1076 [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]
Former-commit-id: 14c9de2259
Former-commit-id: f85a1ab9ab [formerly a6dd28cc82]
Former-commit-id: 0fee31b1a8
2013-04-01 12:15:04 -05:00
Steve Harris
a112803c98 13.3.1-17 baseline
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: ef413da5f7 [formerly 4afa41d4e7]
Former-commit-id: 50becef97f
2013-04-01 12:04:56 -05:00
Steve Harris
e61c718b49 13.3.1-16 baseline
Former-commit-id: a262f22cee [formerly 51380726d4] [formerly a262f22cee [formerly 51380726d4] [formerly 3066dd33e5 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 6b75202d07 [formerly 36a4b3eb51]
Former-commit-id: c53a305b1e
2013-04-01 11:39:08 -05:00
Steve Harris
cc1ef45545 13.3.1-15 baseline
Former-commit-id: 4cf3ad6abb [formerly eb1dab3864] [formerly 4cf3ad6abb [formerly eb1dab3864] [formerly 3d8ed484be [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2bf790aae3 [formerly d3cec5d3cb]
Former-commit-id: 4204273f21
2013-04-01 11:33:20 -05:00
Ben Steffensmeier
facdfdc501 Issue #1799 fix modal tools again.
Former-commit-id: cffac354e8 [formerly eeeede7288] [formerly cffac354e8 [formerly eeeede7288] [formerly 66af8daa11 [formerly c1a69f88df85478571394c0e125617c93100168d]]]
Former-commit-id: 66af8daa11
Former-commit-id: 11e6afa5fa [formerly 7082466303]
Former-commit-id: b3245f7a5d
2013-03-29 14:30:54 -05:00
Ron Anderson
8502dee456 Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089

Former-commit-id: 4ac9a4d9a8 [formerly 0f4fb125b0] [formerly 4ac9a4d9a8 [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]
Former-commit-id: c7cfcf0250
Former-commit-id: cd0f319ec5 [formerly 9cfa87f7e5]
Former-commit-id: 41b0758084
2013-03-29 10:48:26 -05:00
Nate Jensen
1b1d1a48d2 Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
Former-commit-id: 3ad797690b [formerly 214b2ed4ba] [formerly 3ad797690b [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 946323416c [formerly 711fbe98d2]
Former-commit-id: a6a81a17d6
2013-03-28 17:02:14 -05:00
Ben Steffensmeier
788df8fc68 Issue #1799 fix activation of tools for new perspectives.
Former-commit-id: dcbed65681 [formerly 50a276a7e2] [formerly dcbed65681 [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]
Former-commit-id: 4efa92ff49
Former-commit-id: 33de9bfc87 [formerly a415fb17ae]
Former-commit-id: a5e1593213
2013-03-28 15:47:36 -05:00
Ron Anderson
bef17d4f03 Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 27e07ce4a9 [formerly 5bb47b7931] [formerly 27e07ce4a9 [formerly 5bb47b7931] [formerly b65ecfc151 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]
Former-commit-id: b65ecfc151
Former-commit-id: 33bcf5fee8 [formerly 3f2fa771d9]
Former-commit-id: 5eb1885dbd
2013-03-28 13:37:29 -05:00
Steve Harris
21332cb0b5 Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: 979d6a5d8c [formerly 2a0e399dc8] [formerly 979d6a5d8c [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]
Former-commit-id: d997aeaee4
Former-commit-id: 428ec8a472 [formerly e67b16bb03]
Former-commit-id: f3a84e952e
2013-03-27 18:21:05 -05:00
Steve Harris
f59f1f02b0 13.3.1-14 baseline
Former-commit-id: 91a5e4578e [formerly 9022c500ce] [formerly 91a5e4578e [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 936e4adda2 [formerly 2ca160caf0]
Former-commit-id: 8237fdadaa
2013-03-27 17:59:34 -05:00
Dustin Johnson
198fb2b6ae Issue #1827 Create registry/datadelivery client features
Amend: Add event plugins and their dependencies to client features

Change-Id: Ib80522161740857d4332b84bbedad10e19683602

Former-commit-id: fbcfdd0ca1 [formerly 52c27ec57f] [formerly fbcfdd0ca1 [formerly 52c27ec57f] [formerly 1684507bdb [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]
Former-commit-id: 1684507bdb
Former-commit-id: 2591041c9d [formerly f27ebfbc1b]
Former-commit-id: c5685dbe9f
2013-03-27 15:38:36 -05:00
Nate Jensen
2fe6904a03 Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
Former-commit-id: 807d8773ad [formerly f3fd91c311] [formerly 807d8773ad [formerly f3fd91c311] [formerly c895ee60fa [formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]]
Former-commit-id: c895ee60fa
Former-commit-id: 30bd797879 [formerly 5701030750]
Former-commit-id: 79fddbcbf5
2013-03-26 16:15:27 -05:00
Lee Venable
8e1fc66f03 Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
Former-commit-id: ad1983ff8d [formerly 1a59204892] [formerly ad1983ff8d [formerly 1a59204892] [formerly 049e955db9 [formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]]
Former-commit-id: 049e955db9
Former-commit-id: cb683bec2a [formerly f8d2fdacea]
Former-commit-id: f0ed70f9fb
2013-03-26 15:01:51 -05:00
Ben Steffensmeier
8d88fa1ba9 Issue #1791 Fix problems in SmartScript when there is no data.
Former-commit-id: 9d9443644c [formerly 6870045005] [formerly 9d9443644c [formerly 6870045005] [formerly 18311b0d18 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]]
Former-commit-id: 18311b0d18
Former-commit-id: 6d17d01f8c [formerly 69879c51df]
Former-commit-id: b76bdc602d
2013-03-26 14:46:11 -05:00
Lee Venable
125517e2d2 Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
Former-commit-id: 68e767daaa [formerly c86daf885b] [formerly 68e767daaa [formerly c86daf885b] [formerly c1adce3a11 [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]]
Former-commit-id: c1adce3a11
Former-commit-id: 013748405d [formerly 393e6d9ca1]
Former-commit-id: ea68209a19
2013-03-26 14:33:24 -05:00
Steve Harris
0d88cd619b Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 85104939ac [formerly e71c69c383] [formerly 85104939ac [formerly e71c69c383] [formerly 9ff8a94193 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 02147470db [formerly b926ff60b3]
Former-commit-id: 779adedea9
2013-03-26 12:44:24 -05:00
Steve Harris
25a851cccf 13.3.1-13 baseline
Former-commit-id: 792171756f [formerly c77a452f5a] [formerly 792171756f [formerly c77a452f5a] [formerly c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]
Former-commit-id: c65f3e68e5
Former-commit-id: 4f2e9aec0d [formerly 822d05a709]
Former-commit-id: 7aa4f7b265
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
d31efead69 Issue #1819 Added precision fields for point source configuration.
Former-commit-id: a0a0199266 [formerly 79d87a96e7] [formerly a0a0199266 [formerly 79d87a96e7] [formerly b0f61cf86c [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]]
Former-commit-id: b0f61cf86c
Former-commit-id: a579da7646 [formerly eb13af2f50]
Former-commit-id: cc64195d47
2013-03-26 12:29:18 -05:00
Ben Steffensmeier
81814dfa65 Issue #1799 Fix pan/zoom when in views.
Former-commit-id: d06f011de0 [formerly 643c1c77d0] [formerly d06f011de0 [formerly 643c1c77d0] [formerly 78fdea2ba1 [formerly 2061956526bdc3da43280e6c829de1deb0a098ba]]]
Former-commit-id: 78fdea2ba1
Former-commit-id: e79778366c [formerly 5a1171f111]
Former-commit-id: 69068bbf3a
2013-03-26 11:44:23 -05:00
Mike Duff
493014d466 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	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/GridParm.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/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: c1f7d33bb8 [formerly 5d72795e1b] [formerly c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: b366778df0 [formerly 4c3011edce]
Former-commit-id: efec4d0365
2013-03-26 09:19:39 -05:00
Ron Anderson
3750bb7dba Merge "Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
Former-commit-id: 6ab9303526 [formerly f4f180face] [formerly 6ab9303526 [formerly f4f180face] [formerly 73678261b6 [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]]
Former-commit-id: 73678261b6
Former-commit-id: e4c4862938 [formerly 7e6b601a09]
Former-commit-id: 60c1c27225
2013-03-25 17:53:46 -05:00
Lee Venable
e03985901f Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
Former-commit-id: a84ef2d2c3 [formerly e467daec0c] [formerly a84ef2d2c3 [formerly e467daec0c] [formerly 05b4c2f913 [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]]
Former-commit-id: 05b4c2f913
Former-commit-id: b1ce5603a0 [formerly d73b44fa67]
Former-commit-id: b329abb111
2013-03-25 17:20:25 -05:00
Mike Duff
ac7bb442f4 Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9

Former-commit-id: 3d783c54be [formerly afd0de8b5b] [formerly 3d783c54be [formerly afd0de8b5b] [formerly 88e75f4a90 [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]]
Former-commit-id: 88e75f4a90
Former-commit-id: fc0b126eee [formerly b517ce9a9f]
Former-commit-id: 9a9d8f0503
2013-03-25 16:03:18 -05:00
Jonathan Sanchez
d50e3af938 Issue #1605 Check if storm location is over an urban bound area.
Former-commit-id: 3ca4cc9dcf [formerly 06cd161d0e] [formerly 3ca4cc9dcf [formerly 06cd161d0e] [formerly ddcb4f3451 [formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]]
Former-commit-id: ddcb4f3451
Former-commit-id: cd1095fb29 [formerly c9295e6762]
Former-commit-id: dad851857d
2013-03-25 14:41:55 -05:00
Lee Venable
efc8488ca4 Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
Former-commit-id: 5d7055ad53 [formerly 25cf1cacfd] [formerly 5d7055ad53 [formerly 25cf1cacfd] [formerly d1c84de620 [formerly 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903]]]
Former-commit-id: d1c84de620
Former-commit-id: 4caa21aa69 [formerly fc41aa82ca]
Former-commit-id: cc0debe027
2013-03-25 14:08:39 -05:00
Steve Harris
120fc26670 13.3.1-12 baseline
Former-commit-id: be96282207 [formerly 0be473728a] [formerly be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: f80f98cee2 [formerly bc439aee4f]
Former-commit-id: f1d156779a
2013-03-25 13:27:13 -05:00
Jonathan Sanchez
08c9302110 Issue #1810 Accepted other values/types for useDirs.
Former-commit-id: 2d6be3d3da [formerly d00c88a38c] [formerly 2d6be3d3da [formerly d00c88a38c] [formerly b77ed18eb4 [formerly 7492d4e2ceea99c71f8040237610d95e45c1e78a]]]
Former-commit-id: b77ed18eb4
Former-commit-id: e01d47acfa [formerly 539c4dfa8e]
Former-commit-id: 6e02206355
2013-03-25 12:23:51 -05:00
Mike Duff
e126320f82 Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: 86e0184414 [formerly 593cb668bf] [formerly 86e0184414 [formerly 593cb668bf] [formerly 7118f04843 [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]]
Former-commit-id: 7118f04843
Former-commit-id: fcb46897e3 [formerly c682fb2e9a]
Former-commit-id: 516965bea3
2013-03-24 12:21:51 -05:00
David Gillingham
75a6163bf3 Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.

Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3

Former-commit-id: 8438c5af87 [formerly 79a1520baf] [formerly 8438c5af87 [formerly 79a1520baf] [formerly 4aeeb1ce25 [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: c8c7fb4129 [formerly c3ce4058a0]
Former-commit-id: 7a2c92efc7
2013-03-22 10:39:13 -05:00
Lee Venable
9af40169f9 Merge "Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures. Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51" into omaha_13.3.1
Former-commit-id: 5c8230662d [formerly 489e04c235] [formerly 5c8230662d [formerly 489e04c235] [formerly c8523e9108 [formerly d5231f950c637b8a094b0a60b25a629f0b3644fa]]]
Former-commit-id: c8523e9108
Former-commit-id: a2e5e18810 [formerly 0d1cba8eae]
Former-commit-id: c733749c9f
2013-03-21 19:27:02 -05:00
Mike Duff
31657d334c Issue #1812 - Scan/DMD trend graphs and trend sets graphs update on threshold changes.
Change-Id: I1150f365ef7b67a198f57cca85859f6767eb0234

Former-commit-id: 540524941d [formerly e4ffefa649] [formerly 540524941d [formerly e4ffefa649] [formerly 09feff70e0 [formerly 8ddcbfac38c225c6771e97de738125a1149ae1c4]]]
Former-commit-id: 09feff70e0
Former-commit-id: 524dfa985f [formerly a45389f735]
Former-commit-id: 8c1b60bae9
2013-03-21 12:23:56 -05:00
Ben Steffensmeier
96fe46d7a3 Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures.
Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51

Former-commit-id: 3cc175f373 [formerly e69011cdd8] [formerly 3cc175f373 [formerly e69011cdd8] [formerly de02fe7922 [formerly 26baf1550ad70417a68bd0a36ea99ac83c6d39cd]]]
Former-commit-id: de02fe7922
Former-commit-id: 4323ea54d2 [formerly 6ce135a80a]
Former-commit-id: 9feaaa1961
2013-03-21 11:09:23 -05:00
Steve Harris
c129fed15e Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: a9ced3a7ef [formerly fa15f03e1b] [formerly a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]
Former-commit-id: dc419068f0
Former-commit-id: f4e26fd94d [formerly 31044eabd1]
Former-commit-id: 8065161896
2013-03-20 16:06:20 -05:00
Steve Harris
e6ab10cc26 13.3.1-10 baseline
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 7078eec1b1
Former-commit-id: e9f0328808 [formerly 7c2e617d26]
Former-commit-id: f2cc967a4f
2013-03-20 15:53:01 -05:00
Richard Peter
403879b5cf Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
Former-commit-id: d1e37c7803 [formerly 3b8e2ff0d3] [formerly d1e37c7803 [formerly 3b8e2ff0d3] [formerly adbe7b91cc [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]]
Former-commit-id: adbe7b91cc
Former-commit-id: 53d8ef7ed1 [formerly 3bad342dca]
Former-commit-id: ff1b1598e6
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
a01b552f89 Issue #1804 Remove empty data structures from radar hdf5.
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d

Former-commit-id: 1203b7cee4 [formerly ee7204c05c] [formerly 1203b7cee4 [formerly ee7204c05c] [formerly 82499f839d [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]]
Former-commit-id: 82499f839d
Former-commit-id: 1b363a547c [formerly 3e2a41d1d2]
Former-commit-id: 57d19b0d66
2013-03-20 13:26:33 -05:00
Ben Steffensmeier
4cde2bd826 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 0d9119a1c7 [formerly 2b6aa86371] [formerly 0d9119a1c7 [formerly 2b6aa86371] [formerly ed544fc17c [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]
Former-commit-id: ed544fc17c
Former-commit-id: b201d9dee2 [formerly 646b61f653]
Former-commit-id: 498d153e40
2013-03-20 13:05:54 -05:00
Dave Hladky
1aef08f449 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb

Former-commit-id: dc7b231bf0 [formerly 90f7f2110b] [formerly dc7b231bf0 [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: 01c6ff12a0 [formerly bd17b99bd1]
Former-commit-id: 8299b2872a
2013-03-20 12:41:33 -05:00
Steve Harris
37beeaab69 13.3.1-9 baseline
Former-commit-id: c7b2ef2d8c [formerly 468ae82305] [formerly c7b2ef2d8c [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 7e96d841d9 [formerly 0375805e79]
Former-commit-id: 65f522fc87
2013-03-19 14:22:56 -05:00
Richard Peter
5f09e66d4e Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
Former-commit-id: 2fdbc96342 [formerly 4ce10bced9] [formerly 2fdbc96342 [formerly 4ce10bced9] [formerly 3a92747518 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]]
Former-commit-id: 3a92747518
Former-commit-id: eebd930070 [formerly c955b3b640]
Former-commit-id: 1bf2c48011
2013-03-19 13:24:28 -05:00
Mike Duff
c22d1962de Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff

Former-commit-id: 70efff8f0a [formerly b115d3611c] [formerly 70efff8f0a [formerly b115d3611c] [formerly 058064ce0d [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]]
Former-commit-id: 058064ce0d
Former-commit-id: 3e1b4ba54b [formerly 7e66c8e46d]
Former-commit-id: 144223ed9b
2013-03-19 10:10:01 -05:00
Ben Steffensmeier
f2466d6066 Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: 7b7b708eee [formerly 6c741a9ab3] [formerly 7b7b708eee [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]
Former-commit-id: 86dffab17d
Former-commit-id: 160b6a7040 [formerly dfe8de96f2]
Former-commit-id: e176478c7a
2013-03-18 17:16:44 -05:00
Steve Harris
9d4d1baefe Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]]
Former-commit-id: c18b96dc4c
Former-commit-id: ea27f9cd17 [formerly 245afb28c8]
Former-commit-id: fc6748cb3e
2013-03-18 16:43:22 -05:00
Steve Harris
1c2dffd66d 13.3.1-8 baseline
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 81a3f29afc [formerly 5f492500ea]
Former-commit-id: 0c94cc97fb
2013-03-18 15:43:32 -05:00
Lee Venable
0449fe84a6 Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1
Former-commit-id: 57d7559797 [formerly 456fd056f4] [formerly 57d7559797 [formerly 456fd056f4] [formerly 93e99b64a6 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]]
Former-commit-id: 93e99b64a6
Former-commit-id: ba4673b99a [formerly 3a1dc41b50]
Former-commit-id: cac220879d
2013-03-14 17:19:38 -05:00
Dave Hladky
871c4718ab Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

Former-commit-id: a1c4148918 [formerly 9b495681ec] [formerly a1c4148918 [formerly 9b495681ec] [formerly c57d5574ef [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]]
Former-commit-id: c57d5574ef
Former-commit-id: 3ba473351b [formerly db207a732c]
Former-commit-id: 5bf3f5f89f
2013-03-14 15:59:39 -05:00