Commit graph

408 commits

Author SHA1 Message Date
Dustin Johnson
94002b3be9 Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Conflicts:

	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/DefaultLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerHolder.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleDimension.java
	edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleLayer.java
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/res/spring/grib-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/src/com/raytheon/uf/edex/plugin/grib/ogc/GribLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/build.properties
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-dpa-ingest.xml
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/MetarLayerCollector.java
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/feature/Metar.java
	edexOsgi/com.raytheon.uf.edex.topo/src/com/raytheon/uf/edex/topo/StatusConstants.java
	edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/styling/ColormapStyleProvider.java
	edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/util/ColorMapUtility.java


Former-commit-id: af4da9286b [formerly dbeffa91fe] [formerly 375f0801a2] [formerly 3c41127c42 [formerly 375f0801a2 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]]
Former-commit-id: 3c41127c42
Former-commit-id: 1aa6cc2e6bc2ae28b658d5879fe7eb65cc4a7b70 [formerly 0dc74710ce]
Former-commit-id: 9a4f4431de
2013-04-04 13:10:24 -05:00
Richard Peter
d1369dbf29 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: 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 814bff6ddb [formerly f77948929d [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]]
Former-commit-id: 814bff6ddb
Former-commit-id: ce08d17392a7953ce37dadfeeddad3576552db03 [formerly 4337abd873]
Former-commit-id: e9fe732dac
2013-04-04 13:03:41 -05:00
Bryan Kowal
ef26170029 Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 978f55d007 [formerly 8c68c8f9cb] [formerly 9a082dfd10b58ca1a85b6259b5266315368b5882 [formerly bfb14b4ad6]] [formerly 24dd9b550d [formerly bfb14b4ad6 [formerly f1551ef32c5e67358a60a6ba7d1ca2344afa0829]]]
Former-commit-id: 24dd9b550d
Former-commit-id: 2e41083816bf9b61d5576a771bb66626e85ceea0 [formerly 122c085a62]
Former-commit-id: 0a801c95ce
2013-04-04 13:03:20 -05:00
Bryan Kowal
1147a05bcf 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: ce08162045 [formerly 991de38661] [formerly a8d4e8f6ec] [formerly 3d04b0f87b [formerly a8d4e8f6ec [formerly 5691e7ffdcf695ea28726212c1a8604607e35427]]]
Former-commit-id: 3d04b0f87b
Former-commit-id: 98c4ccb22060dd1661aa24f92d73ea9c175710d4 [formerly a154e3b3cd]
Former-commit-id: a214ee536a
2013-04-04 13:03:08 -05:00
Roger Ferrel
e1d9065706 Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: 1fb0666a69 [formerly 24e5e7ff35] [formerly 4e607bc7bf] [formerly 2cd455764b [formerly 4e607bc7bf [formerly 79d768ff4df2d866aaea4dc8d2197cf190eb2809]]]
Former-commit-id: 2cd455764b
Former-commit-id: 2c437b337b3e7accdbe6bd644d0cb84ad0153430 [formerly 97fdbb2477]
Former-commit-id: df1c674ba0
2013-04-04 13:02:58 -05:00
Bryan Kowal
710c23bd4c Issue #1805 - slightly modified viz feature build order
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569

