Dustin Johnson
|
b4a13190ad
|
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: efd3d3735a [formerly 064ef82d1e ] [formerly efd3d3735a [formerly 064ef82d1e ] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 2d1e886cf3 [formerly 4222b24d09 ]
Former-commit-id: 6613c51d3b
|
2012-11-08 09:57:16 -06:00 |
|
Dustin Johnson
|
931d94d1de
|
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: 8e69107b5a [formerly 98d7beae50 ] [formerly 8e69107b5a [formerly 98d7beae50 ] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a [formerly bcf575966b ]
Former-commit-id: 4d9c945388
|
2012-11-01 13:36:06 -05:00 |
|
Matt Nash
|
393639342f
|
Issue #1228 make PersistSrv better handle duplicates, make radar only allow overwrites on GSM products, make PyPies send back duplicate messages
Change-Id: I9ead2da2d38732c1070e4b2ea8259f44c19ffd63
Former-commit-id: f837c51e7f [formerly 8bd09b08a1 ] [formerly f837c51e7f [formerly 8bd09b08a1 ] [formerly 7c1ec8bec5 [formerly af0aa2299b4da6f72594827ea5620b112e7c66c2]]]
Former-commit-id: 7c1ec8bec5
Former-commit-id: 33e4263ef6 [formerly 2527c60763 ]
Former-commit-id: 2415ae4333
|
2012-10-02 15:49:52 -05:00 |
|
Ron Anderson
|
4b106a3f0f
|
Issue #859 Fixed staticTopo generation
Change-Id: Iba2d2e95c4101e5edac3e9743c02a4aaa4967dd7
Former-commit-id: 51a8028105 [formerly 1f871be887 ] [formerly 51a8028105 [formerly 1f871be887 ] [formerly 593a09daee [formerly 8e81e22084031ed702ba294ec94a6bd59926d88c]]]
Former-commit-id: 593a09daee
Former-commit-id: f6e1eb53ce [formerly 9d95a05180 ]
Former-commit-id: d519705a88
|
2012-07-05 15:50:07 -05:00 |
|
Bryan Kowal
|
96e82f60e5
|
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
Former-commit-id: cb16805e7e [formerly 95a5887b06 ] [formerly cb16805e7e [formerly 95a5887b06 ] [formerly 25e20ad89c [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]]
Former-commit-id: 25e20ad89c
Former-commit-id: 5db24885ba [formerly fd8be91fed ]
Former-commit-id: f390151c0b
|
2012-06-19 13:15:53 -05:00 |
|
Steve Harris
|
39ff9954f8
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00 ] [formerly 8552902906 [formerly b13cbb7e00 ] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f ]
Former-commit-id: 9054c5ab6c
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300 ] [formerly 750b7543dd [formerly 67a5a68300 ] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd ]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40 ] [formerly 580e2938d7 [formerly 66be3bec40 ] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484 ]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712 ] [formerly a02aeb236c [formerly 9f19e3f712 ] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f ]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|