xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/rpms/awips2.core
History
Bryan Kowal dfd75b4c72 Merge branch 'ss_sync' (OB12.6.1-10) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	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.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]
Former-commit-id: b4917e6708
2012-06-27 17:21:48 -05:00
..
deploy.builder Merge branch 'ss_sync' (OB12.6.1-10) into development 2012-06-27 17:21:48 -05:00
Installer.adapt-native Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch. 2012-01-23 14:39:39 -06:00
Installer.alertviz Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.ant Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.aviation Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.cli Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.database Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.database-server-configuration 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
Installer.database-standalone-configuration 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
Installer.gfe Revert "12.6.1-10 baseline" 2012-06-21 08:51:08 -05:00
Installer.gfe.climo Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.gfesuite-client Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git. 2012-03-07 10:22:40 -06:00
Installer.gfesuite-server Issue #202 - Removed questionable 12.2.1 changes to the soon-to-be deprecated rpm core build.sh script; the gfesuite rpms will now manually created needed directories. At one time the directories were probably baselined until we switched to git. 2012-03-07 10:22:40 -06:00
Installer.httpd-pypies Issue #561 - created a new httpd-collaboration rpm and standardized the build of httpd-pypies and httpd-collaboration. Updated the Build 1.0 to build the new httpd rpm. For now collaboration will default to port 80 until the openfire plugin ticket is finished. 2012-05-10 09:24:56 -05:00
Installer.hydroapps Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.irt Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.java Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.java-jrockit Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.ldm Merge branch 'ss_sync' (OB12.6.1-10) into development 2012-06-27 17:21:48 -05:00
Installer.localapps-environment 12.6.1-10 baseline 2012-06-21 08:58:00 -05:00
Installer.localization Revert "12.6.1-10 baseline" 2012-06-21 08:51:08 -05:00
Installer.maps-database Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.ncep-database Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.notification Issue #176 remove id from dataURI notifications 2012-02-14 15:46:11 -06:00
Installer.postgresql Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
Installer.psql Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.pypies Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.python Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.rcm 12.6.1-10 baseline 2012-06-21 08:58:00 -05:00
Installer.tools Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.topo Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00
Installer.version Issue #202 - restoring rpm directory to ss_sync. 2012-01-20 13:38:00 -06:00