Bryan Kowal
|
b87b66abc5
|
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: af5a90e383c1c115b363a33d9e72f957ada697a4
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
25198a5cd6
|
Revert "12.6.1-10 baseline"
This reverts commit a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1].
Former-commit-id: 8cdb21fda317373a0dc95e5048716d0e31412ab4
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
a2c0893d1a
|
12.6.1-10 baseline
Former-commit-id: 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1
|
2012-06-21 08:38:48 -05:00 |
|
Steve Harris
|
8947efbc7f
|
12.6.1-5 baseline
Former-commit-id: 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb
|
2012-06-11 16:23:47 -05:00 |
|
Bryan Kowal
|
298ab2e057
|
Issue #453 - defined a new generic xmpp rpm specification that will currently be used to create the awips2-openfire rpm. Updated the soon-to-be deprecated nightly and release builds to build the new rpm.
Former-commit-id: 5afc6ff942850e0781da96bdeaa1fb4ee7d54000
|
2012-04-16 17:00:30 -05:00 |
|
Steve Harris
|
54be9660f1
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
|
2012-02-22 11:14:43 -06:00 |
|
Bryan Kowal
|
ea1c82452b
|
Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: 56068aa96fa6daf113861476bf4b7aebe2021ca4
|
2012-01-20 13:38:00 -06:00 |
|
Matt Nash
|
c83e5ff474
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
06a8b51d6d
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|