Richard Peter
|
79d3aa4e1a
|
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: 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 0e25ae35c1
Former-commit-id: 7bd6a07913
|
2014-02-27 15:18:26 -06:00 |
|
Nate Jensen
|
24bbf4949d
|
Issue #2704 smarter thin client connectivity dialog and connection
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: fd43d9e095 [formerly 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]
Former-commit-id: 75ca70fba6
Former-commit-id: c28085118f
|
2014-02-10 16:48:29 -06:00 |
|
Max Schenkelberg
|
0084b5b4f1
|
Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec
Former-commit-id: 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]
Former-commit-id: 9d846aa104
Former-commit-id: be45102814
|
2013-12-09 15:14:01 -06:00 |
|
Nate Jensen
|
338b0ae310
|
Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895
Former-commit-id: db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]
Former-commit-id: 316d6c09c6
Former-commit-id: a4de603bcf
|
2013-07-01 14:41:05 -05:00 |
|
Nate Jensen
|
a7573825c6
|
Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b
Former-commit-id: 0f6d897ff3 [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]
Former-commit-id: c2faa0e3bf
Former-commit-id: f55b3cbdbe
|
2013-06-13 11:39:30 -05:00 |
|
Steve Harris
|
5d99df9969
|
13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: 998961612c
Former-commit-id: 6384018950
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
02dba50c00
|
13.4.1-8 baseline
Former-commit-id: c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]
Former-commit-id: 19866e7032
Former-commit-id: 576a74fe0b
|
2013-05-14 09:21:41 -04:00 |
|
Steve Harris
|
e8f4a2f031
|
13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
|
2013-01-06 14:32:24 -06:00 |
|
Steven Harris
|
ffe3641057
|
12.11.1-1 baseline
Former-commit-id: feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: 618aa3f316
Former-commit-id: 0e86bfd1d3
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
4767b0e069
|
12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
|
2012-04-18 15:18:16 -05:00 |
|
Roger Ferrel
|
bd73fb18a8
|
Issue #27
Changes for alertviz exit
Former-commit-id: b2254f8df4 [formerly e4718d87aa [formerly fbc018e6786730b7b597fbe5a179dc6880186b99]]
Former-commit-id: e4718d87aa
Former-commit-id: f0e7a527e4
|
2012-01-30 16:25:53 -06:00 |
|
Bryan Kowal
|
f522b77248
|
Issue #22 - merging Windows MSI installer changes into git thinclient branch.
Former-commit-id: ff44a81ceb [formerly 48b420cbb2 [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]
Former-commit-id: 48b420cbb2
Former-commit-id: be61ec82b0
|
2012-01-23 12:36:13 -06:00 |
|
Matt Nash
|
d8da2252c3
|
Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
|
2012-01-19 11:53:12 -06:00 |
|
root
|
133dc97f67
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
|
2012-01-06 08:55:05 -06:00 |
|