Commit graph

953 commits

Author SHA1 Message Date
David Gillingham
c3a87654de Issue #1823: Trigger SAT smart inits based only on sector id and physical element.
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79

Former-commit-id: 4c5493d607 [formerly ad357638b3] [formerly 1df8d39919] [formerly 4c5493d607 [formerly ad357638b3] [formerly 1df8d39919] [formerly bebfc60317 [formerly 1df8d39919 [formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]]]
Former-commit-id: bebfc60317
Former-commit-id: 1c24ec516d [formerly bf196a7782] [formerly a809765d33e0a62afbe50224ec11b4f9d9365c4f [formerly 07487a27dc]]
Former-commit-id: 04ffee131ad16fc238cce01414a4a0035486bafd [formerly 45bf26aa00]
Former-commit-id: 3b29423947
2013-03-26 10:33:42 -05:00
Steve Harris
81a8604bfe Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly a23cecdb26 [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]]
Former-commit-id: a23cecdb26
Former-commit-id: 5be2208aaf [formerly 02105701a0] [formerly 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565]]
Former-commit-id: 1234c0205c914f2be5f36fcfc47900e46f0e87db [formerly e6ab1deba2]
Former-commit-id: feba54ac83
2013-03-26 10:12:34 -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: f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 1314976753 [formerly b366778df0] [formerly 66366ecca6a9baeda295e8caa2bd45103113d7ee [formerly 4c3011edce]]
Former-commit-id: 428a7b37d44680f4388cb79776fa256ccd460279 [formerly efec4d0365]
Former-commit-id: 493014d466
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: 4c5005ffb9 [formerly 6ab9303526] [formerly f4f180face] [formerly 4c5005ffb9 [formerly 6ab9303526] [formerly f4f180face] [formerly 73678261b6 [formerly f4f180face [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]]]
Former-commit-id: 73678261b6
Former-commit-id: 8bf2b31f8e [formerly e4c4862938] [formerly 32aeedbcfe97a863092752841be20ed818c5c741 [formerly 7e6b601a09]]
Former-commit-id: 8fd6002117f54d2deed45eecdba91b1e6e8a577e [formerly 60c1c27225]
Former-commit-id: 3750bb7dba
2013-03-25 17:53:46 -05:00
Max Schenkelberg
bba8b44529 Issue #1638 Made Map scales more generalized for use outside of D2D
Amend: Added generalization to JaxbManager

Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a

Former-commit-id: 64df5b6e30 [formerly dabffdbf79] [formerly fd375314cd] [formerly 64df5b6e30 [formerly dabffdbf79] [formerly fd375314cd] [formerly e17d691400 [formerly fd375314cd [formerly 1e5812d9796a77559d70392be18619a8f7316f2d]]]]
Former-commit-id: e17d691400
Former-commit-id: 713eb3c6b2 [formerly 8d1b555c39] [formerly 528104a5b0354eab9bd2b915e876dcaab9beaf01 [formerly 36e80c267e]]
Former-commit-id: e7a427001d772f2ad9fa8e8138a1e46476665765 [formerly 237c742d44]
Former-commit-id: 7c4be8a559
2013-03-25 15:38:36 -05:00
Richard Peter
228453439d Merge "Issue #1802 Refactored DD transaction management" into development
Former-commit-id: 559bc19ecd [formerly b3631390d2] [formerly c3268aa02c] [formerly 559bc19ecd [formerly b3631390d2] [formerly c3268aa02c] [formerly 5c92140024 [formerly c3268aa02c [formerly b8516f99386ded052745e766911094edfd57d7ec]]]]
Former-commit-id: 5c92140024
Former-commit-id: d33b9859c2 [formerly 072bc7affc] [formerly 76ef672a3d495ecff9dda9924de866473ac56ce0 [formerly 351f08dba3]]
Former-commit-id: 77d040b2214a8a9c514a25092b9dd5acf0743cce [formerly bcb5b0b73e]
Former-commit-id: af956fe92d
2013-03-25 15:37:18 -05:00
Bryan Kowal
a1de8e0a67 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: 0cc63cbb21 [formerly 09263dbf8c] [formerly 9e647beded] [formerly 0cc63cbb21 [formerly 09263dbf8c] [formerly 9e647beded] [formerly 6758a9a50d [formerly 9e647beded [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]]]
Former-commit-id: 6758a9a50d
Former-commit-id: f1b0e60b8e [formerly 1eba8622d4] [formerly b5e09dca5c13d2f76056db298c6ddcd8fba31a7e [formerly 4c02dabb3d]]
Former-commit-id: 0741dba9cedb08ccd4a8faa71fb209bc0dbf6617 [formerly e41f926ac2]
Former-commit-id: d5c958b2f8
2013-03-25 15:23:32 -05:00
Bryan Kowal
7ef1b5e065 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: 27aa8b21f4 [formerly 541d096faf] [formerly c55efaadb0] [formerly 27aa8b21f4 [formerly 541d096faf] [formerly c55efaadb0] [formerly a6cd17feeb [formerly c55efaadb0 [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]]]
Former-commit-id: a6cd17feeb
Former-commit-id: 5012e869e3 [formerly 2093c6a495] [formerly 1710b26cc53566e26fc66c7ee6bcd14b0dbcbc08 [formerly c4cec34e47]]
Former-commit-id: 31db227b7bdc186a52966c1efdd832477bc27159 [formerly 99a3e25b3d]
Former-commit-id: 3728413ecf
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
e7ea63963d Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly af05feb5a7 [formerly b10b1150be [formerly 534777d96a45b275abd9cc26818b7df200974595]]]]
Former-commit-id: af05feb5a7
Former-commit-id: a8350c0129 [formerly 541646148b] [formerly 9e9ca757bac7ecb378e458d18fd7c0b249bdee76 [formerly 4d1a8805ab]]
Former-commit-id: edbdb2638e5a5abcb6d8adcfa785deaefe6a2f03 [formerly c250bda12b]
Former-commit-id: 5e50d32bdb
2013-03-25 15:15:38 -05:00
Ben Steffensmeier
b83ebf6691 Issue #1821 Reshape grib data arrays in place to improve performance.
Former-commit-id: 1373ffd0ff [formerly 5d01725fea] [formerly 4621133ff1] [formerly 1373ffd0ff [formerly 5d01725fea] [formerly 4621133ff1] [formerly 75c8d46901 [formerly 4621133ff1 [formerly 30354883c5dff0fdbf196e7f405525451df1e81e]]]]
Former-commit-id: 75c8d46901
Former-commit-id: e67855df4f [formerly e722fa0723] [formerly a6da43b603f6c650bb2b2ea9df487300a1c5efb7 [formerly 04028b0136]]
Former-commit-id: 01f6e04d980b175810fe8822f4d6f0b3bc3bc97d [formerly c48c98266d]
Former-commit-id: 7a334d3417
2013-03-25 15:09:23 -05:00
Richard Peter
771da3295b Merge "Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development
Former-commit-id: a43becec4f [formerly c7dd6365d2] [formerly 7b8931ed16] [formerly a43becec4f [formerly c7dd6365d2] [formerly 7b8931ed16] [formerly 3239c176fa [formerly 7b8931ed16 [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]]]]
Former-commit-id: 3239c176fa
Former-commit-id: 25263a5042 [formerly 516bb024bb] [formerly 796dc63ca754008f87cdac9906820fb992597f43 [formerly 911a371329]]
Former-commit-id: f9d4a1edf08b99373c2258e36d85b2b9fe8420bd [formerly fecf49708c]
Former-commit-id: 917621b347
2013-03-25 14:45:06 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
5475d95f5f 13.3.1-11 baseline
Former-commit-id: 408234ee2b [formerly 2edab61540] [formerly 9cdd90e382] [formerly 408234ee2b [formerly 2edab61540] [formerly 9cdd90e382] [formerly 373d13df39 [formerly 9cdd90e382 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]]]
Former-commit-id: 373d13df39
Former-commit-id: c37e88ac4a [formerly 11baf4c2f0] [formerly 5e334c606f97e4e1517274a870990e91b9366443 [formerly d868003067]]
Former-commit-id: 08684e579497450790c8171b039c08f89d82117d [formerly b5e3a7dda6]
Former-commit-id: 72151c0e6a
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: 636c9a9404 [formerly dee8d745a3] [formerly a53797bc2f] [formerly 636c9a9404 [formerly dee8d745a3] [formerly a53797bc2f] [formerly f2e13c8078 [formerly a53797bc2f [formerly 314ec2517a0c5565f8423661cb744e04953f1830]]]]
Former-commit-id: f2e13c8078
Former-commit-id: b401967738 [formerly a997706b72] [formerly 7262596460876e4be6f35b9c3b9a662ae067405d [formerly 05ae375e08]]
Former-commit-id: 7067eafc09f5f2a62e39521cd47c896056bc7767 [formerly fc7c4f2d90]
Former-commit-id: 20a24d3e8c
2013-03-22 16:37:20 -05:00
Richard Peter
cbc371109c Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development
Former-commit-id: e492d8c351 [formerly bb2be2d6a7] [formerly 1b7e9e41ce] [formerly e492d8c351 [formerly bb2be2d6a7] [formerly 1b7e9e41ce] [formerly 3de0400969 [formerly 1b7e9e41ce [formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]]]
Former-commit-id: 3de0400969
Former-commit-id: 5989bc1894 [formerly d1b4d899be] [formerly e50e5d685426dd553ea338be6ee39be5bcda1f72 [formerly 50254dc8d1]]
Former-commit-id: dac4b40d3584b9d3d92e15ab278064d6922885e0 [formerly 66a28e9315]
Former-commit-id: 1084723e4b
2013-03-22 16:26:52 -05:00
Dave Hladky
edde66e8f2 Issue #1817 BOX issue with only having HUC0 in template
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8

Former-commit-id: 611f180e72 [formerly c2b9bd1024] [formerly 58a37d1e44] [formerly 611f180e72 [formerly c2b9bd1024] [formerly 58a37d1e44] [formerly d114302b06 [formerly 58a37d1e44 [formerly f0641a4771b6816944f38d1ec51b0356b983e2f4]]]]
Former-commit-id: d114302b06
Former-commit-id: 5f8ac1e458 [formerly 150cd54602] [formerly a6c0cfd63967b9b4f31e6242a2aad2a654b52cbe [formerly 3cdd8f8ed2]]
Former-commit-id: 66bc0011dbc6bee573d6a149bc3641646c869ad2 [formerly bc2a1a20e1]
Former-commit-id: 4eec5881e9
2013-03-22 16:21:45 -05:00
Dustin Johnson
07be638779 Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
Former-commit-id: b1f365220f [formerly f5cc517f9a] [formerly dcfbb43eb3] [formerly b1f365220f [formerly f5cc517f9a] [formerly dcfbb43eb3] [formerly 8651ca3d76 [formerly dcfbb43eb3 [formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]]]]
Former-commit-id: 8651ca3d76
Former-commit-id: 6adeb41238 [formerly c55f2ce559] [formerly 972f2290f05ee741a20729ef834101416b95b220 [formerly 0596d43d99]]
Former-commit-id: a42de8d20be8a050fdacc4249ee7b490fcd62a7b [formerly dcc7e44250]
Former-commit-id: eb0f12b15f
2013-03-22 15:28:57 -05:00
Dustin Johnson
e2a6167de3 Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development
Former-commit-id: efb12ce258 [formerly ec42bd63ad] [formerly 11478e870d] [formerly efb12ce258 [formerly ec42bd63ad] [formerly 11478e870d] [formerly ed017996a0 [formerly 11478e870d [formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]]]]
Former-commit-id: ed017996a0
Former-commit-id: bd04bd2c8c [formerly f274b8cd5b] [formerly 19450b614092a79e5518ae5c8a927c2aeb594359 [formerly 9e63142576]]
Former-commit-id: 3b9a725cb7e0fe573edc1ee175256ab462601148 [formerly e4c51bad63]
Former-commit-id: 087e01d4e4
2013-03-22 15:28:20 -05:00
Max Schenkelberg
971baf62b1 Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: 2da689223f [formerly 07ae94c499] [formerly ea26d0de84] [formerly 2da689223f [formerly 07ae94c499] [formerly ea26d0de84] [formerly 126be0cfe5 [formerly ea26d0de84 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]]]
Former-commit-id: 126be0cfe5
Former-commit-id: 44f5bd04b6 [formerly 850c8995cc] [formerly b81da1853ef8773cba40a9f1ed03ab5d498966c2 [formerly d20958ae92]]
Former-commit-id: ae3d695d3cfd46a5aade2f00de5657f386699789 [formerly 34134b3c62]
Former-commit-id: 3ba217badb
2013-03-22 10:54:44 -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: 1f44720008 [formerly 8438c5af87] [formerly 79a1520baf] [formerly 1f44720008 [formerly 8438c5af87] [formerly 79a1520baf] [formerly 4aeeb1ce25 [formerly 79a1520baf [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: 3fdecaec6e [formerly c8c7fb4129] [formerly 0957f6a5eec508c235f5324a4ce32b5064183a23 [formerly c3ce4058a0]]
Former-commit-id: 2f5d9615c33ca7ab3903f26aee8791ab3f06072b [formerly 7a2c92efc7]
Former-commit-id: 75a6163bf3
2013-03-22 10:39:13 -05:00
Dustin Johnson
c5464667d5 Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 34b969552f [formerly 6fc42b0791] [formerly 8956d1ac17] [formerly 34b969552f [formerly 6fc42b0791] [formerly 8956d1ac17] [formerly 04cbd3a24e [formerly 8956d1ac17 [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]]]
Former-commit-id: 04cbd3a24e
Former-commit-id: 0dcc67bc55 [formerly 53291f7130] [formerly 21a7a7505def7dce020a2a08ac7e2a12253adea8 [formerly 1b1bd69b89]]
Former-commit-id: 696e1ca91ff58627044275c70673d28ff343a7af [formerly e39187c0ce]
Former-commit-id: 0c92ddab72
2013-03-22 10:04:21 -05:00
Richard Peter
e62f6880db Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly d6a8b05c22 [formerly ead48007cb] [formerly 9fdeb37a48] [formerly 4c3fcf3b67 [formerly 9fdeb37a48 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]]]
Former-commit-id: 4c3fcf3b67
Former-commit-id: fced329e1c [formerly 4b386ccd1c] [formerly 2df7d0be62beef434695ff1afbbde3cec46a63ce [formerly 704bc86cf5]]
Former-commit-id: b5d724833aad45d35e88e62204aca2b28b69dbf0 [formerly 1cb743c14a]
Former-commit-id: 3a0627b5d1
2013-03-21 18:21:53 -05:00
Dustin Johnson
3e8624a3e8 Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
Amend:
  Add constant for "CAVE".
  Add preconditions on creating a subscription.

Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae

Former-commit-id: ace2e517d5 [formerly bd58534855] [formerly f8870c8946] [formerly ace2e517d5 [formerly bd58534855] [formerly f8870c8946] [formerly c4d4e37cad [formerly f8870c8946 [formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]]]
Former-commit-id: c4d4e37cad
Former-commit-id: ccb959c686 [formerly 09d1d7b6cf] [formerly e46190078db46b56cb5461797a9ab3f3c3ecb7f5 [formerly d58306a92e]]
Former-commit-id: abf3adf681b6aeddfe60c155ab334a33629028b4 [formerly 0f4ec00790]
Former-commit-id: 4d41fca019
2013-03-21 16:14:49 -05:00
Greg Armendariz
e4d51820e2 Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
Former-commit-id: 65d6bc8cd7 [formerly 1e1aea8a40] [formerly 6af1a22e56] [formerly 65d6bc8cd7 [formerly 1e1aea8a40] [formerly 6af1a22e56] [formerly 85113a66b6 [formerly 6af1a22e56 [formerly 7403214a115b0b856f94da1e86288307af952d77]]]]
Former-commit-id: 85113a66b6
Former-commit-id: 8550ade3ba [formerly 1884b6dce3] [formerly 3a1d4dd5377fe137da9052d33161f1179569101d [formerly ccabddace6]]
Former-commit-id: 8865116ee2a1c8adf793566471920cb0699d0ba9 [formerly 559136f546]
Former-commit-id: f9d1bfbb48
2013-03-21 12:55:59 -05:00
Dustin Johnson
71b739a546 Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development
Former-commit-id: 9818775763 [formerly a93b6f54c0] [formerly 54bbf500de] [formerly 9818775763 [formerly a93b6f54c0] [formerly 54bbf500de] [formerly c2373812bd [formerly 54bbf500de [formerly 1aad30d6c4abcca2d390da18eb9d3275b7298878]]]]
Former-commit-id: c2373812bd
Former-commit-id: a7eb161d29 [formerly e4758ccadf] [formerly 297220ad9237a9ff4113192018dfe7ba5461763f [formerly b822c6398f]]
Former-commit-id: 381df66a1a30931b0a71fd691ccfcd2f9580d63b [formerly c23347b58d]
Former-commit-id: 9426ee02af
2013-03-21 12:35:40 -05:00
Dustin Johnson
173cc2b457 Issue #1794 Use a queue to hold ncf retrieval transfers
Amend:
  Peer review comments

Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21

Former-commit-id: e8c9726d51 [formerly 3d87218f1a] [formerly b29eb94780] [formerly e8c9726d51 [formerly 3d87218f1a] [formerly b29eb94780] [formerly ebce91c15d [formerly b29eb94780 [formerly 120bd1f8278c78878bb499ec6b08932174dae1a6]]]]
Former-commit-id: ebce91c15d
Former-commit-id: b0a2a23c78 [formerly e3a5458f1a] [formerly 28f3f246d64f321b17586c020ec5a8677085f92c [formerly c88d9dd6cf]]
Former-commit-id: 2a47b90eb6d779af665719641e4d0655f79997c0 [formerly 67f055ca39]
Former-commit-id: eaf2a061b5
2013-03-21 12:28:00 -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: 237dc5ea14 [formerly f7debfc55f] [formerly cd39fcf122] [formerly 237dc5ea14 [formerly f7debfc55f] [formerly cd39fcf122] [formerly 8c309840a3 [formerly cd39fcf122 [formerly 871b2ceb2a6745369c1dc6e88d711e5e3a13cc37]]]]
Former-commit-id: 8c309840a3
Former-commit-id: 954314d74d [formerly 2de2221a35] [formerly dc7990ac7d34c4a007a93ed196275f6c5dbbe1f1 [formerly 9f9248bcd9]]
Former-commit-id: 53ad836ca917276b31c1641cf833b2d5ea883f8f [formerly 9503aa5a60]
Former-commit-id: 4b93b146fd
2013-03-21 10:58:26 -05:00
Bryan Kowal
a9dd3bd622 Issue #1663 - awips2-database will no longer install site-specific databases.
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 0ef2ee6e49 [formerly 4d3731bf6d] [formerly ab135933da] [formerly 722d068105 [formerly ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]]]]
Former-commit-id: 722d068105
Former-commit-id: 854ae5b462 [formerly ac0ef6e7b9] [formerly 587033a1da78250dbb1cee2033955c635e17a488 [formerly 5ab931d15e]]
Former-commit-id: 89161e5b870ee347472b5c502d2e0e15dad5f881 [formerly 5ca46505e0]
Former-commit-id: 0f5a5e71b7
2013-03-21 09:50:48 -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: 3d93bf69c0 [formerly 510e56c67f] [formerly d747686fa1] [formerly 3d93bf69c0 [formerly 510e56c67f] [formerly d747686fa1] [formerly bcf676f5dd [formerly d747686fa1 [formerly 855f05b2121c17c71d13495c9aacb12878757af6]]]]
Former-commit-id: bcf676f5dd
Former-commit-id: f3bdacf035 [formerly 855dd1a664] [formerly 53f7b48f88e617a35ecf463838269e6f2d614469 [formerly ac58a04170]]
Former-commit-id: 78f90e8fa626d39ab8bdeac8481d9da7c3d992b3 [formerly d46fbf9f2a]
Former-commit-id: 4b0c9c10d6
2013-03-20 17:26:31 -05:00
Bryan Kowal
acfe04a074 Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
Former-commit-id: cbffb4df4a [formerly 820518ffb9] [formerly 0479eb0cc1] [formerly cbffb4df4a [formerly 820518ffb9] [formerly 0479eb0cc1] [formerly 3baebb684b [formerly 0479eb0cc1 [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]]]
Former-commit-id: 3baebb684b
Former-commit-id: a71e14882e [formerly 63f7abc798] [formerly 5b50182da9b1d1bc0dc78315de3a77804b604894 [formerly 374bd51fb0]]
Former-commit-id: 90f1be518ad1b2127ca77166e14502c623f1acb5 [formerly 5eae24b949]
Former-commit-id: ddf4c04e59
2013-03-20 16:53:18 -05:00
Ben Steffensmeier
bdab31e123 Issue #1804 Switch all radar decompressing to be in memory.
Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221

Former-commit-id: d573574ac6 [formerly ecf93b40cc] [formerly 4c3438e160] [formerly d573574ac6 [formerly ecf93b40cc] [formerly 4c3438e160] [formerly 85b509b13e [formerly 4c3438e160 [formerly cc5b81c2b25b00def81d2e6656a7d2c615f118c0]]]]
Former-commit-id: 85b509b13e
Former-commit-id: 681c4d87f1 [formerly 5261f1f567] [formerly f0480af6eba21536855c791031ffb586f7ee7444 [formerly 5cb197eebd]]
Former-commit-id: bdcb52c27b7d7ebe864b79b9e8599fe728dc053b [formerly 7bf75df8fd]
Former-commit-id: f84059441c
2013-03-20 16:37:47 -05:00
Steve Harris
616cddf60c Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly 0379be06d2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]]
Former-commit-id: 0379be06d2
Former-commit-id: 0a86e74ea5 [formerly 8db98c2d71] [formerly 1678ef2604a244a5bc388e58878b710069703255 [formerly 4fc2bb7bba]]
Former-commit-id: f6d20e2ee3c08859d481aeb137ed2ce12d7d43af [formerly a91fcf98a2]
Former-commit-id: 961c0b56a7
2013-03-20 16:09:26 -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: ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]]
Former-commit-id: dc419068f0
Former-commit-id: 2cbd2a1bc9 [formerly f4e26fd94d] [formerly 64b470b4de5f62b27c8e9b8b00161d778a7472ba [formerly 31044eabd1]]
Former-commit-id: 3df5100c782adf8e60ee861fd034fa4cad0232ba [formerly 8065161896]
Former-commit-id: c129fed15e
2013-03-20 16:06:20 -05:00
Steve Harris
1261f1dbf9 13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]]
Former-commit-id: 7078eec1b1
Former-commit-id: dbeb388d72 [formerly e9f0328808] [formerly 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]]
Former-commit-id: a425f5b8a103c063bd8067c0d4a3f1cbedcd8f01 [formerly f2cc967a4f]
Former-commit-id: e6ab10cc26
2013-03-20 15:53:01 -05:00
Max Schenkelberg
4a8a63253a Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
Change-Id: I177804512c34603bae0027edfa420de47d23138e