Former-commit-id: 685123f51d [formerly 40dd190ecf] [formerly 40a4b38929] [formerly 8187df486a [formerly 40a4b38929 [formerly 7e6ffbe4447fcaf13cae49d16038d5edfa0cdfec]]]
Former-commit-id: 8187df486a
Former-commit-id: c293c242989b735cdbe96bb812cb793e886d8b66 [formerly 3c70c5be2b]
Former-commit-id: ee25f748c1
2013-04-04 13:02:49 -05:00
Bryan Kowal
f666b664f9 Issue #1663 - updated libpq.so for the native hydro applications
The following commands were used to complete the update:
- tar -xpf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so*
- tar -pf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so* --delete
- rm -fv ./edex/lib/native/linux32/*.so*
- cp -Pv /awips2/psql/lib/libpq*.so* ./edex/lib/native/linux32
- tar -uf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/*.so*

Change-Id: I7315109880c4813ede4f9d87877bc3ddf20cb7f1

Former-commit-id: 1998c1e1ca [formerly d899bea93a] [formerly 7dd4a88415] [formerly 28bd0a772f [formerly 7dd4a88415 [formerly 4febb7c32a33f18f17b29a166462a34fbe60edbb]]]
Former-commit-id: 28bd0a772f
Former-commit-id: 5169277b343e4593bec81e121f48f80dc5e3b077 [formerly b6f3aecdc5]
Former-commit-id: 1b815aa845
2013-04-04 13:01:39 -05:00
Bryan Kowal
20d58ef413 Issue #1663 - name the default geometry column
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: f81212d444 [formerly d35246ef31] [formerly 267b2c4dfa] [formerly 37d869ef60 [formerly 267b2c4dfa [formerly 2a8a3a3dab4d3e816bdb484ac94f456a80cd2616]]]
Former-commit-id: 37d869ef60
Former-commit-id: f85c6a8bcab56873e52500a8858a7ccc31a3523f [formerly 6eec333843]
Former-commit-id: 1ce9d40711
2013-04-04 13:01:09 -05:00
David Gillingham
fd639744bf Issue #1759: Convert ifpnetCDF and iscMosaic to use more robust request
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.

Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152

Conflicts:

	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py


Former-commit-id: aaddb9cd58 [formerly 5ae3fbd325] [formerly d24fcc85e2] [formerly 56235e370f [formerly d24fcc85e2 [formerly 37020656f1502afee59e41ed7daf16775e200cbf]]]
Former-commit-id: 56235e370f
Former-commit-id: 0808d1706a10907ff236663e85686c504930a1cb [formerly 60e8146a18]
Former-commit-id: b97b1766ee
2013-04-04 13:00:36 -05:00
Bryan Kowal
d6b11bacf0 Issue #1663 - PostgreSQL Upgrade
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
   * geos 3.3.7
   * postgis 2.0.2
   * proj 4.8.0
   * gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers

Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8

Former-commit-id: 321660e016 [formerly 211307edfd] [formerly 9e99447eee] [formerly 4fd4786ae5 [formerly 9e99447eee [formerly 8faf829eb0a8721093a181fe1335d5ee15a1fbaa]]]
Former-commit-id: 4fd4786ae5
Former-commit-id: dced69266300d616b3126d8ab0a9ce82349c7fc0 [formerly fcc7b102ad]
Former-commit-id: d40863c38f
2013-04-04 12:56:58 -05:00
Mike Duff
6024d7fb50 Issue #1646 - Format the output
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: ea0cd457ac [formerly 2e424cd74a] [formerly 4ab07a31da] [formerly d5d4ed7327 [formerly 4ab07a31da [formerly 337e2e2da520492b10864ef9f98130c5c19e0448]]]
Former-commit-id: d5d4ed7327
Former-commit-id: 44825e8261549149e51d6e8f7a6835db9fa371e9 [formerly aefbc4f54f]
Former-commit-id: 57fa0f2ef9
2013-04-04 12:56:44 -05:00
David Gillingham
bde4f4c03d Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

Conflicts:

	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF


Former-commit-id: 493814adf5 [formerly 05f52e6e54] [formerly 055c36ea41] [formerly 0969f85246 [formerly 055c36ea41 [formerly 45846ffc137ef816dc149f3f9e46b99dbe608897]]]
Former-commit-id: 0969f85246
Former-commit-id: e974a975769591433b0e949683524759177531b9 [formerly 8859674c70]
Former-commit-id: 2038a703ac
2013-04-04 12:46:21 -05:00
Bryan Kowal
9041cb18ca Issue #1750 - edexBridge will now set the QPID persistence flag
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98

Conflicts:

	rpms/awips2.core/Installer.ldm/component.spec


Former-commit-id: bc227a5cb9 [formerly 6f8ef422c8] [formerly d585db3b99] [formerly 1e3e6e3f28 [formerly d585db3b99 [formerly e95b6ade25a28b440d7283b5d162ff88f3671378]]]
Former-commit-id: 1e3e6e3f28
Former-commit-id: 14e31ea1ce773ab9f5dfc2a8393ea15bfff7a2b5 [formerly fdf99a56b2]
Former-commit-id: 45ee1fd607
2013-04-04 12:37:15 -05:00
Steve Harris
1a2b88cd38 Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18

Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.product.awips/awips.product
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py

Former-commit-id: 55655fdab9 [formerly 3487a41532] [formerly ea34b1db1e] [formerly d98a119f4d [formerly ea34b1db1e [formerly 735ce03302b54116c8545daf043585fb16fabd11]]]
Former-commit-id: d98a119f4d
Former-commit-id: 81f4469f3483d2aa0d3f210a9122ae238b69e5a7 [formerly 1a91fd82ff]
Former-commit-id: 3ea89862c0
2013-04-04 11:12:22 -05:00
Steve Harris
688327d314 13.2.1-21 baseline
Former-commit-id: 50106822ea [formerly a86d44584d] [formerly cf6ce2cede4f08c2e7976543017c522cfdf73446 [formerly d4358b93dc]] [formerly 33bd359cfe [formerly d4358b93dc [formerly f80eddbb15e5ca1710c15d245957345d6f840546]]]
Former-commit-id: 33bd359cfe
Former-commit-id: 09e2a7d813b8cb62d46bd89be26006f9864a8721 [formerly 18d6fa4f4d]
Former-commit-id: 5c029bc4ac
2013-04-03 18:08:41 -04:00
Steve Harris
3be498b2fc 13.2.1-20 baseline
Former-commit-id: 3aa43b1b0d [formerly ad663b925c] [formerly 6a55bc5dff] [formerly 539faf0a71 [formerly 6a55bc5dff [formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]]
Former-commit-id: 539faf0a71
Former-commit-id: 7dca551d593dd1f6e0032c2e45684997afece6da [formerly 12d4316b3a]
Former-commit-id: b062373048
2013-04-03 18:05:39 -04:00
Steve Harris
a196ebc11b 13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]
Former-commit-id: 0edd049e3b
2013-04-03 14:58:29 -05:00
Steve Harris
a6ff543f88 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]
Former-commit-id: ef413da5f7
2013-04-01 12:04:56 -05:00
Steve Harris
994aab5c6a 13.3.1-16 baseline
Former-commit-id: 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 3066dd33e5 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 4ee75d69123e11d9ab2091fbd33d33a09b414210 [formerly 36a4b3eb51]
Former-commit-id: 6b75202d07
2013-04-01 11:39:08 -05:00
Steve Harris
4df1b4aeae 13.3.1-15 baseline
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]
Former-commit-id: 2bf790aae3
2013-04-01 11:33:20 -05:00
Steve Harris
8a561e4b84 13.2.1-19 baseline
Former-commit-id: 127cd26812 [formerly 88a4bb0924] [formerly bebd9ad1f4] [formerly fc859547f8 [formerly bebd9ad1f4 [formerly 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7]]]
Former-commit-id: fc859547f8
Former-commit-id: 34cab86a38e7b40b1cbd8dddbfeae07e06a3afb3 [formerly a83eddfe7b]
Former-commit-id: 4525c281f3
2013-04-01 10:11:24 -04:00
Steve Harris
7e379468f5 13.3.1-14 baseline
Former-commit-id: bf64a0dc2f [formerly 6a4bbd9f1a] [formerly c29076949e] [formerly 4d4234d5c9 [formerly c29076949e [formerly e05ab5dbc442d410ae53400f087c02197ba5068b]]]
Former-commit-id: 4d4234d5c9
Former-commit-id: 1abdaa1a9ab7f0a79d2f0781641350605735054f [formerly c0737a6022]
Former-commit-id: e89cef72a4
2013-03-27 22:10:03 -05:00
Steve Harris
3cbf22bd96 13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]
Former-commit-id: 936e4adda2
2013-03-27 17:59:34 -05:00
Steve Harris
b49c1b0fa8 13.3.1-13 baseline
Former-commit-id: 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]
Former-commit-id: c65f3e68e5
Former-commit-id: 24c9dcc4807f8692b6eb63ba5946c346d7126d11 [formerly 822d05a709]
Former-commit-id: 4f2e9aec0d
2013-03-26 12:43:07 -05:00
Steve Harris
bb30a41300 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]
Former-commit-id: f80f98cee2
2013-03-25 13:27:13 -05:00
Steve Harris
c37e88ac4a 13.3.1-11 baseline
Former-commit-id: 408234ee2b [formerly 2edab61540] [formerly 9cdd90e382] [formerly 373d13df39 [formerly 9cdd90e382 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]]
Former-commit-id: 373d13df39
Former-commit-id: 5e334c606f97e4e1517274a870990e91b9366443 [formerly d868003067]
Former-commit-id: 11baf4c2f0
2013-03-25 13:20:03 -05:00
Steve Harris
dbeb388d72 13.3.1-10 baseline
Former-commit-id: 76ea9120d8 [formerly 57f4676b6c] [formerly 073687d9a9] [formerly 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 7078eec1b1
Former-commit-id: 023f42cbdef7d2df7347dbb273b58245adbc07be [formerly 7c2e617d26]
Former-commit-id: e9f0328808
2013-03-20 15:53:01 -05:00
Steve Harris
1b17e990f1 13.2.1-18 baseline
Former-commit-id: 0bb9bde142 [formerly 97dfda9020] [formerly 3fd5612f89] [formerly f52a716b3f [formerly 3fd5612f89 [formerly aaef550ed7b6715c68b755514ceb504a9a9e9453]]]
Former-commit-id: f52a716b3f
Former-commit-id: a58961e5fad959c07418231b89523dfd54790ef3 [formerly 72edfa459b]
Former-commit-id: 6e292f6296
2013-03-20 16:46:35 -04:00
Steve Harris
3c492badbc 13.3.1-9 baseline
Former-commit-id: 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 3bbb9bbab1edbb030bd2a4d290990d7cda8a756f [formerly 0375805e79]
Former-commit-id: 7e96d841d9
2013-03-19 14:22:56 -05:00
Steve Harris
2fd4ac9397 13.3.1-8 baseline
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]
Former-commit-id: 81a3f29afc
2013-03-18 15:43:32 -05:00
Steve Harris
848c2097fa 13.2.1-17 baseline
Former-commit-id: 3dff54e277 [formerly 4bb3ad8bde] [formerly 43aa54dc4c] [formerly e3e250c817 [formerly 43aa54dc4c [formerly 1530bd69d5e34c81edae099c0670ae3899c94d1e]]]
Former-commit-id: e3e250c817
Former-commit-id: 924d3b5332b2e82c2296a201f090a2182fccc479 [formerly 6bfab62991]
Former-commit-id: acb3d94a34
2013-03-18 13:01:37 -04:00
Steve Harris
409b19b3a9 13.2.1-16 baseline
Former-commit-id: f677bae97c [formerly 1eca318fab] [formerly a75fe06bfe] [formerly ef031e34df [formerly a75fe06bfe [formerly e40b78e021afdc0d3775c7bd3720aee81b58133a]]]
Former-commit-id: ef031e34df
Former-commit-id: 62b07834d0695cb159804fcc78f0c3c3815da4b6 [formerly 7915f0ce01]
Former-commit-id: 7cdd09f484
2013-03-18 12:57:34 -04:00
Steve Harris
75e51266e4 13.2.1-15 baseline
Former-commit-id: b16f2448a9 [formerly ff687e572b] [formerly 7b52d3eb6e] [formerly 7617a2437f [formerly 7b52d3eb6e [formerly a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc]]]
Former-commit-id: 7617a2437f
Former-commit-id: 95795084a4154ad9fabef9bc6d518b7567cc0437 [formerly 29c9d5a170]
Former-commit-id: b237f19e78
2013-03-18 12:53:04 -04:00
Steve Harris
874db8cbea 13.2.1-14 baseline
Former-commit-id: 69d88d9067 [formerly 5584a04cbd] [formerly 00ce32ea21] [formerly af22cfad98 [formerly 00ce32ea21 [formerly 101c9de4e57be6c25dab4f1e6d9158a33ca89005]]]
Former-commit-id: af22cfad98
Former-commit-id: 2747fe42a135bc952d56bd70816b65ce98e19e69 [formerly d8775866a6]
Former-commit-id: 604f8cc059
2013-03-18 12:46:46 -04:00
Steve Harris
45a2d0501d 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]
Former-commit-id: ed5f1dbab6
2013-03-13 09:50:28 -05:00
Steve Harris
f92bc8f3d4 13.3.1-6.1 baseline
Former-commit-id: 3ea50babf5 [formerly 6d96471b9b] [formerly fa9d260c2b] [formerly a062803c8c [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]]
Former-commit-id: a062803c8c
Former-commit-id: 38ded82c18c6e60a96a3dd85d4c9dd3d0ed218fe [formerly bfa25f3330]
Former-commit-id: 2e1dbdc10d
2013-03-13 08:28:26 -05:00
Steve Harris
0cec06c171 13.3.1-6 baseline
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]
Former-commit-id: 6fe4b16924
2013-03-12 08:35:45 -05:00
Steve Harris
3f9462d6b2 13.2.1-13 baseline
Former-commit-id: 301e4186db [formerly 7f54c8ce19] [formerly 088e318fda] [formerly 94fa707724 [formerly 088e318fda [formerly 54d1ecdf86e471b984eb4a74d42d03145ae067d0]]]
Former-commit-id: 94fa707724
Former-commit-id: d5679c31e74b194d44517baaa8a47532867fdaa6 [formerly 0706fce85c]
Former-commit-id: 377d09ffe3
2013-03-11 11:55:20 -04:00
Steve Harris
ebf5b3e1cc 13.2.1-12 baseline
Former-commit-id: 719b5f8ef7 [formerly 1e9f9af89c] [formerly 23a41ad607] [formerly de136aad72 [formerly 23a41ad607 [formerly 6316b9db6cbf29e0038128763d2ad86b1b7abae8]]]
Former-commit-id: de136aad72
Former-commit-id: 31e65336f5df646e56a476308e974fb9924b6e6b [formerly e71ef2b835]
Former-commit-id: 18e488a203
2013-03-07 13:43:04 -05:00
Steve Harris
aabd5cd51f 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]
Former-commit-id: e26f7eb151
Former-commit-id: 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]
Former-commit-id: a240379588
2013-03-05 10:47:06 -06:00
Steve Harris
4bfbb518c0 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]
Former-commit-id: 3e0614b43a
2013-03-05 10:39:59 -06:00
Steve Harris
5a005ceb80 13.2.1-11 baseline
Former-commit-id: 5acc4265ae [formerly 0fa57eeaf2] [formerly 41dc7c0396] [formerly 0684d77845 [formerly 41dc7c0396 [formerly 9e9758e833caa408d168a5de2fe35be8e5451051]]]
Former-commit-id: 0684d77845
Former-commit-id: 350b197211835ca4f69364b7aed4480599794989 [formerly 9cc1613b50]
Former-commit-id: 6710698a10
2013-03-04 17:34:39 -05:00
Steve Harris
9e33e5aed0 13.3.1-3 baseline
Merge branch 'master_13.3.1' of ../ss_build_transfer_copy into master_13.3.1

conflicts resolved by 'theirs' strategy (all of 13.3.1-10)

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 786642589b [formerly 07167ec04f] [formerly cf951785c8] [formerly db761c0f19 [formerly cf951785c8 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]]
Former-commit-id: db761c0f19
Former-commit-id: e1e30a87bbefe4ace1cec506478f31b1c194a07f [formerly 62e15dacdb]
Former-commit-id: 988430b44d
2013-02-25 15:54:24 -06:00
Steve Harris
30efc4c86a 13.3.1-3 baseline
Former-commit-id: 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]
Former-commit-id: 8a64f142e5
Former-commit-id: ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3]
Former-commit-id: 05eb25f124
2013-02-25 10:24:53 -05:00
Steve Harris
f2428e968a 13.3.1-2 baseline
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]
Former-commit-id: 3d115ed3be
Former-commit-id: 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]
Former-commit-id: 370ed98038
2013-02-25 10:18:36 -05:00
Steve Harris
a7f2a694c5 13.2.1-10 baseline
Former-commit-id: a08b994afd [formerly 317c81a797] [formerly 48ebd10390] [formerly acf2f8ff92 [formerly 48ebd10390 [formerly 9880bba4c4a0fd8d3352036294745b5b9c0aa7d3]]]
Former-commit-id: acf2f8ff92
Former-commit-id: 44911d1a0c4d6270f04d7df1f037ac320a041e91 [formerly 525d04621d]
Former-commit-id: a25b89bff2
2013-02-25 10:11:00 -05:00
Steve Harris
96c7269df0 13.3.1-1 baseline
Former-commit-id: 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19]
Former-commit-id: 0569ff413d
2013-02-21 09:36:59 -05:00
Steve Harris
6168846b97 13.2.1-8 baseline
Merge commit '1da0393' into master_13.3.1

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: f55ea02607 [formerly f5bd250026] [formerly 7f2b4a8092] [formerly 2f7bf90856 [formerly 7f2b4a8092 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]]
Former-commit-id: 2f7bf90856
Former-commit-id: 224ac801b740bcfa7e8f8edee78de977ecae225d [formerly a723531b31]
Former-commit-id: 87bd35250c
2013-02-21 09:25:27 -05:00
Steve Harris
db712e1fcf 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
2013-02-20 16:19:40 -06:00
Steve Harris
cef8f92134 13.2.1-9 baseline
Former-commit-id: df8b1abefa [formerly 2dc4a4f50f] [formerly a339cfb704] [formerly d6dc4694f0 [formerly a339cfb704 [formerly 915d8edd4670b38df0474de72cf19c6d8b9aa1a3]]]
Former-commit-id: d6dc4694f0
Former-commit-id: 32556ccd51e1d87415093258d85c1c58158ff497 [formerly 03e04cbcca]
Former-commit-id: 9ec03fb946
2013-02-20 14:11:20 -05:00