mjames-upc
|
93b22eeb17
|
Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: f71c396cef [formerly 2288995260]
Former-commit-id: cd4cb8eb1d
|
2015-04-22 15:11:19 -06:00 |
|
Nate Jensen
|
5db9791b67
|
Omaha #3952 disable cairo in alertviz for safety
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f
Former-commit-id: dddc6c2cd4 [formerly 415e2d4035] [formerly dddc6c2cd4 [formerly 415e2d4035] [formerly 7c7c2e3a38 [formerly 640cf4816e4c0cdd0e39b374b8ed02669e8170be]]]
Former-commit-id: 7c7c2e3a38
Former-commit-id: 60227bcce2 [formerly c991d85bfd]
Former-commit-id: 9f82d7af10
|
2015-01-23 12:57:24 -06:00 |
|
mjames-upc
|
ba80d4303b
|
modified code CAVE - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: e104fc35e2
|
2015-01-12 14:07:28 -07:00 |
|
mjames-upc
|
886cd5940f
|
Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
|
2015-01-12 14:02:58 -07:00 |
|
Ben Steffensmeier
|
10bf5b2438
|
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 8c69731c75 [formerly 65431db2c9] [formerly 8c69731c75 [formerly 65431db2c9] [formerly 47d1ae9825 [formerly 58946bb4ff319ac5c4c84e63268ec1149c9cede0]]]
Former-commit-id: 47d1ae9825
Former-commit-id: 58580b09a1 [formerly e9e4caa755]
Former-commit-id: f74fbb95b7
|
2014-12-03 17:14:42 -06:00 |
|
Nate Jensen
|
2941ebd3f3
|
Omaha #3549 remove dead code
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6
Former-commit-id: a651246f08 [formerly ac98f9730c] [formerly a651246f08 [formerly ac98f9730c] [formerly 1b4db26cd8 [formerly b597b4e3151d4e91b3e1db1a02135d33014850d8]]]
Former-commit-id: 1b4db26cd8
Former-commit-id: 11d70597df [formerly 3c3437b8cc]
Former-commit-id: 4b4b404d0d
|
2014-12-03 16:21:10 -06:00 |
|
Nate Jensen
|
0bb18f02d0
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 6c1391e938 [formerly ec28d2f1a0] [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 1c5057a13f [formerly 291de3f039]
Former-commit-id: e53063661e
|
2014-12-03 15:47:10 -06:00 |
|
Nate Jensen
|
18f7a6f1c0
|
Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 131f5ec9f7 [formerly 799ba1babf] [formerly 131f5ec9f7 [formerly 799ba1babf] [formerly 41427a57bb [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]
Former-commit-id: 41427a57bb
Former-commit-id: e6100e8e7f [formerly 78054658a3]
Former-commit-id: 86271d7dc9
|
2014-10-01 09:46:56 -05:00 |
|
Nate Jensen
|
ac5a4234cb
|
Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: f84e89b694 [formerly dbbf012a34] [formerly f84e89b694 [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]
Former-commit-id: fdc4cc60b9
Former-commit-id: 85a17ed23f [formerly 70216d11e4]
Former-commit-id: cf2e6693ed
|
2014-08-26 16:45:00 -05:00 |
|
mjames-upc
|
969312e200
|
various build updates, feature muting, NCP viz edits, icon updates
Former-commit-id: 04b06dad08
|
2014-07-16 20:12:19 -06:00 |
|
mjames-upc
|
b4c0da1971
|
first commit orphan branch from remotes/origin/ncep_14.2.1
Former-commit-id: 27eaf7aa70
|
2014-04-30 19:22:58 -06:00 |
|
Richard Peter
|
5fab51d41b
|
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: 7bd6a07913 [formerly 0e25ae35c1] [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 50a1b270c5 [formerly f13c86bc3e]
Former-commit-id: 9b3f8f9649
|
2014-02-27 15:18:26 -06:00 |
|
Nate Jensen
|
93a740106d
|
Issue #2704 smarter thin client connectivity dialog and connection
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: c28085118f [formerly 75ca70fba6] [formerly c28085118f [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]
Former-commit-id: fd43d9e095
Former-commit-id: c0256ac19e [formerly 2111989497]
Former-commit-id: 9e09da8bb6
|
2014-02-10 16:48:29 -06:00 |
|
Max Schenkelberg
|
ede6c2fa1e
|
Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec
Former-commit-id: be45102814 [formerly 9d846aa104] [formerly be45102814 [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]
Former-commit-id: 987d4b3a30
Former-commit-id: e86e477165 [formerly eede01921e]
Former-commit-id: 5c2da4c3e3
|
2013-12-09 15:14:01 -06:00 |
|
Nate Jensen
|
86b096bc9b
|
Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895
Former-commit-id: a4de603bcf [formerly 316d6c09c6] [formerly a4de603bcf [formerly 316d6c09c6] [formerly db6152e524 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]
Former-commit-id: db6152e524
Former-commit-id: 5a6b0f99cc [formerly 6da64f329c]
Former-commit-id: efcf0c8519
|
2013-07-01 14:41:05 -05:00 |
|
Nate Jensen
|
c5d88a6dce
|
Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b
Former-commit-id: f55b3cbdbe [formerly c2faa0e3bf] [formerly f55b3cbdbe [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 4a39d586d2 [formerly 2200c7cded]
Former-commit-id: 853f5c7546
|
2013-06-13 11:39:30 -05:00 |
|
Steve Harris
|
859965fc9d
|
13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
5bdcf5c0a1
|
13.4.1-8 baseline
Former-commit-id: 576a74fe0b [formerly 19866e7032] [formerly 576a74fe0b [formerly 19866e7032] [formerly c59b52a266 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]
Former-commit-id: c59b52a266
Former-commit-id: 5465764527 [formerly a1c4cd2a39]
Former-commit-id: 395d21565f
|
2013-05-14 09:21:41 -04:00 |
|
Steve Harris
|
f52ec0b0a0
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
|
2013-01-06 14:32:24 -06:00 |
|
Steven Harris
|
2f855322f6
|
12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
|
2012-09-27 15:57:45 -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 |
|
Roger Ferrel
|
10cfe30d45
|
Issue #27
Changes for alertviz exit
Former-commit-id: f0e7a527e4 [formerly e4718d87aa] [formerly f0e7a527e4 [formerly e4718d87aa] [formerly b2254f8df4 [formerly fbc018e6786730b7b597fbe5a179dc6880186b99]]]
Former-commit-id: b2254f8df4
Former-commit-id: 9a59cbc9de [formerly b2f5691167]
Former-commit-id: 3b7d7ad2ad
|
2012-01-30 16:25:53 -06:00 |
|
Bryan Kowal
|
28028b9ad3
|
Issue #22 - merging Windows MSI installer changes into git thinclient branch.
Former-commit-id: be61ec82b0 [formerly 48b420cbb2] [formerly be61ec82b0 [formerly 48b420cbb2] [formerly ff44a81ceb [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]]
Former-commit-id: ff44a81ceb
Former-commit-id: bddafa475a [formerly 5eb9afeb98]
Former-commit-id: dd1c5cdee4
|
2012-01-23 12:36:13 -06: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 |
|