xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/rpms/awips2.core
History
Richard Peter 5fcf831fbd Merge branch 'master_13.4.1' (13.4.1-5) into omaha_13.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanDrawer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisByHourTabComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.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.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/TimeRange.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
	nativeLib/dist.native/i386-pc-linux-gnu.tar
	nativeLib/rary.ohd.filesystem/awips/hydroapps/set_hydro_env
	pythonPackages/qpid/bin/qpid-queue-count
	pythonPackages/qpid/bin/qpid-stat
	rpms/awips2.core/Installer.database-server-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.database-standalone-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/ldmadmin-pl.conf
	rpms/awips2.core/Installer.ldm/src/awips2-ldm.6.11.2.tar.gz
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/build/x86_64/build.sh
	tests/.classpath

Change-Id: Ie5c71a39060fdd21d17f1c73ec79c03dfe523cfb

Former-commit-id: d11666193f [formerly 17a5f519cc] [formerly 083700d315] [formerly d11666193f [formerly 17a5f519cc] [formerly 083700d315] [formerly 2b496de6d8 [formerly 083700d315 [formerly 9fb7a04d920e56496cdc896513da8fc54765c6d5]]]]
Former-commit-id: 2b496de6d8
Former-commit-id: e4f3d60d90 [formerly 398e808300] [formerly a57ab1971925eee09755783786207fd3536b9553 [formerly 349bcc15d7]]
Former-commit-id: c8a4f837912af5727cbf29ece9f4e5dfd427fc63 [formerly 7db060699c]
Former-commit-id: 0bf43c4a4d
2013-05-05 14:25:36 -05:00
..
deploy.builder 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
Installer.adapt-native Issue #1957 - the build is now compatible with the expanded native tar file. 2013-04-30 17:52:51 -05:00
Installer.ant 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.aviation 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.cli 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.database 13.4.1-4 baseline 2013-05-02 10:00:38 -05:00
Installer.database-server-configuration 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
Installer.database-standalone-configuration 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
Installer.edex-environment 13.4.1-4 baseline 2013-05-02 10:00:38 -05:00
Installer.gfe 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.gfe.climo 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.gfesuite-client 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.gfesuite-server 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.httpd-collaboration 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00
Installer.httpd-pypies 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
Installer.hydroapps Issue #1957 - the build is now compatible with the expanded native tar file. 2013-04-30 17:52:51 -05:00
Installer.irt 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.java 13.4.1-4 baseline 2013-05-02 10:00:38 -05:00
Installer.ldm 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4) 2013-05-03 09:20:30 -05:00
Installer.localapps-environment 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.localization 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
Installer.maps-database 13.4.1-4 baseline 2013-05-02 10:00:38 -05:00
Installer.ncep-database 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
Installer.notification 13.3.1-6 baseline 2013-03-12 08:35:45 -05:00
Installer.pgadmin 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
Installer.postgres 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
Installer.pypies 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.python 13.3.1-19 baseline 2013-04-09 08:37:12 -05:00
Installer.rcm 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.topo 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.version 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
Installer.xmpp 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00