mjames-upc
|
d33cf5cbc8
|
Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: a2e6b5e6ed [formerly f71c396cef] [formerly 8624f9707276ae6bc8c638a057eaf9e7e1d2716a [formerly 2288995260]]
Former-commit-id: 7a2ac36eca3df270f4afc658f6f3530848347ee4 [formerly cd4cb8eb1d]
Former-commit-id: 93b22eeb17
|
2015-04-22 15:11:19 -06:00 |
|
Nate Jensen
|
6b23bfa212
|
Omaha #3952 disable cairo in alertviz for safety
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f
Former-commit-id: 8d5b4d5eb9 [formerly dddc6c2cd4] [formerly 415e2d4035] [formerly 8d5b4d5eb9 [formerly dddc6c2cd4] [formerly 415e2d4035] [formerly 7c7c2e3a38 [formerly 415e2d4035 [formerly 640cf4816e4c0cdd0e39b374b8ed02669e8170be]]]]
Former-commit-id: 7c7c2e3a38
Former-commit-id: f620816ff6 [formerly 60227bcce2] [formerly fa9b8bec1651fe83a3d02c9e7afad132bb18e9fd [formerly c991d85bfd]]
Former-commit-id: c508c91675b2a9810f26c1958ae01de48b1b1c59 [formerly 9f82d7af10]
Former-commit-id: 5db9791b67
|
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
|
4906032e70
|
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
Former-commit-id: 6e49d2119e [formerly 8c69731c75] [formerly 65431db2c9] [formerly 6e49d2119e [formerly 8c69731c75] [formerly 65431db2c9] [formerly 47d1ae9825 [formerly 65431db2c9 [formerly 58946bb4ff319ac5c4c84e63268ec1149c9cede0]]]]
Former-commit-id: 47d1ae9825
Former-commit-id: b9235da943 [formerly 58580b09a1] [formerly b058b96cbf7fc7345a3e1b5f0729e691b765541c [formerly e9e4caa755]]
Former-commit-id: 9a4d4eef454516832c79c9c82d7683493ddaaaf8 [formerly f74fbb95b7]
Former-commit-id: 10bf5b2438
|
2014-12-03 17:14:42 -06:00 |
|
Nate Jensen
|
f642ab38e1
|
Omaha #3549 remove dead code
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6
Former-commit-id: b43ff910d5 [formerly a651246f08] [formerly ac98f9730c] [formerly b43ff910d5 [formerly a651246f08] [formerly ac98f9730c] [formerly 1b4db26cd8 [formerly ac98f9730c [formerly b597b4e3151d4e91b3e1db1a02135d33014850d8]]]]
Former-commit-id: 1b4db26cd8
Former-commit-id: 90b0030cca [formerly 11d70597df] [formerly e15523f35ea28966ae1285da24e1f3bc9faaadd5 [formerly 3c3437b8cc]]
Former-commit-id: c149c2274af827861635d678c53b2669287d46d2 [formerly 4b4b404d0d]
Former-commit-id: 2941ebd3f3
|
2014-12-03 16:21:10 -06:00 |
|
Nate Jensen
|
ad2a20dd43
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: effb6c68bf [formerly 6c1391e938] [formerly ec28d2f1a0] [formerly effb6c68bf [formerly 6c1391e938] [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 3202b579c1 [formerly 1c5057a13f] [formerly fe8f15a6cf651b03c628440d9b584168f73a916a [formerly 291de3f039]]
Former-commit-id: 62ac51e4fd5ddf96d1a40756fde9b064052645f9 [formerly e53063661e]
Former-commit-id: 0bb18f02d0
|
2014-12-03 15:47:10 -06:00 |
|
Nate Jensen
|
0e57a71184
|
Omaha #3678 don't enable jmx at alertviz or cave startup
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7
Former-commit-id: 8c3c592190 [formerly 131f5ec9f7] [formerly 799ba1babf] [formerly 8c3c592190 [formerly 131f5ec9f7] [formerly 799ba1babf] [formerly 41427a57bb [formerly 799ba1babf [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]]
Former-commit-id: 41427a57bb
Former-commit-id: 0b0b9900fe [formerly e6100e8e7f] [formerly 8b3857e4c194aa2076e394aa0028ebf5c0ba2ab8 [formerly 78054658a3]]
Former-commit-id: eac63f07f79044de4bb76979473040b0e13d3b46 [formerly 86271d7dc9]
Former-commit-id: 18f7a6f1c0
|
2014-10-01 09:46:56 -05:00 |
|
Nate Jensen
|
5e714459ca
|
Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly dbbf012a34 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]]
Former-commit-id: fdc4cc60b9
Former-commit-id: 5690db1e94 [formerly 85a17ed23f] [formerly ec90e4ec5b78799ff8c90c5659475672966cd75e [formerly 70216d11e4]]
Former-commit-id: ca13b3031bbdcc900e3e1367503501855ce76f87 [formerly cf2e6693ed]
Former-commit-id: ac5a4234cb
|
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
|
ef2ff1d0f7
|
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: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
|
2014-02-27 15:18:26 -06:00 |
|
Nate Jensen
|
aba5c50bfe
|
Issue #2704 smarter thin client connectivity dialog and connection
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]]
Former-commit-id: fd43d9e095
Former-commit-id: 1dcb3a77c3 [formerly c0256ac19e] [formerly d828ad996a7bd8eb159d4cd60c7b851fc8ac8486 [formerly 2111989497]]
Former-commit-id: 65cd03344892f0b8870a3dcdc9e97aa695e0a8e5 [formerly 9e09da8bb6]
Former-commit-id: 93a740106d
|
2014-02-10 16:48:29 -06:00 |
|
Max Schenkelberg
|
d6ee7afe4a
|
Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec
Former-commit-id: 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]]
Former-commit-id: 987d4b3a30
Former-commit-id: 774859fcb9 [formerly e86e477165] [formerly f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e]]
Former-commit-id: db317e89829b4a77b51a6217c6048e6ba7e2f098 [formerly 5c2da4c3e3]
Former-commit-id: ede6c2fa1e
|
2013-12-09 15:14:01 -06:00 |
|
Nate Jensen
|
4f6c84f9bb
|
Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895
Former-commit-id: 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]]
Former-commit-id: db6152e524
Former-commit-id: cce5d8e8ff [formerly 5a6b0f99cc] [formerly 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167 [formerly 6da64f329c]]
Former-commit-id: dedb130eb36dca918cdf2169d1ec2f249f45f829 [formerly efcf0c8519]
Former-commit-id: 86b096bc9b
|
2013-07-01 14:41:05 -05:00 |
|
Nate Jensen
|
d045893591
|
Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b
Former-commit-id: a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: f173cc29e1 [formerly 4a39d586d2] [formerly 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710 [formerly 2200c7cded]]
Former-commit-id: 68961429c50b354dfaec2ba5f64aea79e2210876 [formerly 853f5c7546]
Former-commit-id: c5d88a6dce
|
2013-06-13 11:39:30 -05:00 |
|
Steve Harris
|
97a4c59662
|
13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
4b1a9ad438
|
13.4.1-8 baseline
Former-commit-id: 02dba50c00 [formerly 576a74fe0b] [formerly 19866e7032] [formerly 02dba50c00 [formerly 576a74fe0b] [formerly 19866e7032] [formerly c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]]
Former-commit-id: c59b52a266
Former-commit-id: fddef92bf3 [formerly 5465764527] [formerly c60ffcebecebf9d637d3276980b24255a17f4079 [formerly a1c4cd2a39]]
Former-commit-id: 39606e2ce74e5380d44e132dd22716b3b06b5051 [formerly 395d21565f]
Former-commit-id: 5bdcf5c0a1
|
2013-05-14 09:21:41 -04:00 |
|
Steve Harris
|
745f2c6409
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
|
2013-01-06 14:32:24 -06:00 |
|
Steven Harris
|
db663faca9
|
12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Roger Ferrel
|
8583722a44
|
Issue #27
Changes for alertviz exit
Former-commit-id: bd73fb18a8 [formerly f0e7a527e4] [formerly e4718d87aa] [formerly bd73fb18a8 [formerly f0e7a527e4] [formerly e4718d87aa] [formerly b2254f8df4 [formerly e4718d87aa [formerly fbc018e6786730b7b597fbe5a179dc6880186b99]]]]
Former-commit-id: b2254f8df4
Former-commit-id: bd3240e530 [formerly 9a59cbc9de] [formerly 0b73c6cd0b03145d357ead8f21e1fc31967a23cb [formerly b2f5691167]]
Former-commit-id: 66329ad5abad76f6048942a06d4237f61351887a [formerly 3b7d7ad2ad]
Former-commit-id: 10cfe30d45
|
2012-01-30 16:25:53 -06:00 |
|
Bryan Kowal
|
7e2690ee90
|
Issue #22 - merging Windows MSI installer changes into git thinclient branch.
Former-commit-id: f522b77248 [formerly be61ec82b0] [formerly 48b420cbb2] [formerly f522b77248 [formerly be61ec82b0] [formerly 48b420cbb2] [formerly ff44a81ceb [formerly 48b420cbb2 [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]]]
Former-commit-id: ff44a81ceb
Former-commit-id: 5368408482 [formerly bddafa475a] [formerly 68d481a3d913cffc25e47fc6f2eae8a4f8628bf1 [formerly 5eb9afeb98]]
Former-commit-id: b43548f0f51b0647e84191cf2451632da3f62170 [formerly dd1c5cdee4]
Former-commit-id: 28028b9ad3
|
2012-01-23 12:36:13 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|