xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/cots
History
Steve Harris 56249c2611 Merge branch 'master' (OB12.7.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.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/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: b866ca00a3bbfc7edd9e941bd5f84699fc21b255
2012-07-27 14:44:44 -05:00
..
com.facebook.thrift 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.mchange 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.opensymphony.ognl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.sun.jna 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.sun.jndi.nis 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edu.oswego 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.activation 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.jms 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.mail 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.measure 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.media.opengl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.media.opengl.linux32 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true. 2012-07-11 12:44:32 -05:00
javax.media.opengl.linux64 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true. 2012-07-11 12:44:32 -05:00
javax.media.opengl.win32 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true. 2012-07-11 12:44:32 -05:00
javax.persistence 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.vecmath 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ncsa.hdf5 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ncsa.hdf5.linux32 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true. 2012-07-11 12:44:32 -05:00
ncsa.hdf5.win32 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true. 2012-07-11 12:44:32 -05:00
net.sf.cglib Issue #588 Added serialization adapter registration to better support serializing DrawableString objects 2012-05-09 15:02:30 -05:00
net.sf.ehcache 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
net.sf.swtaddons 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.activemq 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.batik 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.camel 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.beanutils 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.cli 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.codec 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.collections 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.configuration 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.digester 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.lang 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.logging 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.management 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.pool 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.validator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.http 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
org.apache.log4j 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.mina 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.qpid 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.tomcat.nativ Issue #875 - Create com.raytheon.uf.viz.points 2012-07-12 11:32:03 -05:00
org.apache.tools.bzip2 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.velocity 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
org.dom4j 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
org.eclipse.jetty 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.geotools 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.hibernate 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.jboss.cache Issue #697 added support for multiple editors 2012-06-13 17:52:11 -05:00
org.jep 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.jep.linux32 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true. 2012-07-11 12:44:32 -05:00
org.jep.linux64 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true. 2012-07-11 12:44:32 -05:00
org.jep.win32 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true. 2012-07-11 12:44:32 -05:00
org.junit 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.objectweb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.postgres Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true. 2012-07-11 12:44:32 -05:00
org.slf4j 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.springframework 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.springframework.dm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ucar.nc2 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
uk.ltd.getahead 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00