Bryan Kowal
|
b4917e6708
|
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: b1b294c401 [formerly a33740e915] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]
Former-commit-id: b87b66abc5
Former-commit-id: 9a7d0492fe
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
333fd9c64e
|
Revert "12.6.1-10 baseline"
This reverts commit f8497470fc [formerly b33c5bdfcf] [formerly a2c0893d1a] [formerly 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]].
Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]
Former-commit-id: 25198a5cd6
Former-commit-id: 8367fb50f5
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
f8497470fc
|
12.6.1-10 baseline
Former-commit-id: 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]
Former-commit-id: a2c0893d1a
Former-commit-id: b33c5bdfcf
|
2012-06-21 08:38:48 -05:00 |
|
Steve Harris
|
b69fa75919
|
12.6.1-5 baseline
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: 8947efbc7f
Former-commit-id: a945ed8e6d
|
2012-06-11 16:23:47 -05:00 |
|
David Gillingham
|
f3ac7a8090
|
Issue #646: Fix NullPointerException when decoding Level3 radar products
introduced by previous change.
Change-Id: I3689e003e367be2b69033f13f1744c381d597616
Former-commit-id: 32799c46d2 [formerly 94a4cbd107] [formerly 7c84c67c67 [formerly 979f8dc3c1fb72e0275607bd26a1ee492ea11ba4]]
Former-commit-id: 7c84c67c67
Former-commit-id: 8d877d7784
|
2012-05-21 13:10:10 -05:00 |
|
David Gillingham
|
e779d44a4e
|
Issue #646: Ensure radar obs use TimeTools to set reftime.
Former-commit-id: f12f83c80b [formerly 4f9061fcea] [formerly 091e0325ea [formerly c6c83792c753be9c248e951462830983d5a3ee2e]]
Former-commit-id: 091e0325ea
Former-commit-id: ea06b163b9
|
2012-05-18 16:31:16 -05:00 |
|
Steve Harris
|
a2a6a18fae
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
|
2012-04-18 15:18:16 -05:00 |
|
Ben Steffensmeier
|
8b1cdd8db1
|
Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a
Former-commit-id: 3c673896a0 [formerly b3463d27fc] [formerly 0d75fbf942 [formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]
Former-commit-id: 0d75fbf942
Former-commit-id: c22f135dbc
|
2012-01-30 16:39:57 -06:00 |
|
Matt Nash
|
82300ccdcf
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|
root
|
8e80217e59
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
|
2012-01-06 08:55:05 -06:00 |
|