awips2/rpms/awips2.core
Steve Harris f4ea796cea Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: da530db540 [formerly 091555cf10] [formerly da530db540 [formerly 091555cf10] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]
Former-commit-id: 4c56844e29
Former-commit-id: 84a98ec4ca [formerly 214b48dcb8]
Former-commit-id: fdc523a026
2014-09-19 10:28:57 -05:00
..
deploy.builder 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
Installer.adapt-native 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.ant OB_14.1.1-19 baseline 2014-02-21 06:50:59 -05:00
Installer.aviation 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.cli Issue #2520 - Update rpm query calls 2013-11-05 13:30:01 -06:00
Installer.collab-dataserver Issue #3089 fixed init.d script for collaboration dataserver RPM 2014-04-30 16:41:14 -05:00
Installer.common-base 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.database Omaha #3475 - PostgreSQL Upgrade. 2014-08-12 15:10:39 -05:00
Installer.database-server-configuration ASM #552 - Increased postgres max_connections to 400 2014-06-30 16:06:25 -04:00
Installer.database-standalone-configuration Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf 2013-12-16 16:39:10 -06:00
Installer.edex-environment 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.gfe 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.gfe.climo 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.gfesuite-client 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.gfesuite-server 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.groovy Omaha #3147 removed spring from groovy RPM component spec 2014-05-09 10:31:28 -05:00
Installer.httpd-pypies Issue #2182 - Change release number 2013-12-17 08:46:15 -06:00
Installer.hydroapps 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.irt 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.java Omaha #3417 - Update Linux Java to v1.7.0_65 2014-07-23 14:17:21 -05:00
Installer.ldm Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-09-19 10:28:57 -05:00
Installer.localapps-environment 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.localization 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.maps-database Omaha #3475 - PostgreSQL Upgrade. 2014-08-12 15:10:39 -05:00
Installer.ncep-database Omaha #3475 - PostgreSQL Upgrade. 2014-08-12 15:10:39 -05:00
Installer.notification 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.pgadmin Omaha #3475 - PostgreSQL Upgrade. 2014-08-12 15:10:39 -05:00
Installer.postgres Omaha #3475 - PostgreSQL Upgrade. 2014-08-12 15:10:39 -05:00
Installer.pypies 14.1.1-3 baseline 2013-10-28 10:46:02 -04:00
Installer.python Issue #2875 - re-compile grib2.so with g2clib changes 2014-08-19 08:18:11 -05:00
Installer.rcm 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.tools Merge branch 'master_14.1.1' into master_14.2.1 2014-02-18 10:45:20 -06:00
Installer.topo Omaha #3327 - update topo rpm to include gmted2010.h5 2014-08-06 09:46:45 -05:00
Installer.version Issue #2268 - fix CAVE installation error 2013-10-29 11:44:48 -05:00
Installer.xmpp Issue #2886 Removed httpd-collaboration rpm Installation and added collab-dataserver 2014-04-03 17:47:58 -05:00