Dustin Johnson
|
bcf575966b
|
Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]
Former-commit-id: 31d7d09c10
|
2012-11-01 13:36:06 -05:00 |
|
root
|
8a66b2f209
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]
Former-commit-id: 5a453ee984
|
2012-08-15 22:15:20 +00:00 |
|
Bryan Kowal
|
d908d0add3
|
Issue #913 - fixed the paths for Radar Server.
Change-Id: Ia86e7113ba679bdf4b9b2a83b243e1d3d5e3b208
Former-commit-id: 0ecf2f92c1 [formerly f43666937b14fdee3dd06d6da42be42b67096b2b]
Former-commit-id: 7524f8ad8d
|
2012-07-18 11:12:09 -05:00 |
|
Steve Harris
|
8367fb50f5
|
Revert "12.6.1-10 baseline"
This reverts commit b33c5bdfcf [formerly a2c0893d1a] [formerly ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].
Former-commit-id: b4b1f6975f [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: 25198a5cd6
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
b33c5bdfcf
|
12.6.1-10 baseline
Former-commit-id: ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: a2c0893d1a
|
2012-06-21 08:38:48 -05:00 |
|
Steve Harris
|
1fdc0aa237
|
12.6.1-3 baseline
Former-commit-id: 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]
Former-commit-id: d57eb02b9e
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
a821111fbf
|
12.5.1-2 baseline
Former-commit-id: 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]
Former-commit-id: b36c69cc67
|
2012-05-03 19:17:13 -05:00 |
|
Steve Harris
|
a4e519f3cd
|
12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
1faae42484
|
Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
|
2012-01-19 11:53:12 -06:00 |
|
root
|
3360eb6c5f
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
|
2012-01-06 08:55:05 -06:00 |
|