Commit graph

20 commits

Author SHA1 Message Date
Steve Harris
7fbbc1e118 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: 8b6263bfbd [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]
Former-commit-id: 1c64a5c025
2014-03-06 18:31:10 -06:00
Steve Harris
8ec20fc5e9 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 7f1ad89df9 [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]
Former-commit-id: a2e36f4c6c
2014-03-06 18:19:55 -06:00
Brian.Dyke
b657767cb1 ASM #124 - Display GLD360 lightning data
Former-commit-id: db274c890f [formerly 1edba9216beac913f9bd867da9988e213394a396]
Former-commit-id: eefe8c45fe
2014-03-06 10:54:15 -05:00
Brian Clements
724bafd44f Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed


Former-commit-id: 91936beadf [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]
Former-commit-id: 7a7d476899
2014-03-03 13:17:05 -06:00
Richard Peter
f13c86bc3e Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]
Former-commit-id: 1c150e6e8b
2014-02-27 15:18:26 -06:00
Richard Peter
229437773b Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]
Former-commit-id: d54fee5dae
2014-02-27 13:20:49 -06:00
Brian.Dyke
90b4e7ebf0 Issue #124
Former-commit-id: 439f053309 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]
Former-commit-id: 0cc11ddfd3
2014-02-04 16:56:47 -05:00
Brian Clements
83ed9dc04d Issue #2667 added bin lightning data access factory
renamed lightning record's lightSource field to source
added delta script for db column change
added attribute method comments for IData and DefaultGeometryData


Former-commit-id: 402bef9c5b [formerly b6c50729919ea8a9b29ca963e18f68268c3a0b7f]
Former-commit-id: bd9fbc5f38
2014-01-23 09:32:18 -06:00
Ben Steffensmeier
a06bdc56d6 Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]
Former-commit-id: cac1f07cbb
2013-10-25 15:31:39 -05:00
Max Schenkelberg
61e6dd1316 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

Former-commit-id: b633f9987a [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]
Former-commit-id: 2d1db7d0e2
2013-09-09 10:10:11 -05:00
Max Schenkelberg
759ff7bcfd Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc

Former-commit-id: 5ab8b6e2c6 [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]
Former-commit-id: 06dbae8bdb
2013-08-14 09:20:28 -05:00
Nate Jensen
65dbc62b59 Issue #2142 clean up dependencies and dead code
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59

Former-commit-id: a636846295 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]
Former-commit-id: f28420dac4
2013-07-17 16:30:08 -05:00
Steve Harris
4ed21b702b 13.3.1-6 baseline
Former-commit-id: 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]
Former-commit-id: 566b677d09
2013-03-12 08:35:45 -05:00
Steve Harris
30d38334cc 13.2.1-6 baseline
Former-commit-id: d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]
Former-commit-id: a46e33f06e
2013-02-07 16:00:39 -06:00
Steve Harris
941337c553 13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: 4ba416aeb3
2013-01-06 14:32:24 -06:00
Steve Harris
b4d2a0e8dd 12.10.1-4 baseline
Former-commit-id: 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]
Former-commit-id: 92cc2d8605
2012-09-13 12:33:36 -05:00
Steve Harris
72824561cb 12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: f2fac39428
2012-08-21 15:27:03 -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