Nate Jensen
|
343b22daaa
|
Merge "Issue #1735 Performance improvments for LLWSData." into development
Former-commit-id: 74901e9999 [formerly 5624e303a8] [formerly ff7631d847] [formerly 74901e9999 [formerly 5624e303a8] [formerly ff7631d847] [formerly b44db0bc2c [formerly ff7631d847 [formerly 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa]]]]
Former-commit-id: b44db0bc2c
Former-commit-id: d7c57134e9 [formerly 6d32957638] [formerly 8beb70dbf586e75fc3f3f21fe48809828f454906 [formerly 314c5dcb2e]]
Former-commit-id: d0a85da3eaaaaa8b4cf2e0c8793160e3a066141d [formerly 9353bd7d8b]
Former-commit-id: 782c4b63dd
|
2013-03-26 16:28:38 -05:00 |
|
Steve Harris
|
56522d8cf5
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]]]
Former-commit-id: 65df96a419
Former-commit-id: 6e4b9a6f01 [formerly 5bb29627dc] [formerly db9839345c6d211e370f415e6567c95c5596977e [formerly 346b97a39a]]
Former-commit-id: 0576f0394c9924a93def2e1b0d821a8dd15e6468 [formerly fdd07bd72c]
Former-commit-id: 0bd1d5bdef
|
2013-03-26 12:47:40 -05:00 |
|
Steve Harris
|
d8a9db1e5c
|
Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 8d1903034b [formerly 85104939ac] [formerly e71c69c383] [formerly 8d1903034b [formerly 85104939ac] [formerly e71c69c383] [formerly 9ff8a94193 [formerly e71c69c383 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 072b1bf35e [formerly 02147470db] [formerly 9cd89cdae60b1bb313162de31e0e2c592984280a [formerly b926ff60b3]]
Former-commit-id: 75eb70e2f016a2173b886ec488d1cbc6651d6e51 [formerly 779adedea9]
Former-commit-id: 0d88cd619b
|
2013-03-26 12:44:24 -05:00 |
|
Steve Harris
|
a33631faa5
|
13.3.1-13 baseline
Former-commit-id: 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]]
Former-commit-id: c65f3e68e5
Former-commit-id: b49c1b0fa8 [formerly 4f2e9aec0d] [formerly 24c9dcc4807f8692b6eb63ba5946c346d7126d11 [formerly 822d05a709]]
Former-commit-id: 3a3a2fa20a832cb9027d27e82dc69e0c20123169 [formerly 7aa4f7b265]
Former-commit-id: 25a851cccf
|
2013-03-26 12:43:07 -05:00 |
|
Ben Steffensmeier
|
d38d09cdc1
|
Issue #1782 fix merge problems related to graphics API.
Former-commit-id: b8e7e8868f [formerly 0aad550439] [formerly 2b898e58c7] [formerly b8e7e8868f [formerly 0aad550439] [formerly 2b898e58c7] [formerly 6edee13cdd [formerly 2b898e58c7 [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]]]
Former-commit-id: 6edee13cdd
Former-commit-id: 786490e228 [formerly f983e5d705] [formerly 12a49ee4a881d261f0a943322274ece3293cc090 [formerly 76a6213807]]
Former-commit-id: 9c70d98314086fd081f33c5ada1b521712fc8879 [formerly 3dbd9580c5]
Former-commit-id: d523d6371e
|
2013-03-26 12:06:45 -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 |
|
Lee Venable
|
4cd2fa74a5
|
Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
Former-commit-id: 3e0e19ac42 [formerly a84ef2d2c3] [formerly e467daec0c] [formerly 3e0e19ac42 [formerly a84ef2d2c3] [formerly e467daec0c] [formerly 05b4c2f913 [formerly e467daec0c [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]]]
Former-commit-id: 05b4c2f913
Former-commit-id: a6a431a20b [formerly b1ce5603a0] [formerly 29ce5b07df9351fe829c6342326979e9ac25ddc4 [formerly d73b44fa67]]
Former-commit-id: 4ec69f806699f23ac3bd572dc3ac75b1672038bb [formerly b329abb111]
Former-commit-id: e03985901f
|
2013-03-25 17:20:25 -05:00 |
|
Mike Duff
|
6a469ef4b7
|
Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9
Former-commit-id: 896ad0ff63 [formerly 3d783c54be] [formerly afd0de8b5b] [formerly 896ad0ff63 [formerly 3d783c54be] [formerly afd0de8b5b] [formerly 88e75f4a90 [formerly afd0de8b5b [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]]]
Former-commit-id: 88e75f4a90
Former-commit-id: 0c3527a58c [formerly fc0b126eee] [formerly 0265f807aa71c3ad5de9c0f866b4c6f9d30d772c [formerly b517ce9a9f]]
Former-commit-id: 21877c828f64a97e03f91ac68a6643a55a33a622 [formerly 9a9d8f0503]
Former-commit-id: ac7bb442f4
|
2013-03-25 16:03:18 -05:00 |
|
Roger Ferrel
|
26437e1d6e
|
Issue #1735 Performance improvments for LLWSData.
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f
Former-commit-id: ff309e842a [formerly b5fc495b61] [formerly feadd01ad9] [formerly ff309e842a [formerly b5fc495b61] [formerly feadd01ad9] [formerly 549650c05c [formerly feadd01ad9 [formerly 0c067f6bd45f0474708af1715278d21a2a963868]]]]
Former-commit-id: 549650c05c
Former-commit-id: a1401de5a9 [formerly 912e5020d7] [formerly 1eb48b052fbe2c4118f498252212ce0bac7c0543 [formerly daecc7b7f4]]
Former-commit-id: b1fdc98ea1ebe53410c76cb7a270821ef6a31c4f [formerly 7259166afe]
Former-commit-id: b27d35b29c
|
2013-03-25 15:41:01 -05:00 |
|
Jonathan Sanchez
|
3cbe90eea4
|
Issue #1605 Check if storm location is over an urban bound area.
Former-commit-id: f4bb8f1f84 [formerly 3ca4cc9dcf] [formerly 06cd161d0e] [formerly f4bb8f1f84 [formerly 3ca4cc9dcf] [formerly 06cd161d0e] [formerly ddcb4f3451 [formerly 06cd161d0e [formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]]]
Former-commit-id: ddcb4f3451
Former-commit-id: de39c398f1 [formerly cd1095fb29] [formerly 754ef39c309a748adb8063b8b937a6a19b5bd89c [formerly c9295e6762]]
Former-commit-id: bb0e91ca8084171bb09445e1bfa612b2799f6e84 [formerly dad851857d]
Former-commit-id: d50e3af938
|
2013-03-25 14:41:55 -05:00 |
|
Lee Venable
|
19a21cc8df
|
Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
Former-commit-id: 1e99eceb62 [formerly 5d7055ad53] [formerly 25cf1cacfd] [formerly 1e99eceb62 [formerly 5d7055ad53] [formerly 25cf1cacfd] [formerly d1c84de620 [formerly 25cf1cacfd [formerly 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903]]]]
Former-commit-id: d1c84de620
Former-commit-id: 8b01a775e9 [formerly 4caa21aa69] [formerly b5aa6af106e2733245abbd54fa5e8d0b37332c11 [formerly fc41aa82ca]]
Former-commit-id: 4cd8b32d8588839148a7680c9616a8b7bb01b851 [formerly cc0debe027]
Former-commit-id: efc8488ca4
|
2013-03-25 14:08:39 -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 |
|
Jonathan Sanchez
|
8123677e62
|
Issue #1810 Accepted other values/types for useDirs.
Former-commit-id: 135c1a1fce [formerly 2d6be3d3da] [formerly d00c88a38c] [formerly 135c1a1fce [formerly 2d6be3d3da] [formerly d00c88a38c] [formerly b77ed18eb4 [formerly d00c88a38c [formerly 7492d4e2ceea99c71f8040237610d95e45c1e78a]]]]
Former-commit-id: b77ed18eb4
Former-commit-id: 43435c33e5 [formerly e01d47acfa] [formerly ab25164008201e73cdd8c75fd057496bcfd40937 [formerly 539c4dfa8e]]
Former-commit-id: 4175b5da0ae94636b839880b8f0b2c10a7ff5995 [formerly 6e02206355]
Former-commit-id: 08c9302110
|
2013-03-25 12:23:51 -05:00 |
|
Mike Duff
|
4b3bc7d648
|
Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc
Former-commit-id: dddf5d8210 [formerly 86e0184414] [formerly 593cb668bf] [formerly dddf5d8210 [formerly 86e0184414] [formerly 593cb668bf] [formerly 7118f04843 [formerly 593cb668bf [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]]]
Former-commit-id: 7118f04843
Former-commit-id: 9ec1b05c27 [formerly fcb46897e3] [formerly 827d31242f9064d6e8560408c9a9b79ef351dad1 [formerly c682fb2e9a]]
Former-commit-id: d4525b1df7938b113c5e439da8fab2340b4f7cfa [formerly 516965bea3]
Former-commit-id: e126320f82
|
2013-03-24 12:21:51 -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 |
|
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 |
|
Lee Venable
|
e49c13b61b
|
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: e022c03a4e [formerly 5c8230662d] [formerly 489e04c235] [formerly e022c03a4e [formerly 5c8230662d] [formerly 489e04c235] [formerly c8523e9108 [formerly 489e04c235 [formerly d5231f950c637b8a094b0a60b25a629f0b3644fa]]]]
Former-commit-id: c8523e9108
Former-commit-id: da4f91d1d1 [formerly a2e5e18810] [formerly a38c0aaf0d81c02c132fbf7d895fb2ae03642b5b [formerly 0d1cba8eae]]
Former-commit-id: 1ba20f23e5bc00158919a784aff5d9d1dc9ff3ac [formerly c733749c9f]
Former-commit-id: 9af40169f9
|
2013-03-21 19:27:02 -05:00 |
|
Nate Jensen
|
81588089fd
|
Merge "Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator." into development
Former-commit-id: d10c11ccd2 [formerly 5728a3e5b6] [formerly e4c1e86d55] [formerly d10c11ccd2 [formerly 5728a3e5b6] [formerly e4c1e86d55] [formerly 44f8ba8943 [formerly e4c1e86d55 [formerly 805fae0df3b82e1e16a931741d22bf7637e6aa06]]]]
Former-commit-id: 44f8ba8943
Former-commit-id: 39be82e701 [formerly fa0d772221] [formerly 73be7a5f1188b9b7409ec645d1ae325bb8766c2c [formerly 84e8a30ad7]]
Former-commit-id: cf5e15b22bd699c68e9f76cab8b5be49c72f0389 [formerly 4a8974e6a0]
Former-commit-id: 5f11e7d243
|
2013-03-21 17:06:37 -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 |
|
Nate Jensen
|
da610f0b33
|
Merge "Issue #1808 perspective specific actions take priority" into development
Former-commit-id: e4d8b23294 [formerly 113da23467] [formerly d6d7b081cf] [formerly e4d8b23294 [formerly 113da23467] [formerly d6d7b081cf] [formerly 255b2dbd29 [formerly d6d7b081cf [formerly 0c710437147f3a1b242f93a4c63c2451d5724f3e]]]]
Former-commit-id: 255b2dbd29
Former-commit-id: 9b16df5be9 [formerly 7ce724d4fd] [formerly 028e5a5592ab805e137eef6932ddca1a7788aefa [formerly 7821b86e87]]
Former-commit-id: db55e36998070b6430ab80d1ab1ca7c25cf8776c [formerly 5d0194d7a3]
Former-commit-id: 0d0a93dd1c
|
2013-03-21 15:07:57 -05:00 |
|
Mike Duff
|
58bea82862
|
Issue #1812 - Scan/DMD trend graphs and trend sets graphs update on threshold changes.
Change-Id: I1150f365ef7b67a198f57cca85859f6767eb0234
Former-commit-id: 0ba05ec6e5 [formerly 540524941d] [formerly e4ffefa649] [formerly 0ba05ec6e5 [formerly 540524941d] [formerly e4ffefa649] [formerly 09feff70e0 [formerly e4ffefa649 [formerly 8ddcbfac38c225c6771e97de738125a1149ae1c4]]]]
Former-commit-id: 09feff70e0
Former-commit-id: 01374e2b4e [formerly 524dfa985f] [formerly f337379307c42237568f779a8b1424b7176cd91b [formerly a45389f735]]
Former-commit-id: c309d4f1c03641f79757c4a06d8ad1bd3018605e [formerly 8c1b60bae9]
Former-commit-id: 31657d334c
|
2013-03-21 12:23:56 -05:00 |
|
Ben Steffensmeier
|
5fb8c37bab
|
Issue #1806 Update GL mosaicing to use dynamic data format for offscreen textures.
Change-Id: Ib756f4ce978ace6fae41dd407ab9187cd6b70d51
Former-commit-id: 6cbdf5beda [formerly 3cc175f373] [formerly e69011cdd8] [formerly 6cbdf5beda [formerly 3cc175f373] [formerly e69011cdd8] [formerly de02fe7922 [formerly e69011cdd8 [formerly 26baf1550ad70417a68bd0a36ea99ac83c6d39cd]]]]
Former-commit-id: de02fe7922
Former-commit-id: 3e3e114898 [formerly 4323ea54d2] [formerly 53fc7d83e457d86a8b95d9126ec3adbb8909a627 [formerly 6ce135a80a]]
Former-commit-id: 0954e4a2a3a0f4503430e305acb1cc49e96ada47 [formerly 9feaaa1961]
Former-commit-id: 96fe46d7a3
|
2013-03-21 11:09:23 -05:00 |
|
Max Schenkelberg
|
ed0af29c23
|
Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator.
Amend: Added header comments and more unused code
Change-Id: Ib9285d0472e41473ba79bbada8ea2bf57b55d686
Former-commit-id: 1cc836611f [formerly 3bda2ba497] [formerly b2e374c7fb] [formerly 1cc836611f [formerly 3bda2ba497] [formerly b2e374c7fb] [formerly 5109641194 [formerly b2e374c7fb [formerly e40808621cfee3cabe6b6cf124440632ef08d5d7]]]]
Former-commit-id: 5109641194
Former-commit-id: 5e108e1c4e [formerly 9aa8f9dd9e] [formerly dbdb63e7eaa979429543c7d3c35d70b666712d88 [formerly 21b8c130c2]]
Former-commit-id: 79ce073a98b67ba5787b628448c55abcdc1f9e0d [formerly 5175c821bd]
Former-commit-id: 3b032517ac
|
2013-03-20 17:38:02 -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 |
|
Nate Jensen
|
39ef57981b
|
Issue #1808 perspective specific actions take priority
Change-Id: I21f5515fe0c2a480dee9950bacbc2b06fd084072
Former-commit-id: 9ff2d78022 [formerly 00f750ae06] [formerly c1ddc02b10] [formerly 9ff2d78022 [formerly 00f750ae06] [formerly c1ddc02b10] [formerly de3aea9afb [formerly c1ddc02b10 [formerly d69f2087948a54618c6f22878d575b6760950909]]]]
Former-commit-id: de3aea9afb
Former-commit-id: 84c537c0de [formerly 5acc1d6835] [formerly aaa39d3a5c60cd474b5e3dd4f5a7c452b536b7b0 [formerly a5f4b4f0ad]]
Former-commit-id: 58df4e0dfda8bda8edac084ee7d5ffa751d32e23 [formerly 54e7989366]
Former-commit-id: 95eeeedcb1
|
2013-03-20 16:27:31 -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 |
|
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 |
|
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 |
|
Richard Peter
|
2340c05137
|
Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
Former-commit-id: 47a74b9867 [formerly 2fdbc96342] [formerly 4ce10bced9] [formerly 47a74b9867 [formerly 2fdbc96342] [formerly 4ce10bced9] [formerly 3a92747518 [formerly 4ce10bced9 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]]]
Former-commit-id: 3a92747518
Former-commit-id: 26e2d62e99 [formerly eebd930070] [formerly 7532765e0a4316f68ebd2971adf3566334c5a08c [formerly c955b3b640]]
Former-commit-id: 1c0c5a83932631df486bbeffa3d0850087fe50b7 [formerly 1bf2c48011]
Former-commit-id: 5f09e66d4e
|
2013-03-19 13:24:28 -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 |
|
Mike Duff
|
4943f6f2d8
|
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: 361434a64f [formerly 70efff8f0a] [formerly b115d3611c] [formerly 361434a64f [formerly 70efff8f0a] [formerly b115d3611c] [formerly 058064ce0d [formerly b115d3611c [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]]]
Former-commit-id: 058064ce0d
Former-commit-id: e205993cba [formerly 3e1b4ba54b] [formerly f1784284db525c1ae3413ff04b935577969880b1 [formerly 7e66c8e46d]]
Former-commit-id: bda98ae3e9d9fb64c0dfddbd5de2cf785f5bcbb7 [formerly 144223ed9b]
Former-commit-id: c22d1962de
|
2013-03-19 10:10:01 -05:00 |
|
Bryan Kowal
|
162b0b1d40
|
Issue #1805 - slightly modified viz feature build order
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: 72bdbbb7f6 [formerly 6106369d4c] [formerly f325038538] [formerly 72bdbbb7f6 [formerly 6106369d4c] [formerly f325038538] [formerly f0eb7d3285 [formerly f325038538 [formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]]]
Former-commit-id: f0eb7d3285
Former-commit-id: dc2dc31f7e [formerly fd68cd7a04] [formerly 8cd05408fb45131c5569dd6fe66f49be87474a71 [formerly 54113e9b29]]
Former-commit-id: fb3115642a2b5d3b64623250b34661ca2c9d12dd [formerly 959e8b717f]
Former-commit-id: 50e884aab0
|
2013-03-18 18:15:26 -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 |
|
Steve Harris
|
c1bb0c2749
|
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: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]]
Former-commit-id: c18b96dc4c
Former-commit-id: 0e9919f6be [formerly ea27f9cd17] [formerly e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]]
Former-commit-id: e6c80b59106bc4b2d5423de97088b928e09b489c [formerly fc6748cb3e]
Former-commit-id: 9d4d1baefe
|
2013-03-18 16:43:22 -05:00 |
|
Bryan Kowal
|
33b56397a3
|
Issue #1741 - what was once two is now one
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts
Former-commit-id: 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 4f808edba3 [formerly a93dcff1b5] [formerly b954bc17bf] [formerly 7fd035256d [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]]]
Former-commit-id: 7fd035256d
Former-commit-id: 9d8b41c8c7 [formerly 3e8d5449fc] [formerly 5c7fdb0ba007173bdb27684c17eee947cc76d90b [formerly 66e2ed79ec]]
Former-commit-id: 91ab574f18aa46466914129e5425a627996ad4d1 [formerly 56f2b3f0c2]
Former-commit-id: 81ebbd5a5b
|
2013-03-18 16:36:33 -05:00 |
|