Former-commit-id: 9f4b102dc7 [formerly 43341e7ad3] [formerly c6db3ce43b] [formerly 9f4b102dc7 [formerly 43341e7ad3] [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly c6db3ce43b [formerly d9cc808839d4a3210381329eec4f73e061be9968]]]]
Former-commit-id: 26cfcd2af5
Former-commit-id: 8732e302f7 [formerly ec27a16858] [formerly 1d0bcac64713d401322363f780281a663de8cdab [formerly 2e10fd83f6]]
Former-commit-id: 0ea78b9e51d9a9b783beb7ba00499485ffe88ecd [formerly 924e27f51f]
Former-commit-id: a25ccc8c5c
2013-03-20 14:10:52 -05:00
Steve Harris
0929de5965 Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml


Former-commit-id: 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 36df63be5c [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]]
Former-commit-id: cb5ea76f98
Former-commit-id: 96ba08115a [formerly d00dc0d174] [formerly 676c62cd28cf7ed4ed697282c1db1cda2b6aebde [formerly 104e6e79e8]]
Former-commit-id: b81ab6022fde7cae7ff4586a3467e9e741b445f7 [formerly 6d4512fa3a]
Former-commit-id: 352c267fc9
2013-03-20 13:45:11 -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: 0d35db042e [formerly d1e37c7803] [formerly 3b8e2ff0d3] [formerly 0d35db042e [formerly d1e37c7803] [formerly 3b8e2ff0d3] [formerly adbe7b91cc [formerly 3b8e2ff0d3 [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]]]
Former-commit-id: adbe7b91cc
Former-commit-id: 8805c42d14 [formerly 53d8ef7ed1] [formerly 377061882220d7ca7878a9f6095ebe2307dd7ab4 [formerly 3bad342dca]]
Former-commit-id: a0d88bffdd2faa06fdd928fd3e8866b77e34ba8c [formerly ff1b1598e6]
Former-commit-id: 403879b5cf
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: 41372ac122 [formerly 1203b7cee4] [formerly ee7204c05c] [formerly 41372ac122 [formerly 1203b7cee4] [formerly ee7204c05c] [formerly 82499f839d [formerly ee7204c05c [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]]]
Former-commit-id: 82499f839d
Former-commit-id: d67d0ec674 [formerly 1b363a547c] [formerly 048a16f2b52da3414fc5d576059d5543b43f69f9 [formerly 3e2a41d1d2]]
Former-commit-id: ce0f7dafa19ff3c41040e73684d15a758d74d293 [formerly 57d19b0d66]
Former-commit-id: a01b552f89
2013-03-20 13:26:33 -05:00
Dustin Johnson
0a4c9a3d33 Merge "Issue #1796 updated some headers, general cleanup" into development
Former-commit-id: 28cd17759e [formerly d584a7fb38] [formerly e5bcff21cb] [formerly 28cd17759e [formerly d584a7fb38] [formerly e5bcff21cb] [formerly e7bfdebd41 [formerly e5bcff21cb [formerly 327283da3d779b976d1fdc118c74f00047d79062]]]]
Former-commit-id: e7bfdebd41
Former-commit-id: 3e3717c6db [formerly 45ea31f4a6] [formerly d9ebf39289a57c3f87f863b6f513154ab23c1b26 [formerly e3f3ce2773]]
Former-commit-id: a1957d227976dc603301d94993a39f0b3d6dd558 [formerly 4481b1e830]
Former-commit-id: f1337b3561
2013-03-20 13:17:10 -05:00
Ben Steffensmeier
a503ef0938 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 0d765a2fcf [formerly 0d9119a1c7] [formerly 2b6aa86371] [formerly 0d765a2fcf [formerly 0d9119a1c7] [formerly 2b6aa86371] [formerly ed544fc17c [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]]
Former-commit-id: ed544fc17c
Former-commit-id: 4b0e7e77d3 [formerly b201d9dee2] [formerly b850b70906a6763277fa77ce5a2f3e638139e35a [formerly 646b61f653]]
Former-commit-id: 054b143635c076ebd5e79c9bbfe409552cff76ec [formerly 498d153e40]
Former-commit-id: 4cde2bd826
2013-03-20 13:05:54 -05:00
Dave Hladky
c290073444 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: 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: a7462a5125 [formerly 01c6ff12a0] [formerly d8061685e48c132d552a31fbc1071360f10159ed [formerly bd17b99bd1]]
Former-commit-id: 230698475e3964c6e08fa5002b60e4edb7657b26 [formerly 8299b2872a]
Former-commit-id: 1aef08f449
2013-03-20 12:41:33 -05:00
Dave Hladky
6e7e9a653b Issue #1796 updated some headers, general cleanup
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6

Former-commit-id: c0250bb4e0 [formerly 958b897c21] [formerly 5362771743] [formerly c0250bb4e0 [formerly 958b897c21] [formerly 5362771743] [formerly 38494cec16 [formerly 5362771743 [formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]]]]
Former-commit-id: 38494cec16
Former-commit-id: 1dcf1cd260 [formerly 69c6fdd887] [formerly e6da29d245a87c028da77d809a837030c9a35209 [formerly 8a46d43216]]
Former-commit-id: 4c1441e90920503c6c0241e46989c32fc0db41cd [formerly 7046f31351]
Former-commit-id: 03219ce56a
2013-03-20 12:17:08 -05:00
Roger Ferrel
93a2c0586d Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: 8a26c52506 [formerly 3acca75f82] [formerly b32ac22ef8] [formerly 8a26c52506 [formerly 3acca75f82] [formerly b32ac22ef8] [formerly 4f889b6999 [formerly b32ac22ef8 [formerly 8e2030c19a79f8ae8fe2127bfb3c7364aa5f0516]]]]
Former-commit-id: 4f889b6999
Former-commit-id: 21b81bfb04 [formerly aba0067eed] [formerly 25ccf4e495f06112c67009f618f3d499e05f536b [formerly a838aa2d74]]
Former-commit-id: 6daeacba61a8733baac24c881acb2072aabc760a [formerly 71834c493c]
Former-commit-id: 5907205c3c
2013-03-19 16:24:22 -05:00
David Gillingham
39e84043cc Issue #1447: Update MergeVTEC.py to be current with A1 DR 21434.
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9

Former-commit-id: 3ad6035189 [formerly ab6944650a] [formerly 843f474af8] [formerly 3ad6035189 [formerly ab6944650a] [formerly 843f474af8] [formerly 8ea6d7227b [formerly 843f474af8 [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]]]
Former-commit-id: 8ea6d7227b
Former-commit-id: 173ceacc0d [formerly a8ed519915] [formerly 15ae015d4e8d837d34c8ef660c79da6b2290ef2d [formerly 5f8c8a80f8]]
Former-commit-id: 31167e00f2dfb2abafb3357856550ddd88213c13 [formerly 2e57b9f262]
Former-commit-id: 3a70a07654
2013-03-19 16:06:25 -05:00
Steve Harris
5411621351 13.3.1-9 baseline
Former-commit-id: 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 3c492badbc [formerly 7e96d841d9] [formerly 3bbb9bbab1edbb030bd2a4d290990d7cda8a756f [formerly 0375805e79]]
Former-commit-id: e83406d2275f6117c72406e8ae7298dd5995a819 [formerly 65f522fc87]
Former-commit-id: 37beeaab69
2013-03-19 14:22:56 -05:00
Ben Steffensmeier
16a27f55fe Issue #1804 Cache db queries in radar decoder.
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be

Former-commit-id: f828c49328 [formerly 337e450f94] [formerly 7b83f6bdfa] [formerly f828c49328 [formerly 337e450f94] [formerly 7b83f6bdfa] [formerly 5d2d834cf7 [formerly 7b83f6bdfa [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]]]
Former-commit-id: 5d2d834cf7
Former-commit-id: 0c1fe3d11f [formerly 489a180622] [formerly 6c97a1e140c30a4f6f7ccde142ee0a06b355c751 [formerly ff0e5696e8]]
Former-commit-id: d1ae7c5b3a95206a0ebd1156d304e26ebd7b4e2e [formerly 044eeebe97]
Former-commit-id: 87b21c053d
2013-03-19 14:11:36 -05:00
Dustin Johnson
fec2db4a51 Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
Former-commit-id: d1789b5141 [formerly bc323d3f25] [formerly 5b4035fb11] [formerly d1789b5141 [formerly bc323d3f25] [formerly 5b4035fb11] [formerly 8363eba409 [formerly 5b4035fb11 [formerly 9761b41160000713d00113c5267badafc9613a0d]]]]
Former-commit-id: 8363eba409
Former-commit-id: 2896b034a7 [formerly 3c8e14edc7] [formerly bf91004f3796358ffc74a0f0628be3abb249249e [formerly e0b6e6187e]]
Former-commit-id: 29c699a80c9e5e2a63781b6b624594e5c7c717ce [formerly 889953c712]
Former-commit-id: 17fe9aee59
2013-03-19 13:09:48 -05:00
Dave Hladky
07b8f90014 Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: 77472f704f [formerly d7e8709cde] [formerly ddb23ae59f] [formerly 77472f704f [formerly d7e8709cde] [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly ddb23ae59f [formerly a52596494feb2255269513a3cd19490628d4ae10]]]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: e0d90738ad [formerly 618f737fab] [formerly 71c2eba9b6609730384eaad2e834b311fb5eefb6 [formerly f0244f54a4]]
Former-commit-id: 7fb36c3c0bac714c21eadf0ce71c66d6f3e066cc [formerly 64f8c46e64]
Former-commit-id: af0898807b
2013-03-19 13:08:14 -05:00
Ben Steffensmeier
02f7d8e3ab Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: be721b7da0 [formerly 7b7b708eee] [formerly 6c741a9ab3] [formerly be721b7da0 [formerly 7b7b708eee] [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 6c741a9ab3 [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]]]
Former-commit-id: 86dffab17d
Former-commit-id: 89ec3e9ce7 [formerly 160b6a7040] [formerly 3a15f3575a0d243b59b8d728d08f437b3b036330 [formerly dfe8de96f2]]
Former-commit-id: 008cac470dc86afbdf01474e5615c762263e40d6 [formerly e176478c7a]
Former-commit-id: f2466d6066
2013-03-18 17:16:44 -05:00
Steve Harris
4c10c7a5be Merge branch 'omaha_13.3.1' into development
Conflicts:
	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/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 027eda5dce [formerly 2a26783ba7] [formerly 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde]]
Former-commit-id: 8012cd58ae8927dc32f50de6d568a7829c75f0a6 [formerly 22bb7ecd33]
Former-commit-id: 481cee4c74
2013-03-18 16:52:00 -05:00