xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
308 commits 31 branches 40 tags 3.8 GiB
Commit graph

308 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dustin Johnson
9a4f4431de 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: dbeffa91fe [formerly 375f0801a2] [formerly 3c41127c42 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]
Former-commit-id: 3c41127c42
Former-commit-id: 0dc74710ce
 2013-04-04 13:10:24 -05:00
Richard Peter
e9fe732dac 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: 91d708eaac [formerly f77948929d] [formerly 814bff6ddb [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]
Former-commit-id: 814bff6ddb
Former-commit-id: 4337abd873
 2013-04-04 13:03:41 -05:00
Bryan Kowal
0a801c95ce Issue #1750 - add clean scriptlet to pgadmin3 rpm specification 
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

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

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

Former-commit-id: 40dd190ecf [formerly 40a4b38929] [formerly 8187df486a [formerly 7e6ffbe4447fcaf13cae49d16038d5edfa0cdfec]]
Former-commit-id: 8187df486a
Former-commit-id: 3c70c5be2b
 2013-04-04 13:02:49 -05:00
Bryan Kowal
1b815aa845 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: d899bea93a [formerly 7dd4a88415] [formerly 28bd0a772f [formerly 4febb7c32a33f18f17b29a166462a34fbe60edbb]]
Former-commit-id: 28bd0a772f
Former-commit-id: b6f3aecdc5
 2013-04-04 13:01:39 -05:00
Bryan Kowal
1ce9d40711 Issue #1663 - name the default geometry column 
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: d35246ef31 [formerly 267b2c4dfa] [formerly 37d869ef60 [formerly 2a8a3a3dab4d3e816bdb484ac94f456a80cd2616]]
Former-commit-id: 37d869ef60
Former-commit-id: 6eec333843
 2013-04-04 13:01:09 -05:00
David Gillingham
b97b1766ee 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: 5ae3fbd325 [formerly d24fcc85e2] [formerly 56235e370f [formerly 37020656f1502afee59e41ed7daf16775e200cbf]]
Former-commit-id: 56235e370f
Former-commit-id: 60e8146a18
 2013-04-04 13:00:36 -05:00
Bryan Kowal
d40863c38f 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: 211307edfd [formerly 9e99447eee] [formerly 4fd4786ae5 [formerly 8faf829eb0a8721093a181fe1335d5ee15a1fbaa]]
Former-commit-id: 4fd4786ae5
Former-commit-id: fcc7b102ad
 2013-04-04 12:56:58 -05:00
Mike Duff
57fa0f2ef9 Issue #1646 - Format the output 
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: 2e424cd74a [formerly 4ab07a31da] [formerly d5d4ed7327 [formerly 337e2e2da520492b10864ef9f98130c5c19e0448]]
Former-commit-id: d5d4ed7327
Former-commit-id: aefbc4f54f
 2013-04-04 12:56:44 -05:00
David Gillingham
2038a703ac 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: 05f52e6e54 [formerly 055c36ea41] [formerly 0969f85246 [formerly 45846ffc137ef816dc149f3f9e46b99dbe608897]]
Former-commit-id: 0969f85246
Former-commit-id: 8859674c70
 2013-04-04 12:46:21 -05:00
Bryan Kowal
45ee1fd607 Issue #1750 - edexBridge will now set the QPID persistence flag 
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98

Conflicts:

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


Former-commit-id: 6f8ef422c8 [formerly d585db3b99] [formerly 1e3e6e3f28 [formerly e95b6ade25a28b440d7283b5d162ff88f3671378]]
Former-commit-id: 1e3e6e3f28
Former-commit-id: fdf99a56b2
 2013-04-04 12:37:15 -05:00
Steve Harris
3ea89862c0 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: 3487a41532 [formerly ea34b1db1e] [formerly d98a119f4d [formerly 735ce03302b54116c8545daf043585fb16fabd11]]
Former-commit-id: d98a119f4d
Former-commit-id: 1a91fd82ff
 2013-04-04 11:12:22 -05:00
Steve Harris
5c029bc4ac 13.2.1-21 baseline 
Former-commit-id: a86d44584d [formerly d4358b93dc] [formerly 33bd359cfe [formerly f80eddbb15e5ca1710c15d245957345d6f840546]]
Former-commit-id: 33bd359cfe
Former-commit-id: 18d6fa4f4d
 2013-04-03 18:08:41 -04:00
Steve Harris
b062373048 13.2.1-20 baseline 
Former-commit-id: ad663b925c [formerly 6a55bc5dff] [formerly 539faf0a71 [formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]
Former-commit-id: 539faf0a71
Former-commit-id: 12d4316b3a
 2013-04-03 18:05:39 -04:00
Steve Harris
0edd049e3b 13.3.1-18 baseline 
Former-commit-id: f3e79bcc9d [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: ce6a06a7e3
Former-commit-id: bf6c3b6762
 2013-04-03 14:58:29 -05:00
Steve Harris
ef413da5f7 13.3.1-17 baseline 
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
 2013-04-01 12:04:56 -05:00
Steve Harris
6b75202d07 13.3.1-16 baseline 
Former-commit-id: a262f22cee [formerly 51380726d4] [formerly 3066dd33e5 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]
Former-commit-id: 3066dd33e5
Former-commit-id: 36a4b3eb51
 2013-04-01 11:39:08 -05:00
Steve Harris
2bf790aae3 13.3.1-15 baseline 
Former-commit-id: 4cf3ad6abb [formerly eb1dab3864] [formerly 3d8ed484be [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: 3d8ed484be
Former-commit-id: d3cec5d3cb
 2013-04-01 11:33:20 -05:00
Steve Harris
4525c281f3 13.2.1-19 baseline 
Former-commit-id: 88a4bb0924 [formerly bebd9ad1f4] [formerly fc859547f8 [formerly 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7]]
Former-commit-id: fc859547f8
Former-commit-id: a83eddfe7b
 2013-04-01 10:11:24 -04:00
Steve Harris
e89cef72a4 13.3.1-14 baseline 
Former-commit-id: 6a4bbd9f1a [formerly c29076949e] [formerly 4d4234d5c9 [formerly e05ab5dbc442d410ae53400f087c02197ba5068b]]
Former-commit-id: 4d4234d5c9
Former-commit-id: c0737a6022
 2013-03-27 22:10:03 -05:00
Steve Harris
936e4adda2 13.3.1-14 baseline 
Former-commit-id: 91a5e4578e [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9fba973fd0
Former-commit-id: 2ca160caf0
 2013-03-27 17:59:34 -05:00
Steve Harris
4f2e9aec0d 13.3.1-13 baseline 
Former-commit-id: 792171756f [formerly c77a452f5a] [formerly c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c65f3e68e5
Former-commit-id: 822d05a709
 2013-03-26 12:43:07 -05:00
Steve Harris
f80f98cee2 13.3.1-12 baseline 
Former-commit-id: be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
 2013-03-25 13:27:13 -05:00
Steve Harris
11baf4c2f0 13.3.1-11 baseline 
Former-commit-id: 2edab61540 [formerly 9cdd90e382] [formerly 373d13df39 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]
Former-commit-id: 373d13df39
Former-commit-id: d868003067
 2013-03-25 13:20:03 -05:00
Steve Harris
e9f0328808 13.3.1-10 baseline 
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
 2013-03-20 15:53:01 -05:00
Steve Harris
6e292f6296 13.2.1-18 baseline 
Former-commit-id: 97dfda9020 [formerly 3fd5612f89] [formerly f52a716b3f [formerly aaef550ed7b6715c68b755514ceb504a9a9e9453]]
Former-commit-id: f52a716b3f
Former-commit-id: 72edfa459b
 2013-03-20 16:46:35 -04:00
Steve Harris
7e96d841d9 13.3.1-9 baseline 
Former-commit-id: c7b2ef2d8c [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 0375805e79
 2013-03-19 14:22:56 -05:00
Steve Harris
81a3f29afc 13.3.1-8 baseline 
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
 2013-03-18 15:43:32 -05:00
Steve Harris
acb3d94a34 13.2.1-17 baseline 
Former-commit-id: 4bb3ad8bde [formerly 43aa54dc4c] [formerly e3e250c817 [formerly 1530bd69d5e34c81edae099c0670ae3899c94d1e]]
Former-commit-id: e3e250c817
Former-commit-id: 6bfab62991
 2013-03-18 13:01:37 -04:00
Steve Harris
7cdd09f484 13.2.1-16 baseline 
Former-commit-id: 1eca318fab [formerly a75fe06bfe] [formerly ef031e34df [formerly e40b78e021afdc0d3775c7bd3720aee81b58133a]]
Former-commit-id: ef031e34df
Former-commit-id: 7915f0ce01
 2013-03-18 12:57:34 -04:00
Steve Harris
b237f19e78 13.2.1-15 baseline 
Former-commit-id: ff687e572b [formerly 7b52d3eb6e] [formerly 7617a2437f [formerly a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc]]
Former-commit-id: 7617a2437f
Former-commit-id: 29c9d5a170
 2013-03-18 12:53:04 -04:00
Steve Harris
604f8cc059 13.2.1-14 baseline 
Former-commit-id: 5584a04cbd [formerly 00ce32ea21] [formerly af22cfad98 [formerly 101c9de4e57be6c25dab4f1e6d9158a33ca89005]]
Former-commit-id: af22cfad98
Former-commit-id: d8775866a6
 2013-03-18 12:46:46 -04:00
Steve Harris
ed5f1dbab6 13.3.1-7 baseline 
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
 2013-03-13 09:50:28 -05:00
Steve Harris
2e1dbdc10d 13.3.1-6.1 baseline 
Former-commit-id: 6d96471b9b [formerly fa9d260c2b] [formerly a062803c8c [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]
Former-commit-id: a062803c8c
Former-commit-id: bfa25f3330
 2013-03-13 08:28:26 -05:00
Steve Harris
6fe4b16924 13.3.1-6 baseline 
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
 2013-03-12 08:35:45 -05:00
Steve Harris
377d09ffe3 13.2.1-13 baseline 
Former-commit-id: 7f54c8ce19 [formerly 088e318fda] [formerly 94fa707724 [formerly 54d1ecdf86e471b984eb4a74d42d03145ae067d0]]
Former-commit-id: 94fa707724
Former-commit-id: 0706fce85c
 2013-03-11 11:55:20 -04:00
Steve Harris
18e488a203 13.2.1-12 baseline 
Former-commit-id: 1e9f9af89c [formerly 23a41ad607] [formerly de136aad72 [formerly 6316b9db6cbf29e0038128763d2ad86b1b7abae8]]
Former-commit-id: de136aad72
Former-commit-id: e71ef2b835
 2013-03-07 13:43:04 -05:00
Steve Harris
a240379588 13.3.1-5 baseline 
Former-commit-id: 8123d5ac45 [formerly a89221c75b] [formerly e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
 2013-03-05 10:47:06 -06:00
Steve Harris
3e0614b43a 13.3.1-4 baseline 
Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
 2013-03-05 10:39:59 -06:00
Steve Harris
6710698a10 13.2.1-11 baseline 
Former-commit-id: 0fa57eeaf2 [formerly 41dc7c0396] [formerly 0684d77845 [formerly 9e9758e833caa408d168a5de2fe35be8e5451051]]
Former-commit-id: 0684d77845
Former-commit-id: 9cc1613b50
 2013-03-04 17:34:39 -05:00
Steve Harris
988430b44d 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: 07167ec04f [formerly cf951785c8] [formerly db761c0f19 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]
Former-commit-id: db761c0f19
Former-commit-id: 62e15dacdb
 2013-02-25 15:54:24 -06:00
Steve Harris
05eb25f124 13.3.1-3 baseline 
Former-commit-id: a55f438dd8 [formerly 6572452887] [formerly 8a64f142e5 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 8a64f142e5
Former-commit-id: 8d741715e3
 2013-02-25 10:24:53 -05:00
Steve Harris
370ed98038 13.3.1-2 baseline 
Former-commit-id: 3e60b23072 [formerly df6d6f598e] [formerly 3d115ed3be [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: 3d115ed3be
Former-commit-id: e8a51dc780
 2013-02-25 10:18:36 -05:00
Steve Harris
a25b89bff2 13.2.1-10 baseline 
Former-commit-id: 317c81a797 [formerly 48ebd10390] [formerly acf2f8ff92 [formerly 9880bba4c4a0fd8d3352036294745b5b9c0aa7d3]]
Former-commit-id: acf2f8ff92
Former-commit-id: 525d04621d
 2013-02-25 10:11:00 -05:00
Steve Harris
0569ff413d 13.3.1-1 baseline 
Former-commit-id: 96768407a5 [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 92e4c7ba19
 2013-02-21 09:36:59 -05:00
Steve Harris
87bd35250c 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: f5bd250026 [formerly 7f2b4a8092] [formerly 2f7bf90856 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]
Former-commit-id: 2f7bf90856
Former-commit-id: a723531b31
 2013-02-21 09:25:27 -05:00
Steve Harris
e4435815c9 13.3.1-1 baseline 
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
 2013-02-20 16:19:40 -06:00
Steve Harris
9ec03fb946 13.2.1-9 baseline 
Former-commit-id: 2dc4a4f50f [formerly a339cfb704] [formerly d6dc4694f0 [formerly 915d8edd4670b38df0474de72cf19c6d8b9aa1a3]]
Former-commit-id: d6dc4694f0
Former-commit-id: 03e04cbcca
 2013-02-20 14:11:20 -05:00