awips2/javaUtilities
Steve Harris 9b3d8a8443 Merge tag 'OB_15.1.1-12' into omaha_16.1.1
15.1.1-12

 Conflicts:
	build/deploy.edex.awips2/esb/bin/setup.env
	cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py


Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
..
build.openfire.plugin Issue #2937 Separate room logging into a subdirectory to separate room logs from 2014-03-31 11:45:22 -05:00
build.wes2bridge.utility Issue #2885 Updated all of the PDE builds to Java 1.7. 2014-03-06 16:29:37 -06:00
collaboration.dataserver Omaha #3573 fixed clean in collaboration dataserver ant script 2014-09-02 10:04:39 -05:00
collaboration.dataserver.feature Omaha #3206 edex changes related to new javax.serlvet FOSS project 2014-05-22 14:09:07 -05:00
com.raytheon.openfire.plugin.configuration.collaboration Omaha #3299 - Fix collaboration RPM build issue 2015-02-06 11:37:47 -06:00
com.raytheon.openfire.plugin.detailedfeedlog Omaha #4469 Some files are missing from plugins' build.properties 2015-05-19 11:47:40 -05:00
com.raytheon.uf.anttasks.includesgen Omaha #3299 - Updated deploy-install to find features 2015-02-25 09:51:49 -06:00
com.raytheon.uf.featureexplorer Omaha #3299 - Updated deploy-install to find features 2015-02-25 09:51:49 -06:00
com.raytheon.wes2bridge.common ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33 2015-05-01 16:12:48 -04:00
com.raytheon.wes2bridge.configuration Omaha #3521 - removed dependency on now non-existent apache commons logging FOSS library. Eliminated configuration parameters 2014-08-14 10:39:09 -05:00
com.raytheon.wes2bridge.datalink Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.wes2bridge.manager ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33 2015-05-01 16:12:48 -04:00
com.raytheon.wes2bridge.utility.feature 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
com.raytheon.wes2bridge.utility.product Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
hydro Omaha #3368 - Move ohd plugin to new repository 2014-08-21 11:04:08 -05:00