Steve Harris
|
16f5ff0979
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]
Former-commit-id: b84dda5930
|
2014-06-20 14:01:55 -04:00 |
|
David Friedman
|
6d0d3f5ba5
|
ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e
Former-commit-id: 1c84c31e30 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]
Former-commit-id: b8542c1332
|
2014-06-11 13:37:16 +00:00 |
|
Steve Harris
|
3358e8d6ef
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: a2e36f4c6c [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]
Former-commit-id: 7f1ad89df9
|
2014-03-06 18:19:55 -06:00 |
|
Brian.Dyke
|
bd81ebd8c2
|
ASM #124 - Display GLD360 lightning data
Former-commit-id: eefe8c45fe [formerly 1edba9216beac913f9bd867da9988e213394a396]
Former-commit-id: db274c890f
|
2014-03-06 10:54:15 -05:00 |
|
Richard Peter
|
a23c8f2c27
|
Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: d54fee5dae [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]
Former-commit-id: 729d608a15
|
2014-02-27 13:20:49 -06:00 |
|
Brian.Dyke
|
3ba93b175e
|
Issue #124
Former-commit-id: 0cc11ddfd3 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]
Former-commit-id: 439f053309
|
2014-02-04 16:56:47 -05:00 |
|
Ben Steffensmeier
|
f34bfc1e5b
|
Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: cac1f07cbb [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]
Former-commit-id: c14cc609a8
|
2013-10-25 15:31:39 -05:00 |
|
Max Schenkelberg
|
8a500677d3
|
Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested
Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c
Former-commit-id: 2d1db7d0e2 [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]
Former-commit-id: b633f9987a
|
2013-09-09 10:10:11 -05:00 |
|
Max Schenkelberg
|
6c92aa9dd7
|
Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc
Former-commit-id: 06dbae8bdb [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]
Former-commit-id: 5ab8b6e2c6
|
2013-08-14 09:20:28 -05:00 |
|
Nate Jensen
|
c4bc1ef034
|
Issue #2142 clean up dependencies and dead code
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59
Former-commit-id: f28420dac4 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]
Former-commit-id: a636846295
|
2013-07-17 16:30:08 -05:00 |
|
Steve Harris
|
2e110bd151
|
13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]
Former-commit-id: 3a4c7931e1
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
d66ad2f77b
|
13.2.1-6 baseline
Former-commit-id: a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]
Former-commit-id: d0752de66c
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
51208e5515
|
13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
9cd1f3ec0f
|
12.10.1-4 baseline
Former-commit-id: 92cc2d8605 [formerly ce574eeff1d197862c8aac2d3fc838a452862576]
Former-commit-id: 791ef6cedf
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
a1d931fd44
|
12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
750b7543dd
|
12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
580e2938d7
|
Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
|
2012-01-19 11:53:12 -06:00 |
|
root
|
a02aeb236c
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
|
2012-01-06 08:55:05 -06:00 |
|