Bryan Kowal
aab5a08bdb
Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
...
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment
Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc
Former-commit-id: 981638c532d1663ea98be788c7b471981638c532d1663ea98be788c7b471ee8c99ef6ee788c7b471ee8c99ef6eea6a9687f7b60bea920c344237d9ee962755143e1aa28394c4
2013-04-03 14:03:54 -05:00
Bryan Kowal
d62b0d3d5f
Issue #1661 - yajsw will now log to both the console and log file indefinitely
...
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm
Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0
Former-commit-id: 2dbabffbe5ad523b9cee939ff752e82dbabffbe5ad523b9cee939ff752e842ab5f4244939ff752e842ab5f4244e618c4833f93cd16508c4fe7bace99e709933a4f6ab8e23421
2013-04-03 14:03:18 -05:00
Greg Armendariz
2b710f3540
Issue #1782 - Restoring #1813 & #1478
...
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d
Former-commit-id: b8e7d3644cf1776b887de5408c3807b8e7d3644cf1776b887de5408c380754f56fde29e5408c380754f56fde292bfe8fccfde3cf306ce402e79dfe8a9ca713f588e389a3bf6a
2013-04-02 15:00:26 -05:00
Steve Harris
4dc4b40b9f
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: d2d91959253b722f107674a47b9bd9d2d91959253b722f107674a47b9bd914c9de225974a47b9bd914c9de225912055591eaf85a1ab9aba6dd28cc820fee31b1a8e74f4ae39e
2013-04-01 12:15:04 -05:00
Steve Harris
fd3b082c54
13.3.1-17 baseline
...
Former-commit-id: 1b8e623c9bf28b85d42f7bf9966dcb1b8e623c9bf28b85d42f7bf9966dcba3fe998f8f7bf9966dcba3fe998f8fa6ff543f88ef413da5f74afa41d4e750becef97fa112803c98
2013-04-01 12:04:56 -05:00
Steve Harris
622caf8d93
13.3.1-15 baseline
...
Former-commit-id: 70fece2da14cf3ad6abbeb1dab386470fece2da14cf3ad6abbeb1dab38643d8ed484beeb1dab38643d8ed484be4df1b4aeae2bf790aae3d3cec5d3cb4204273f21cc1ef45545
2013-04-01 11:33:20 -05:00
Ron Anderson
92a156fe0f
Issue #1774 Fix invalid unit strings in parameterInfo files.
...
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de
Former-commit-id: ef06834e54cfb324f380aeb451a37cef06834e54cfb324f380aeb451a37c679bb01764aeb451a37c679bb017646cd8d1e8eed5e3976dc496e8f6367922f633b2a11eede44aac
2013-03-29 10:07:37 -05:00
David Gillingham
7fdc3419ec
Issue #1837 : Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
...
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0
Former-commit-id: 2ee53d54f5170f252bdd8a7c965eaa2ee53d54f5170f252bdd8a7c965eaac9ed59b0e08a7c965eaac9ed59b0e0acc3ac1c03fddd42615ddbec0fa00f0b155a57884c1c4e665e
2013-03-28 17:18:43 -05:00
Ron Anderson
80ce55bd3a
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 80bd994f2027e07ce4a95bb47b793180bd994f2027e07ce4a95bb47b7931b65ecfc1515bb47b7931b65ecfc15165dd07508933bcf5fee83f2fa771d95eb1885dbdbef17d4f03
2013-03-28 13:37:29 -05:00
Steve Harris
0528a1c5d2
Revert "Replaced with formatted version"
...
This reverts commit 911496b33920c9d653c8054d8d263f4887191329e074710e0acf9b26728318019c07a4410e8bcbf1ff977fc882b741680965410e8bcbf1ff977fc882b74168096518019c07a4b7416809658706337f67c51c9ea5df29c59184288706337f67c51c9ea5df29c59184288400028e1129c59184288400028e11c9dd6529737bd478fc41b614bf53f60074c522bb938243eb0b
2013-03-28 13:08:16 -05:00
Greg Armendariz
911496b339
Replaced with formatted version
...
Former-commit-id: 410e8bcbf1ff977fc882b741680965410e8bcbf1ff977fc882b74168096518019c07a4b74168096518019c07a44887191329e074710e0acf9b267283054d8d263f20c9d653c8
2013-03-28 12:59:43 -05:00
Dustin Johnson
847503d736
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17
Former-commit-id: 6f36d70eadc2edf1dd89ab426738486f36d70eadc2edf1dd89ab42673848a4e4df02b0ab42673848a4e4df02b0ce4b93027c85d6a19a5e902986256df135c0d948a5009cb271
2013-03-28 12:14:47 -05:00
Ben Steffensmeier
7446339aff
Issue #1821 recalculate 6 hours to be longer.
...
Former-commit-id: c61b608e1b61e0ca3b75a9cec71222c61b608e1b61e0ca3b75a9cec71222efbdd3aa8ca9cec71222efbdd3aa8c7b4a3d369ae1a619e030403da9bfb994dcd159d467b3b92712
2013-03-28 10:16:11 -05:00
Greg Armendariz
6a115c344f
Add source variable
...
Former-commit-id: 5d9bb2f71eae09ebb11f8800080d2a5d9bb2f71eae09ebb11f8800080d2ad0d889f11d8800080d2ad0d889f11d8d335839e644fcd1a8db24fea6f45d344c5b41b30ab3b9d7f9
2013-03-28 08:56:50 -05:00
Richard Peter
6e9eee551c
Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
...
Former-commit-id: 52174ddb57642ff5e3203ba331e9f552174ddb57642ff5e3203ba331e9f52b207fc6ec3ba331e9f52b207fc6ec52459fd3ccb061ba5595d8cbd1ff39c2896a01d26bca38d68c
2013-03-27 18:32:38 -05:00
Richard Peter
d5aab5c91d
Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
...
Former-commit-id: b03b4b8f752a71b9de1b7992b43a7ab03b4b8f752a71b9de1b7992b43a7a6c4f2796237992b43a7a6c4f27962328c463775bce746d6228e68173e14717a9c008d097a4cd9e1a
2013-03-27 18:28:01 -05:00
Steve Harris
cdad316568
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: bb88c2133a979d6a5d8c2a0e399dc8bb88c2133a979d6a5d8c2a0e399dc8d997aeaee42a0e399dc8d997aeaee43f99eed860428ec8a472e67b16bb03f3a84e952e21332cb0b5
2013-03-27 18:21:05 -05:00
Ben Steffensmeier
f24c14372e
Issue #1821 Reduce db and pypies requests in grid assembler.
...
Former-commit-id: 66d3c4c2376171d60f4460d13f228266d3c4c2376171d60f4460d13f22825add905ea760d13f22825add905ea7f3fdbf45bf1312e2ba3437fc71a726459e00df311f507138d3
2013-03-27 17:59:58 -05:00
Steve Harris
43942dad11
13.3.1-14 baseline
...
Former-commit-id: f9b343048591a5e4578e9022c500cef9b343048591a5e4578e9022c500ce9fba973fd09022c500ce9fba973fd03cbf22bd96936e4adda22ca160caf08237fdadaaf59f1f02b0
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
046233d3d6
Issue #1821 make GridInfoCache more elaborate.
...
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9
Former-commit-id: bedc1bce0aa31dc1874bbc8729d631bedc1bce0aa31dc1874bbc8729d6314b6d2fd8d1bc8729d6314b6d2fd8d1c46190259b60b2259343e4462ee41a03eade5b9807438ab40a
2013-03-27 17:28:45 -05:00
Richard Peter
0d9bf66096
Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
...
Former-commit-id: 5063faa546c11b070571c8ae09ab1d5063faa546c11b070571c8ae09ab1d70a7c3c556c8ae09ab1d70a7c3c5562ae52dbaeebe2a8e1b16de88cceb8c09801abaf40522d43c7f
2013-03-27 17:08:00 -05:00
Dustin Johnson
e01c368285
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: 5dbff646aafbcfdd0ca152c27ec57f5dbff646aafbcfdd0ca152c27ec57f1684507bdb52c27ec57f1684507bdb49c53e54432591041c9df27ebfbc1bc5685dbe9f198fb2b6ae
2013-03-27 15:38:36 -05:00
Ben Steffensmeier
52709e081c
Issue #1821 Speed up GridInfoCache.
...
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40
Former-commit-id: a19226c906bd35a06d512a13abd32ca19226c906bd35a06d512a13abd32c6f525a81b42a13abd32c6f525a81b417a32dc6f1bc0153dbba72724108b7b621850bc606030b77b4
2013-03-27 13:21:33 -05:00
Ron Anderson
b55ddcee24
Merge "Issue #1833 : Add performance log file to ingest and ingestGrib" into omaha_13.3.1
...
Former-commit-id: 7ce946600d60735ddd83841a69ed597ce946600d60735ddd83841a69ed5933d78bc7ee841a69ed5933d78bc7ee95001bf982dc74b366e96a393ee4f93fbeeadef3583d14ad21
2013-03-27 11:22:48 -05:00
Mike Duff
4f6720a362
Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
...
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa
Former-commit-id: 0e1b566dd11beb6e4fa519587001120e1b566dd11beb6e4fa51958700112302dbf2cfb1958700112302dbf2cfbbe438c6fecc143b356ef3d1c1b146c16f03eb52ce8d921f415
2013-03-27 10:38:59 -05:00
Richard Peter
e962480999
Issue #1833 : Add performance log file to ingest and ingestGrib
...
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d
Former-commit-id: 485a15cc1525d49055705287a3296b485a15cc1525d49055705287a3296bb75ceeeeb35287a3296bb75ceeeeb3b2a73c8d446923e10550f99242f53933c602b13e786b68279d
2013-03-26 20:55:42 -05:00
Lee Venable
6a0520bd0c
Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
...
Former-commit-id: 954db8db2868e767daaac86daf885b954db8db2868e767daaac86daf885bc1adce3a11c86daf885bc1adce3a11caf01174bb013748405d393e6d9ca1ea68209a19125517e2d2
2013-03-26 14:33:24 -05:00
Richard Peter
110ec4b47a
Merge "Issue #1783 : Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
...
Former-commit-id: 469f7c60fbce83569845b947a52604469f7c60fbce83569845b947a526047ee513dfedb947a526047ee513dfede4656678c99c5ce8e74145a2f3f3dd109b5783822e5fdfc82c
2013-03-26 12:59:47 -05:00
Steve Harris
d8a9db1e5c
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 8d1903034b85104939ace71c69c3838d1903034b85104939ace71c69c3839ff8a94193e71c69c3839ff8a94193072b1bf35e02147470dbb926ff60b3779adedea90d88cd619b
2013-03-26 12:44:24 -05:00
Steve Harris
a33631faa5
13.3.1-13 baseline
...
Former-commit-id: 0f2ebb8f10792171756fc77a452f5a0f2ebb8f10792171756fc77a452f5ac65f3e68e5c77a452f5ac65f3e68e5b49c1b0fa84f2e9aec0d822d05a7097aa4f7b26525a851cccf
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
16ad8874b9
Issue #1819 Added precision fields for point source configuration.
...
Former-commit-id: 6b85338835a0a019926679d87a96e76b85338835a0a019926679d87a96e7b0f61cf86c79d87a96e7b0f61cf86c4236ca46f5a579da7646eb13af2f50cc64195d47d31efead69
2013-03-26 12:29:18 -05:00
Richard Peter
5ffcfa9a72
Issue #1783 : Update DatabaseArchiver to stream deserialization of previous records
...
Change-Id: Icb1e2721bcddeb93c7c06983bba117c75b0edd44
Former-commit-id: 7a971ee1659773208ff5f3844dd2fb7a971ee1659773208ff5f3844dd2fb69ffe80046f3844dd2fb69ffe800465ba47f8dbdb4965ae08d643ac759652a10b4439899beb92f3e
2013-03-26 11:40:24 -05:00
Ron Anderson
10b762ebc8
Merge "Issue #1823 : Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
...
Former-commit-id: 48f4d944ddf272034fde57c919bc7b48f4d944ddf272034fde57c919bc7bf65989454a57c919bc7bf65989454ac8a3f9932e758b81f9a2510b090090160779e86f1c44fa5d4a
2013-03-26 11:33:15 -05:00
Ben Steffensmeier
128f8f4a9f
Issue #1821 Optimize FFG version query.
...
Former-commit-id: 3e9651bab354b9d0d9493049bc94c93e9651bab354b9d0d9493049bc94c97bde9f6d323049bc94c97bde9f6d3213c24c63d0ae27d029a139259b1b0b1ef06166db5e582f019c
2013-03-26 10:37:40 -05:00
David Gillingham
c3a87654de
Issue #1823 : Trigger SAT smart inits based only on sector id and physical element.
...
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79
Former-commit-id: 4c5493d607ad357638b31df8d399194c5493d607ad357638b31df8d39919bebfc603171df8d39919bebfc603171c24ec516dbf196a778207487a27dc45bf26aa003b29423947
2013-03-26 10:33:42 -05:00
Mike Duff
868a6c3ddf
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: f767014e9ac1f7d33bb85d72795e1bf767014e9ac1f7d33bb85d72795e1b9ebc7606b15d72795e1b9ebc7606b11314976753b366778df04c3011edceefec4d0365493014d466
2013-03-26 09:19:39 -05:00
Ron Anderson
da92cce2d9
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: 4c5005ffb96ab9303526f4f180face4c5005ffb96ab9303526f4f180face73678261b6f4f180face73678261b68bf2b31f8ee4c48629387e6b601a0960c1c272253750bb7dba
2013-03-25 17:53:46 -05:00
Ben Steffensmeier
b83ebf6691
Issue #1821 Reshape grib data arrays in place to improve performance.
...
Former-commit-id: 1373ffd0ff5d01725fea4621133ff11373ffd0ff5d01725fea4621133ff175c8d469014621133ff175c8d46901e67855df4fe722fa072304028b0136c48c98266d7a334d3417
2013-03-25 15:09:23 -05:00
Steve Harris
fd735b8ff8
13.3.1-12 baseline
...
Former-commit-id: 6f374b35d0be962822070be473728a6f374b35d0be962822070be473728aaaac0b51e50be473728aaaac0b51e5bb30a41300f80f98cee2bc439aee4ff1d156779a120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
5475d95f5f
13.3.1-11 baseline
...
Former-commit-id: 408234ee2b2edab615409cdd90e382408234ee2b2edab615409cdd90e382373d13df399cdd90e382373d13df39c37e88ac4a11baf4c2f0d868003067b5e3a7dda672151c0e6a
2013-03-25 13:20:03 -05:00
Dave Hladky
30dc356683
Issue #1813 Stats for FFMP were broken by memory updates.
...
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58
Former-commit-id: 636c9a9404dee8d745a3a53797bc2f636c9a9404dee8d745a3a53797bc2ff2e13c8078a53797bc2ff2e13c8078b401967738a997706b7205ae375e08fc7c4f2d9020a24d3e8c
2013-03-22 16:37:20 -05:00
Dave Hladky
edde66e8f2
Issue #1817 BOX issue with only having HUC0 in template
...
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8
Former-commit-id: 611f180e72c2b9bd102458a37d1e44611f180e72c2b9bd102458a37d1e44d114302b0658a37d1e44d114302b065f8ac1e458150cd546023cdd8f8ed2bc2a1a20e14eec5881e9
2013-03-22 16:21:45 -05:00
David Gillingham
3b8f35d9bf
Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
...
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 1f447200088438c5af8779a1520baf1f447200088438c5af8779a1520baf4aeeb1ce2579a1520baf4aeeb1ce253fdecaec6ec8c7fb4129c3ce4058a07a2c92efc775a6163bf3
2013-03-22 10:39:13 -05:00
Brad Gonzales
7cba304bd9
Issue #1785 Adding performance logging for bufrua, grib, obs, radar,
...
redbook, sfcobs, and satellite.
Amend: Made decoder performance logging consistent. Cleaned up other logging.
Change-Id: I1f404583240a9427cfa3dbb82f9ba3f760b3a8d4
Former-commit-id: 237dc5ea14f7debfc55fcd39fcf122237dc5ea14f7debfc55fcd39fcf1228c309840a3cd39fcf1228c309840a3954314d74d2de2221a359f9248bcd99503aa5a604b93b146fd
2013-03-21 10:58:26 -05:00
Richard Peter
f5996d41b9
Merge "Issue #1804 Switch all radar decompressing to be in memory. Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221" into omaha_13.3.1
...
Former-commit-id: 3d93bf69c0510e56c67fd747686fa13d93bf69c0510e56c67fd747686fa1bcf676f5ddd747686fa1bcf676f5ddf3bdacf035855dd1a664ac58a04170d46fbf9f2a4b0c9c10d6
2013-03-20 17:26:31 -05:00
Ben Steffensmeier
bdab31e123
Issue #1804 Switch all radar decompressing to be in memory.
...
Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221
Former-commit-id: d573574ac6ecf93b40cc4c3438e160d573574ac6ecf93b40cc4c3438e16085b509b13e4c3438e16085b509b13e681c4d87f15261f1f5675cb197eebd7bf75df8fdf84059441c
2013-03-20 16:37:47 -05:00
Steve Harris
2b05476c98
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: ea052b14bba9ced3a7effa15f03e1bea052b14bba9ced3a7effa15f03e1bdc419068f0fa15f03e1bdc419068f02cbd2a1bc9f4e26fd94d31044eabd18065161896c129fed15e
2013-03-20 16:06:20 -05:00
Steve Harris
1261f1dbf9
13.3.1-10 baseline
...
Former-commit-id: 76ea9120d857f4676b6c073687d9a976ea9120d857f4676b6c073687d9a97078eec1b1073687d9a97078eec1b1dbeb388d72e9f03288087c2e617d26f2cc967a4fe6ab10cc26
2013-03-20 15:53:01 -05:00
Richard Peter
4e87891a64
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
...
Former-commit-id: 0d35db042ed1e37c78033b8e2ff0d30d35db042ed1e37c78033b8e2ff0d3adbe7b91cc3b8e2ff0d3adbe7b91cc8805c42d1453d8ef7ed13bad342dcaff1b1598e6403879b5cf
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
ce8d190a49
Issue #1804 Remove empty data structures from radar hdf5.
...
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: 41372ac1221203b7cee4ee7204c05c41372ac1221203b7cee4ee7204c05c82499f839dee7204c05c82499f839dd67d0ec6741b363a547c3e2a41d1d257d19b0d66a01b552f89
2013-03-20 13:26:33 -05:00
