awips2/rpms/awips2.core
David Friedman 4bdfeb8da8 Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
	cave/build/static/linux/alertviz/alertviz.sh
	cave/build/static/linux/cave/cave.sh
	cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration

Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226

Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
..
deploy.builder
Installer.adapt-native
Installer.ant ASM #17189 - Removed rpm commands from profile scripts 2015-03-24 14:31:17 -04:00
Installer.aviation
Installer.cli ASM #17189 - Removed rpm commands from profile scripts 2015-03-24 14:31:17 -04: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 Omaha #4488 Add netcdf depenency to awips2-common-base and awips2-database 2015-05-20 13:58:28 -05:00
Installer.database Omaha #4488 Add netcdf depenency to awips2-common-base and awips2-database 2015-05-20 13:58:28 -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
Installer.edex-environment Omaha #3799 Upgraded QPID to version 0.32 2015-03-25 21:43:58 -05:00
Installer.gfe
Installer.gfesuite-client
Installer.gfesuite-server Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 2015-04-08 12:22:27 -04:00
Installer.groovy ASM #15662 - Updated spec files to include AWIPS version 2014-12-09 09:25:59 -05:00
Installer.httpd-pypies Omaha #3216 - Increment pypies release number 2014-12-02 14:45:04 -06:00
Installer.hydroapps
Installer.irt ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf 2014-10-22 14:47:42 -04:00
Installer.ldm Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1 2015-07-30 20:53:19 +00:00
Installer.localapps-environment
Installer.localization
Installer.maps-database Omaha #3475 - PostgreSQL Upgrade. 2014-08-12 15:10:39 -05:00
Installer.ncep-database Omaha #3132 - merge master_14.3.1 into omaha_14.4.1 2014-09-29 10:49:14 -05:00
Installer.notification ASM #17189 - Removed rpm commands from profile scripts 2015-03-24 14:31:17 -04:00
Installer.pgadmin ASM #15311 - Update pgadmin spec file to allow for postgresql version greater than or equal to 8.4.13-1 and customTargets.xml for EDEX to allow for flexible feature files. 2015-02-04 16:47:26 -05:00
Installer.postgres ASM #17189 - Removed rpm commands from profile scripts 2015-03-24 14:31:17 -04:00
Installer.pypies
Installer.rcm ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf 2014-10-22 14:47:42 -04:00
Installer.tools ASM #17189 - Removed rpm commands from profile scripts 2015-03-24 14:31:17 -04:00
Installer.topo Merge tag 'OB_14.3.1-28m' into omaha_14.4.1 2014-10-28 13:32:31 -05:00
Installer.version Omaha #4021 Update 'caveVersion' in Cave and AlertViz plugin.xml's 2015-07-07 08:55:19 -05:00
Installer.xmpp Omaha #3299 - Fix collaboration RPM build issue 2015-02-06 11:37:47 -06:00