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

2459 commits

Author SHA1 Message Date
Nate Jensen
2e81364691 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE 
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 757ca42a5f [formerly dd99aa3f47] [formerly 757ca42a5f [formerly dd99aa3f47] [formerly 78b01f61c4 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]]
Former-commit-id: 78b01f61c4
Former-commit-id: d0d712ec6f [formerly d96cdbe761]
Former-commit-id: f2c777ff48
 2013-11-14 17:41:24 -06:00
Mike Duff
44c4259ccc Issue #2548 - fix malformed comment 
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034

Former-commit-id: 0d83797a4e [formerly 414cb1cf68] [formerly 0d83797a4e [formerly 414cb1cf68] [formerly 95fda38cc5 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]]
Former-commit-id: 95fda38cc5
Former-commit-id: a13aa64b65 [formerly 7be43c4a52]
Former-commit-id: 0f2626f79f
 2013-11-14 17:30:55 -06:00
Richard Peter
8247da7774 Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development 
Former-commit-id: 157e739623 [formerly 14b1e924a1] [formerly 157e739623 [formerly 14b1e924a1] [formerly 0bb5e2a61e [formerly dba301df2f593baa951c14b684e7ce4794e32019]]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 65e8ad1a62 [formerly 1a7dd7723b]
Former-commit-id: 38d2c6564a
 2013-11-14 17:21:48 -06:00
Brian Clements
1a2b934e97 Issue #2361 fixed ncwf hibernate pickup 
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names


Former-commit-id: 55682480e1 [formerly cacdf313c5] [formerly 55682480e1 [formerly cacdf313c5] [formerly 00490c2db2 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]]
Former-commit-id: 00490c2db2
Former-commit-id: 878a677d18 [formerly ab24330f23]
Former-commit-id: e7c355df52
 2013-11-14 17:12:02 -06:00
Mike Duff
769e81cd23 Issue #2548 - Add a subscription type slot for uniqueness. 
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 8cc9c1de59 [formerly 47011a70db] [formerly 8cc9c1de59 [formerly 47011a70db] [formerly 47a0477587 [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]]
Former-commit-id: 47a0477587
Former-commit-id: 44cc3d8776 [formerly b929b7aa02]
Former-commit-id: 5fdf101af6
 2013-11-14 17:07:54 -06:00
Nate Jensen
f6abd529f7 Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development 
Former-commit-id: 3b11ea8c5b [formerly b4bcd14a85] [formerly 3b11ea8c5b [formerly b4bcd14a85] [formerly c2aacfc437 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]]
Former-commit-id: c2aacfc437
Former-commit-id: f0a0287230 [formerly a8a1e396fe]
Former-commit-id: 7ec18ba0b1
 2013-11-14 16:34:28 -06:00
Richard Peter
2025e073ef Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 800effdc5a [formerly 8fb79e7b73] [formerly 800effdc5a [formerly 8fb79e7b73] [formerly c42f931118 [formerly 13d284277bed2f0f731547ec443a262556df997c]]]
Former-commit-id: c42f931118
Former-commit-id: e5dc8e2027 [formerly 2b95bcfb31]
Former-commit-id: e7d8e5e560
 2013-11-14 14:56:59 -06:00
Mike Duff
2b91b4b9ef Issue #2538 - Check for existing adhoc queries in registry. 
Peer review comments

Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0

Former-commit-id: f6c4ca2bc0 [formerly 87a4b1bec4] [formerly f6c4ca2bc0 [formerly 87a4b1bec4] [formerly a80964bc7c [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]]
Former-commit-id: a80964bc7c
Former-commit-id: 48093514a6 [formerly 4557a06f42]
Former-commit-id: cf077ed7f9
 2013-11-14 14:40:33 -06:00
Richard Peter
705339a320 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6 
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 2c753c427c [formerly 79bdd34f4f] [formerly 2c753c427c [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]
Former-commit-id: 0074b774f0
Former-commit-id: b4aac09ff4 [formerly 96b4944b41]
Former-commit-id: e2a16fd876
 2013-11-14 14:40:23 -06:00
Nate Jensen
6441290b40 Issue #2361 remove StyleManager's use of SerializationUtil and 
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: a4eb19fc79 [formerly 9acda0b9f2] [formerly a4eb19fc79 [formerly 9acda0b9f2] [formerly c5cf68cc45 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]]
Former-commit-id: c5cf68cc45
Former-commit-id: e41f57da67 [formerly a6be904c69]
Former-commit-id: e83a828209
 2013-11-14 13:29:30 -06:00
Bryan Kowal
97c0dff26a Merge branch 'development' into development_on_RHEL6 
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 178d95e59d [formerly 86dd200844] [formerly 178d95e59d [formerly 86dd200844] [formerly 0544b66f4e [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]
Former-commit-id: 0544b66f4e
Former-commit-id: a2b1211c52 [formerly 01735ca0c4]
Former-commit-id: 1a905e8a3c
 2013-11-13 13:16:55 -06:00
Steve Harris
d2104614be 14.1.1-8 baseline 
Former-commit-id: 90bc008a50 [formerly aa6c977e7b] [formerly 90bc008a50 [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: b7ca6163e3 [formerly 0123596fd9]
Former-commit-id: 42ece4fb6a
 2013-11-13 12:32:17 -05:00
Nate Jensen
abf56dec05 Merge "Issue #2361 better logging of viz spring initialization of bundles" into development 
Former-commit-id: 8df2c48648 [formerly 8cf1b752e0] [formerly 8df2c48648 [formerly 8cf1b752e0] [formerly b1d376e238 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]]
Former-commit-id: b1d376e238
Former-commit-id: b0cfb6e836 [formerly 645e816d5d]
Former-commit-id: 983afa0eea
 2013-11-12 16:48:32 -06:00
Nate Jensen
ec0025a309 Issue #2361 better logging of viz spring initialization of bundles 
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b

Former-commit-id: 6707d1aadf [formerly 692ea76d75] [formerly 6707d1aadf [formerly 692ea76d75] [formerly a4ece1d116 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]]
Former-commit-id: a4ece1d116
Former-commit-id: 4b329513e5 [formerly 2e86520b53]
Former-commit-id: 5c7be238a0
 2013-11-12 13:02:49 -06:00
Brad Gonzales
a626b240ce Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes. 
Amend: Separate update from create notifications in LifecycleManagerImpl.
       Refactored notification sending in EdexBandwidthManager.
       Fixed error in LifecycleManagerImpl refactor.
       Added comment to isRecurringSubscription.

Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77

Former-commit-id: 62e4cafa27 [formerly 8f70fb1d0c] [formerly 62e4cafa27 [formerly 8f70fb1d0c] [formerly aea0e847aa [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]]
Former-commit-id: aea0e847aa
Former-commit-id: 7747d901f7 [formerly 866a11a9f0]
Former-commit-id: bad9b3242a
 2013-11-12 12:42:16 -06:00
Richard Peter
ef23a8f65b Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.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
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 7ba466f5a6 [formerly 306bd6fae1] [formerly 7ba466f5a6 [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 3f68fc6eed [formerly 59671c1e7d]
Former-commit-id: c8ef435295
 2013-11-12 11:11:36 -06:00
Nate Jensen
273eb805c0 Issue #2361 remove using SerializationUtil for processing XML colormaps 
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 2c0c20f01e [formerly b52bdb1cec] [formerly 2c0c20f01e [formerly b52bdb1cec] [formerly 7a73c65430 [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]
Former-commit-id: 7a73c65430
Former-commit-id: 9bf83be7e9 [formerly 5427e68fd2]
Former-commit-id: 80c38e1433
 2013-11-12 10:37:54 -06:00
Steve Harris
b8cf485614 Merge branch 'omaha_13.5.3' into development 
Former-commit-id: 51af205d06 [formerly 9dabbc7b8e] [formerly 51af205d06 [formerly 9dabbc7b8e] [formerly 66f99f3974 [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]]
Former-commit-id: 66f99f3974
Former-commit-id: 48997c36f0 [formerly 9f1d93a2cf]
Former-commit-id: 92cf79a7cc
 2013-11-11 15:40:45 -06:00
Steve Harris
889db4bc7b 13.5.3-7 baseline 
Former-commit-id: 36af5686bd [formerly 21bed95fa4] [formerly 36af5686bd [formerly 21bed95fa4] [formerly 47102ee47b [formerly a9ada72dc63cd460499052171c61323b438bb10d]]]
Former-commit-id: 47102ee47b
Former-commit-id: 142f1201b3 [formerly 3599d7f09b]
Former-commit-id: 0c54c50443
 2013-11-11 16:33:51 -05:00
Bryan Kowal
f986662369 Issue #2297 - fix 14.2.1 merge 
Former-commit-id: fee6a5dc9c [formerly e2a02ca247] [formerly fee6a5dc9c [formerly e2a02ca247] [formerly 411e0fa7c4 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]]]
Former-commit-id: 411e0fa7c4
Former-commit-id: b1a6d2d828 [formerly e937ba954b]
Former-commit-id: 18bb3ef947
 2013-11-11 13:04:21 -06:00
Steve Harris
32ed33056b 13.5.3-6 baseline 
Former-commit-id: 11ca17a63c [formerly 77a45660d5] [formerly 11ca17a63c [formerly 77a45660d5] [formerly 5fa893d37b [formerly 1324512098c1b95d023de932c6fbe872cfeb68f8]]]
Former-commit-id: 5fa893d37b
Former-commit-id: 8705c4779b [formerly f31112871c]
Former-commit-id: 49b0919cf0
 2013-11-11 12:34:10 -05:00
Max Schenkelberg
7383be61c1 Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing. 
Change-Id: Ic82f45447113425a08909be4c5229502882db022

Former-commit-id: 2f794486e3 [formerly e58a5df04b] [formerly 2f794486e3 [formerly e58a5df04b] [formerly bd903f6641 [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]]
Former-commit-id: bd903f6641
Former-commit-id: 3f3b244b0d [formerly c85532a180]
Former-commit-id: 60616f7ef0
 2013-11-11 11:09:00 -06:00
Bryan Kowal
9f749f3079 Merge branch 'omaha_14.1.1' into development_on_RHEL6 
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cots/edu.uci.ics.crawler4j/.classpath
	cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
	cots/edu.uci.ics.crawler4j/build.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
	edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	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/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GridToGribConverter.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
	edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
	edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
	edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
	rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1

Former-commit-id: 3b8ce3fd34 [formerly c3eb4e9af9] [formerly 3b8ce3fd34 [formerly c3eb4e9af9] [formerly f1cd2f2e5a [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: 464a8d1001 [formerly 1909193f0c]
Former-commit-id: dfba50bf2e
 2013-11-08 14:51:47 -06:00
Nate Jensen
82306d6f55 Issue #2361 fix saving hydro table objects 
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: 040f022e5d [formerly 7a27264094] [formerly 040f022e5d [formerly 7a27264094] [formerly 08441efbb7 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]]]
Former-commit-id: 08441efbb7
Former-commit-id: 399265e3f8 [formerly 4958732cb2]
Former-commit-id: 7a70c5ecce
 2013-11-08 12:37:26 -06:00
Nate Jensen
7ce7a168ec Issue #2361 fix map style preferences 
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049

Former-commit-id: 058c963aa2 [formerly ec319b7dd0] [formerly 058c963aa2 [formerly ec319b7dd0] [formerly 43bbf31347 [formerly 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae]]]
Former-commit-id: 43bbf31347
Former-commit-id: 8a27263b0c [formerly 5ecde78b02]
Former-commit-id: f836fe065e
 2013-11-08 10:38:11 -06:00
Richard Peter
103448070d Merge "Issue #2361 remove viz.grid ISerializableObjects" into development 
Former-commit-id: 44818e3dbd [formerly 214a72ac69] [formerly 44818e3dbd [formerly 214a72ac69] [formerly bb0dcf6d4a [formerly a227c2dcb2598f82756c3f6a9ac7999c06202177]]]
Former-commit-id: bb0dcf6d4a
Former-commit-id: 990053c1fb [formerly 1909b0d06b]
Former-commit-id: 7725d0ee3e
 2013-11-08 10:35:41 -06:00
Slav Korolev
976e7eb56c Issue #2291. Fixed Shared Subscription Dialog. 
Former-commit-id: 2d002ccde3 [formerly 59d1de165d] [formerly 2d002ccde3 [formerly 59d1de165d] [formerly 7b7754982c [formerly f04678733c2368ca05b7b8fdbcfeb096940854df]]]
Former-commit-id: 7b7754982c
Former-commit-id: 53b6d4aa69 [formerly c4a633acde]
Former-commit-id: 52807d248b
 2013-11-08 11:09:21 -05:00
Nate Jensen
a1ac54a09c Issue #2361 remove viz.grid ISerializableObjects 
Change-Id: I76be90f90dedf5d5d5e3656d23bd1180de9014b8

Former-commit-id: bfc7c671cc [formerly 88eb0aab5c] [formerly bfc7c671cc [formerly 88eb0aab5c] [formerly 10548cd1c7 [formerly 6dde4cfe4f7669cd3d3ca15bbb7f4ab2a1a50e92]]]
Former-commit-id: 10548cd1c7
Former-commit-id: 13f93cd7cf [formerly 48a479d2dc]
Former-commit-id: fc79c7053d
 2013-11-08 09:42:09 -06:00
Ron Anderson
bc734d5611 Merge "Issue #2361 speed up map initialization by moving field queries off UI thread" into development 
Former-commit-id: c611ab48be [formerly 12192b633f] [formerly c611ab48be [formerly 12192b633f] [formerly c1bda09fd9 [formerly c5da4c8a79432aab321d42f94b9cff04866671aa]]]
Former-commit-id: c1bda09fd9
Former-commit-id: 6636ebeb2d [formerly d2cd7c1257]
Former-commit-id: 4e8df8ea5b
 2013-11-07 14:39:06 -06:00
Ron Anderson
cc95af7fa8 Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development 
Former-commit-id: 0bfd9a1c98 [formerly a5bc64473a] [formerly 0bfd9a1c98 [formerly a5bc64473a] [formerly 42229b8eee [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]]
Former-commit-id: 42229b8eee
Former-commit-id: 9d56a36dbe [formerly 6442e2e933]
Former-commit-id: 298f4abbae
 2013-11-07 14:38:39 -06:00
Richard Peter
94e0faa6c6 Merge branch 'omaha_13.5.3' (13.5.3-5) into development 
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: 25df870b67 [formerly fa7d77ae97] [formerly 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: c97efbf656 [formerly 520dd57f02]
Former-commit-id: 910464ea6a
 2013-11-07 14:25:45 -06:00
Greg Armendariz
35e634b5fa Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 805783d8da [formerly da16b623e1] [formerly 805783d8da [formerly da16b623e1] [formerly 6456b3a17b [formerly d12afc98a3fda9c186e87368c53ddc100d4bf2c1]]]
Former-commit-id: 6456b3a17b
Former-commit-id: 88ec9027bc [formerly 009c5771fd]
Former-commit-id: 390d3b57e1
 2013-11-07 12:25:24 -06:00
Nate Jensen
03911b4ce8 Issue #2361 speed up map initialization by moving field queries off UI 
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: a52e7b677f [formerly d4b6ad1eee] [formerly a52e7b677f [formerly d4b6ad1eee] [formerly cc2998b487 [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]]
Former-commit-id: cc2998b487
Former-commit-id: 286c7a8b1c [formerly ce583a88fb]
Former-commit-id: 57f237693e
 2013-11-07 11:44:07 -06:00
David Gillingham
be9ed341f5 Issue #2476: Fix indent error in SmartScript._getGridsResult(). 
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: 3df38a8d41 [formerly e1df69e312] [formerly 3df38a8d41 [formerly e1df69e312] [formerly 0e74638eb2 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]]
Former-commit-id: 0e74638eb2
Former-commit-id: 1ed80f471c [formerly d0b188d577]
Former-commit-id: 50f9ad420b
 2013-11-07 11:36:49 -06:00
Nate Jensen
acccf2c827 Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development 
Former-commit-id: b01d5b16e0 [formerly f5feb9330f] [formerly b01d5b16e0 [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: c27c435cea [formerly 1b7ac545f8]
Former-commit-id: acec588299
 2013-11-07 10:21:42 -06:00
Steve Harris
eec64a2dbc Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 2a8e926976 [formerly 108a4d908d] [formerly 2a8e926976 [formerly 108a4d908d] [formerly 1b3d4c8f67 [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: a6ae5f9c2f [formerly 50d60d8101]
Former-commit-id: 930b6ddb77
 2013-11-06 18:31:05 -06:00
Bryan Kowal
8fb72374e9 13.5.3 build "fix" 
Former-commit-id: 503762af19 [formerly 6692b985f3] [formerly 503762af19 [formerly 6692b985f3] [formerly a28133117c [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]]
Former-commit-id: a28133117c
Former-commit-id: cdf643510a [formerly ce6d80409d]
Former-commit-id: b04aa07437
 2013-11-06 18:25:10 -06:00
Nate Jensen
f9be4065ec Merge "Issue #2493 remove mesowest." into development 
Former-commit-id: 7c0d9a7df8 [formerly 0f4ba6f90e] [formerly 7c0d9a7df8 [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 2c506552014e60344c5b2014bed32edab2630f47]]]
Former-commit-id: 1da0e31b88
Former-commit-id: 048d52722f [formerly aef895c447]
Former-commit-id: 0ae0e070c9
 2013-11-06 17:07:10 -06:00
Bryan Kowal
bdc76d27b2 Fix 13.5.3 build; eliminate mix of EDEX and CAVE features 
Former-commit-id: 0f104b0365 [formerly 4f1c083032] [formerly 0f104b0365 [formerly 4f1c083032] [formerly bb15605aa2 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]]
Former-commit-id: bb15605aa2
Former-commit-id: 0b006511dc [formerly 0bc8cdc9be]
Former-commit-id: 46616c32eb
 2013-11-06 15:57:14 -06:00
Lee Venable
3cc206a34f Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development 
Former-commit-id: 326e4e31a7 [formerly 8585080cd1] [formerly 326e4e31a7 [formerly 8585080cd1] [formerly 20726d4e7c [formerly 13672783e6a5e452cb4105669a98708329b35541]]]
Former-commit-id: 20726d4e7c
Former-commit-id: 9a8a813cf8 [formerly 0c4566c411]
Former-commit-id: 5627ef0cc8
 2013-11-06 15:42:40 -06:00
Max Schenkelberg
53363b9bf7 Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common 
Amend: Fixed precision issue with float comparison, made factory better synchronized.

Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2

Former-commit-id: d7c8b8f662 [formerly 3369fbec2d] [formerly d7c8b8f662 [formerly 3369fbec2d] [formerly c28fd2b38d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]
Former-commit-id: c28fd2b38d
Former-commit-id: e4b7f3618c [formerly d53db3ddb6]
Former-commit-id: 751b8f2315
 2013-11-06 15:07:18 -06:00
Richard Peter
f39e0c68c0 Merge "Issue #2499: Fix build" into omaha_13.5.3 
Former-commit-id: b4a0f11c66 [formerly 27aa0dd6ba] [formerly b4a0f11c66 [formerly 27aa0dd6ba] [formerly 6ccb444219 [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]]
Former-commit-id: 6ccb444219
Former-commit-id: 6b8bea4af5 [formerly f4bdb0caea]
Former-commit-id: b52c9482ea
 2013-11-06 13:44:11 -06:00
Ben Steffensmeier
925d8bca38 Issue #2493 remove mesowest. 
Former-commit-id: f761c701cf [formerly d0b7966458] [formerly f761c701cf [formerly d0b7966458] [formerly 36916fedcd [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]
Former-commit-id: 36916fedcd
Former-commit-id: 5d31aad5c2 [formerly baebe37ba6]
Former-commit-id: afe014af99
 2013-11-06 13:42:38 -06:00
Slav Korolev
a2e60dbe60 Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects. 
Former-commit-id: cc90a7af4b [formerly 076865bb61] [formerly cc90a7af4b [formerly 076865bb61] [formerly c25204d75b [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]]
Former-commit-id: c25204d75b
Former-commit-id: 8fbf625667 [formerly 3223cd19cd]
Former-commit-id: b8ebc9ac63
 2013-11-06 14:38:55 -05:00
Steve Harris
cfb3194426 14.1.1-7 baseline 
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653]
Former-commit-id: 647b908fed
 2013-11-06 14:16:14 -05:00
Roger Ferrel
8533c6e67c Issue #2478 Add debug infromation. 
Change-Id: I830a760e2505a744da4962299bf97f46462f4784

Former-commit-id: f198c27f3f [formerly 07a7dd63c3] [formerly f198c27f3f [formerly 07a7dd63c3] [formerly e01b524542 [formerly db0434a66ca415554d1ab0c90586dc7358fd730d]]]
Former-commit-id: e01b524542
Former-commit-id: d10ffdcca7 [formerly 274d52a694]
Former-commit-id: df1dc51d0d
 2013-11-06 13:13:02 -06:00
Richard Peter
463f09984a Issue #2499: Fix build 
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c

Former-commit-id: 15fd2f7a55 [formerly f3d8768b94] [formerly 15fd2f7a55 [formerly f3d8768b94] [formerly c09f68615c [formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]]
Former-commit-id: c09f68615c
Former-commit-id: 1b65a09a52 [formerly a653f9625a]
Former-commit-id: 3c129fb138
 2013-11-06 13:09:32 -06:00
Steve Harris
0aa90a7855 14.1.1-6 baseline 
Former-commit-id: 946a9be17e [formerly 0cb2978c13] [formerly 946a9be17e [formerly 0cb2978c13] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: e86a0aa489 [formerly 26da1ce793]
Former-commit-id: 270c5f1a2d
 2013-11-06 14:08:33 -05:00
Mike Duff
4cede401ec Issue #2358 - Move config file management code to the subscription manager dialog. 
Change-Id: I61b8093b1306404006c5d01b73874997054c4f2f

Former-commit-id: 65f9da04a9 [formerly e1180868e7] [formerly 65f9da04a9 [formerly e1180868e7] [formerly 35c4911e7e [formerly 100fe3e61e5156dba32419005da4473bcd6d1e8b]]]
Former-commit-id: 35c4911e7e
Former-commit-id: e1b9c9daa8 [formerly 7e28ffcaad]
Former-commit-id: 39dda9d18c
 2013-11-06 12:00:04 -06:00
Bryan Kowal
2c31c6f4ab Merge branch 'development' into development_on_RHEL6 
Conflicts:
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
	rpms/awips2.core/Installer.tools/component.spec
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh

Former-commit-id: d73aaf9753 [formerly 4bad21e6cd] [formerly d73aaf9753 [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]
Former-commit-id: 3255bf3861
Former-commit-id: 400b4a1328 [formerly 76726372e5]
Former-commit-id: 748ab480fb
 2013-11-05 19:03:22 -06:00