Commit graph

4471 commits

Author SHA1 Message Date
Nate Jensen
d6a8baf2a9 Issue #2361 speed up map initialization by moving field queries off UI
thread

Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5

Former-commit-id: f1c965dde8 [formerly a52e7b677f] [formerly d4b6ad1eee] [formerly f1c965dde8 [formerly a52e7b677f] [formerly d4b6ad1eee] [formerly cc2998b487 [formerly d4b6ad1eee [formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]]]]
Former-commit-id: cc2998b487
Former-commit-id: 18e78887eb [formerly 286c7a8b1c] [formerly e9d19e83f112f896de07de1942d732fe53f9487d [formerly ce583a88fb]]
Former-commit-id: 82fc251ad0fbe29a980c82772d008c107d18cf35 [formerly 57f237693e]
Former-commit-id: 03911b4ce8
2013-11-07 11:44:07 -06:00
Steve Harris
d77d7b1fd9 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d92a449ab3 [formerly b4a37cc39d] [formerly 51ff88796c] [formerly d92a449ab3 [formerly b4a37cc39d] [formerly 51ff88796c] [formerly 3236374cc0 [formerly 51ff88796c [formerly 2a95ac857fe960ed2147545731acc3c093bb73b5]]]]
Former-commit-id: 3236374cc0
Former-commit-id: 832c44a4e6 [formerly 9141c578ff] [formerly 5d7fccdc69b60104c2941a8a74d13d1bd1961367 [formerly 224d25217b]]
Former-commit-id: e02f80e24423e7e8e2998678d5432edcadfe3e61 [formerly 8f4de4a210]
Former-commit-id: 02311b3b5d
2013-11-07 11:37:25 -06:00
David Gillingham
d918c5e1fa Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67

Former-commit-id: 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 0e74638eb2 [formerly e1df69e312 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]]]
Former-commit-id: 0e74638eb2
Former-commit-id: 2cd30bab98 [formerly 1ed80f471c] [formerly 90a0e1bc7e0ea65d26c6784350bcc46d6a2824c9 [formerly d0b188d577]]
Former-commit-id: 253f6827d6bd7e24ee2c90bede0d9493ee7db128 [formerly 50f9ad420b]
Former-commit-id: be9ed341f5
2013-11-07 11:36:49 -06:00
Steve Harris
0a1446c0ca Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 0f37de2155 [formerly dbd8615fc6] [formerly b93c4d7cd0] [formerly 0f37de2155 [formerly dbd8615fc6] [formerly b93c4d7cd0] [formerly 47778131b0 [formerly b93c4d7cd0 [formerly 433ccf0db5946e18c81e20ec689c9911868fe4c2]]]]
Former-commit-id: 47778131b0
Former-commit-id: c221d78097 [formerly 687b0848ee] [formerly 73554f8c6995705d78460251d3f25f87c8a32fbf [formerly 079a007217]]
Former-commit-id: d7860f8347a6475cb19459768957483d014d7ac4 [formerly bf0d783e52]
Former-commit-id: 0b0c0e247b
2013-11-07 11:32:42 -06:00
Steve Harris
f1688d58e6 13.5.3-5 baseline
Former-commit-id: 257f69c55c [formerly 5b3cd9befd] [formerly 06b5e0e0ec] [formerly 257f69c55c [formerly 5b3cd9befd] [formerly 06b5e0e0ec] [formerly f175680b89 [formerly 06b5e0e0ec [formerly 427119d391ffb23c0db3fa0dab0a893322a60f8c]]]]
Former-commit-id: f175680b89
Former-commit-id: 3fac0e0b27 [formerly d9efe087e5] [formerly cae6925bd9b5a490e72c32e60a0c8c7f114e2386 [formerly 31b57882cb]]
Former-commit-id: 2004c192e88b30c3491b310a59ba776377cf312a [formerly b816e9e555]
Former-commit-id: e8e1307ee0
2013-11-07 12:22:32 -05:00
Steve Harris
2e232ef98b 14.1.1-7 baseline (addendum 1)
deleted ./ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml


Former-commit-id: 824866bca8 [formerly abbecba957] [formerly 2d36bc2c1f] [formerly 824866bca8 [formerly abbecba957] [formerly 2d36bc2c1f] [formerly b835dad501 [formerly 2d36bc2c1f [formerly 07f7c24804028aed71fc29cdf6f163a9e9d15623]]]]
Former-commit-id: b835dad501
Former-commit-id: 93e9333a2e [formerly a72bb1669f] [formerly 9b114a2ed684d2ac0bd0e804a8a6594626e1cb9e [formerly 155bc487ff]]
Former-commit-id: 737ca6e05fd52830b53be9e17988723ac9e005e6 [formerly fdad37d271]
Former-commit-id: 43b93250c0
2013-11-07 12:09:23 -05:00
Nate Jensen
a92805ee0a Merge "Issue #2514 updated comments and history for OGC classes" into development
Former-commit-id: 5892894c4c [formerly 852dfae29c] [formerly e84d6cf1b5] [formerly 5892894c4c [formerly 852dfae29c] [formerly e84d6cf1b5] [formerly 3c335ed78f [formerly e84d6cf1b5 [formerly 5e5b1b53cf79fd058f65451aee4f255a73252ca1]]]]
Former-commit-id: 3c335ed78f
Former-commit-id: a08adbc1f4 [formerly adde0aee83] [formerly 03b247e2b8fe2314f2bed222badfa9a2365c9429 [formerly 5866e416f6]]
Former-commit-id: ccd5e6f0d53118bc9d42ca863066581f0958cd51 [formerly 0b5cc2920f]
Former-commit-id: 23922309d3
2013-11-07 10:45:03 -06:00
Nate Jensen
6e58455162 Merge "Issue #2530 Fixed ingest JVM crash on startup" into development
Former-commit-id: b6a07f8be2 [formerly a2a43a55a6] [formerly 0797f54a93] [formerly b6a07f8be2 [formerly a2a43a55a6] [formerly 0797f54a93] [formerly 7b18c745d3 [formerly 0797f54a93 [formerly ba63e0d32f333fb2acaee2b15253f7cffb7122d4]]]]
Former-commit-id: 7b18c745d3
Former-commit-id: 83e6f44981 [formerly 1a6dad4c53] [formerly efa348e5306654c1928c7e40e73494185ea63ae4 [formerly f3d235a3f8]]
Former-commit-id: 5361361d84650efe730edf44505bc1bcca7f38ff [formerly ebdd3effe9]
Former-commit-id: 642d4c5147
2013-11-07 10:44:46 -06:00
Benjamin Phillippe
bda2b50c77 Issue #2530 Fixed ingest JVM crash on startup
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3

Former-commit-id: b0b0db8997 [formerly 8d47d1bbd4] [formerly 7d605c471e] [formerly b0b0db8997 [formerly 8d47d1bbd4] [formerly 7d605c471e] [formerly 3561293fdd [formerly 7d605c471e [formerly 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb]]]]
Former-commit-id: 3561293fdd
Former-commit-id: 88ad5b8798 [formerly 1a8d9bf754] [formerly 5916d9463f4f9e78b13a0ca2b1f25ea05c004a76 [formerly a9f8468c0e]]
Former-commit-id: 721839ff39274d6d74267e59536d103416ec4a35 [formerly dc607f89b1]
Former-commit-id: 64efd70b04
2013-11-07 10:38:53 -06:00
Nate Jensen
723a53858c Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development
Former-commit-id: 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly f5feb9330f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 794d57fe7b [formerly c27c435cea] [formerly 6bfd1d4e327eb46835ec16594b542ffb4c74bf7e [formerly 1b7ac545f8]]
Former-commit-id: ac8b2a6231c9af1c1a85121d551f6695b476f896 [formerly acec588299]
Former-commit-id: acccf2c827
2013-11-07 10:21:42 -06:00
Dave Hladky
ea9d193ed9 Issue #2529 Move DD edex event plugin from DD feature to DD core feature.
Former-commit-id: 9505706e96 [formerly 1a5ddfbd5e] [formerly f6996f9f5a] [formerly 9505706e96 [formerly 1a5ddfbd5e] [formerly f6996f9f5a] [formerly 5d3023d2f5 [formerly f6996f9f5a [formerly cce7fc47a0a4cdb55712ee3af942e93cb8a7c797]]]]
Former-commit-id: 5d3023d2f5
Former-commit-id: f081565dc7 [formerly f62685926a] [formerly cf4c6bb96f1a6ffce51a7751fd886b822c652e36 [formerly 5891412fb3]]
Former-commit-id: 61deb96b4063ff7d6a82bbc2cf7bd4504f9b42b6 [formerly a70f11148c]
Former-commit-id: 18724a945f
2013-11-07 10:08:01 -06:00
Nate Jensen
39a9444ece Merge "Issue #2511 fix for edex localization adapter to allow filename to appear in path" into development
Former-commit-id: 4c311bb740 [formerly 812f3fefce] [formerly 348a968aed] [formerly 4c311bb740 [formerly 812f3fefce] [formerly 348a968aed] [formerly 68c7d378cf [formerly 348a968aed [formerly c2ca50713aa5e69aecdc6a5a0b04c7261305514c]]]]
Former-commit-id: 68c7d378cf
Former-commit-id: bc622dacd0 [formerly 2f4c4833d3] [formerly e622a77e09362970afb8d20642b1057a2b7d7989 [formerly d1f45128aa]]
Former-commit-id: a1ca2b7306fbb5776d4cd6f317db5ac537431543 [formerly 64f064e15f]
Former-commit-id: 6446dbabbe
2013-11-07 09:15:02 -06:00
Steve Harris
b05c9a6aa2 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 626b91c9c7 [formerly 2a8e926976] [formerly 108a4d908d] [formerly 626b91c9c7 [formerly 2a8e926976] [formerly 108a4d908d] [formerly 1b3d4c8f67 [formerly 108a4d908d [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: b3f0cc869f [formerly a6ae5f9c2f] [formerly 8546b81d3f134c79637c6f5400cc76bdbfb21abe [formerly 50d60d8101]]
Former-commit-id: d0d675db0d0de1c4bbc79b22fb517649fb9235ae [formerly 930b6ddb77]
Former-commit-id: eec64a2dbc
2013-11-06 18:31:05 -06:00
Bryan Kowal
408ea758c0 13.5.3 build "fix"
Former-commit-id: b94071a58b [formerly 503762af19] [formerly 6692b985f3] [formerly b94071a58b [formerly 503762af19] [formerly 6692b985f3] [formerly a28133117c [formerly 6692b985f3 [formerly 084e906e9f85ebd11cabf6e14e94ac75d25a0af2]]]]
Former-commit-id: a28133117c
Former-commit-id: a18f2109cf [formerly cdf643510a] [formerly 120324fb9c6e8815d7af7c3a1fc21863b808696c [formerly ce6d80409d]]
Former-commit-id: 6c29059a60fba8e9efc87bc58e54da72abb857db [formerly b04aa07437]
Former-commit-id: 8fb72374e9
2013-11-06 18:25:10 -06:00
Nate Jensen
dcbee2bb80 Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 0f4ba6f90e [formerly 2c506552014e60344c5b2014bed32edab2630f47]]]]
Former-commit-id: 1da0e31b88
Former-commit-id: d2bb313a16 [formerly 048d52722f] [formerly 60a2289740b7f6e8da01f653e591eb2ce94a6c58 [formerly aef895c447]]
Former-commit-id: 5e1c394f1e0afad2bb68c0406f91df8e82544280 [formerly 0ae0e070c9]
Former-commit-id: f9be4065ec
2013-11-06 17:07:10 -06:00
Brian Clements
04c8d5df5f Issue #2514 updated comments and history for OGC classes
removed dead and duplicate code from OGC


Former-commit-id: 5bf229d57c [formerly 4a673c2896] [formerly 308b06a47a] [formerly 5bf229d57c [formerly 4a673c2896] [formerly 308b06a47a] [formerly 525da47317 [formerly 308b06a47a [formerly c13d5788a39898ef746b535d959bc845b6acad9c]]]]
Former-commit-id: 525da47317
Former-commit-id: d0b356865a [formerly e74f7e2483] [formerly f48b9c6407a4de20fe768956be592b7bb91c12d1 [formerly d1207aa0b5]]
Former-commit-id: d9f6967d36d9c745131ebf571b5d16cd148cf0a4 [formerly 80b395db55]
Former-commit-id: 1529d9c37b
2013-11-06 16:07:22 -06:00
Richard Peter
4bf67bb135 Merge "Issue #2478: Remove blank lines in debug" into omaha_13.5.3
Former-commit-id: dd7ae670e2 [formerly 436389b782] [formerly aa82fb8c91] [formerly dd7ae670e2 [formerly 436389b782] [formerly aa82fb8c91] [formerly cf7c70beac [formerly aa82fb8c91 [formerly a3130561e8705464873251575f569d6be95ade3d]]]]
Former-commit-id: cf7c70beac
Former-commit-id: 2f88c16e6d [formerly 082a8d0a94] [formerly 1fd2158b2d51bd039d1bacd4bddc1a47f39063ee [formerly 0e48596ca7]]
Former-commit-id: 3576f38bc45eebb766b4fff770f6436e4431fa4b [formerly 28e9ef5821]
Former-commit-id: bc794bccfc
2013-11-06 16:04:20 -06:00
Richard Peter
82710c3224 Issue #2478: Remove blank lines in debug
Former-commit-id: 81279edc30 [formerly f099fb6936] [formerly 357eb79519] [formerly 81279edc30 [formerly f099fb6936] [formerly 357eb79519] [formerly 18eff02d7a [formerly 357eb79519 [formerly 489528b7869254f69ea65391b576e82e67cbfc8f]]]]
Former-commit-id: 18eff02d7a
Former-commit-id: e3ab7a38e4 [formerly b62dd96321] [formerly e63155859c1fd922ae1be9fae52888b1ef1f2982 [formerly 46f19c22ea]]
Former-commit-id: c2f561874f56e0e5fbe1103b750baac7f6ca5f8a [formerly c9f1b21c01]
Former-commit-id: e776e6e03c
2013-11-06 16:03:45 -06:00
Bryan Kowal
4199291c39 Merge branch 'omaha_13.5.3' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_13.5.3
Former-commit-id: 2a73a304b5 [formerly cd3e1d7aa4] [formerly d26d6a396f] [formerly 2a73a304b5 [formerly cd3e1d7aa4] [formerly d26d6a396f] [formerly 100e14439e [formerly d26d6a396f [formerly b171b7e66031ef05d98cb9a0819df6717acf0ba6]]]]
Former-commit-id: 100e14439e
Former-commit-id: ed155b4bc8 [formerly cdf1cb2ac6] [formerly 13425950750b9923f86327c13d4018c797064f14 [formerly 40c3059cc2]]
Former-commit-id: cddda8a79fb5bee0ad55af9b596cc6173e37c721 [formerly 1c7e5b91b7]
Former-commit-id: 017290d6a2
2013-11-06 15:58:06 -06:00
Bryan Kowal
1ba0d971d1 Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 21df98b0bc [formerly 0f104b0365] [formerly 4f1c083032] [formerly 21df98b0bc [formerly 0f104b0365] [formerly 4f1c083032] [formerly bb15605aa2 [formerly 4f1c083032 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]]]
Former-commit-id: bb15605aa2
Former-commit-id: 4d95bba61e [formerly 0b006511dc] [formerly 0befac69bd8c3c5e0fa05e61b8473d5f24fccdaf [formerly 0bc8cdc9be]]
Former-commit-id: edff81ecd29901669108323c8ac182f45413fdbf [formerly 46616c32eb]
Former-commit-id: bdc76d27b2
2013-11-06 15:57:14 -06:00
Richard Peter
0b237469af Issue #2478: Update log message
Former-commit-id: 1e10d9e303 [formerly d4bf633bd2] [formerly f9faa53eb4] [formerly 1e10d9e303 [formerly d4bf633bd2] [formerly f9faa53eb4] [formerly b0746db723 [formerly f9faa53eb4 [formerly ab993718b7e4f2b77461226a49bee76813166dbb]]]]
Former-commit-id: b0746db723
Former-commit-id: 1f5a97c4ab [formerly 6e929c0dee] [formerly 1268ba531f54842268c09b3d7604419aa390dbd3 [formerly f1a67f4dc1]]
Former-commit-id: 1feb0b173ce191c0a6d9d97c8f99c3ac0b997cb1 [formerly 7dcd8afea2]
Former-commit-id: 4b021a422a
2013-11-06 15:45:23 -06:00
Lee Venable
51842a1676 Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 20726d4e7c [formerly 8585080cd1 [formerly 13672783e6a5e452cb4105669a98708329b35541]]]]
Former-commit-id: 20726d4e7c
Former-commit-id: a6557a089e [formerly 9a8a813cf8] [formerly 907b407668322fa5a6d3d3f60d0cc9f6969d6ada [formerly 0c4566c411]]
Former-commit-id: 17cb4eac030cecf14dfda06979b1f5d64d077baf [formerly 5627ef0cc8]
Former-commit-id: 3cc206a34f
2013-11-06 15:42:40 -06:00
Nate Jensen
2e73b9e045 Merge "Issue #2525 GSD doesn't want "/wfs" appended by the DPA. Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370" into development
Former-commit-id: 428bff44e7 [formerly 53e94b4bdc] [formerly 4309555b45] [formerly 428bff44e7 [formerly 53e94b4bdc] [formerly 4309555b45] [formerly eae6b2526d [formerly 4309555b45 [formerly a6cf090becd6da2c3fba1a2d46297c475be9d610]]]]
Former-commit-id: eae6b2526d
Former-commit-id: bdf7ba948a [formerly e4c3c3a2ad] [formerly 028b9b6ed361721f72c3b96a53739079cd89fd01 [formerly ed9515eea8]]
Former-commit-id: 7609129d8d0477388dfe611d8af9afb8f7b5d232 [formerly 97034141b3]
Former-commit-id: 1a1a280d43
2013-11-06 15:41:29 -06:00
Lee Venable
d1e67a79d3 Merge "Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects." into development
Former-commit-id: 34753b0b7e [formerly ac2630eed4] [formerly ea5470af90] [formerly 34753b0b7e [formerly ac2630eed4] [formerly ea5470af90] [formerly e80418a639 [formerly ea5470af90 [formerly 10789718f6ece30c3d766ec95b9fff0a5c03ee2c]]]]
Former-commit-id: e80418a639
Former-commit-id: 798de61ac1 [formerly 55b68b6d2a] [formerly 1a7b7e706e5102b13229f96f72c064827c5fc575 [formerly fab0fab6a9]]
Former-commit-id: c3fac5c99d56f602c066a951f6abe956b7282dde [formerly dca845a22d]
Former-commit-id: 8e7bbca733
2013-11-06 15:41:02 -06:00
Nate Jensen
9eaf76fa66 Merge "Issue #2522 removing WCS and WMS from baseline" into development
Former-commit-id: 784f6dca81 [formerly 327f44aaff] [formerly 1020b453f2] [formerly 784f6dca81 [formerly 327f44aaff] [formerly 1020b453f2] [formerly f3ea98778e [formerly 1020b453f2 [formerly c4f29baf5ac830404a7e7739626b9a861844ec06]]]]
Former-commit-id: f3ea98778e
Former-commit-id: bc7db2cd24 [formerly 8cacf1c915] [formerly f7629521b564f5f8ff6aae8cc5a34298c12d3144 [formerly 3169c86070]]
Former-commit-id: f0ee16eb2b93bc88adb959652bf0b98159a10d27 [formerly da640f45d9]
Former-commit-id: 7ae88e6a91
2013-11-06 15:40:16 -06:00
Dave Hladky
0f88775389 Issue #2525 GSD doesn't want "/wfs" appended by the DPA.
Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370

Former-commit-id: 305739eb13 [formerly 62cd5b514d] [formerly b0d929231c] [formerly 305739eb13 [formerly 62cd5b514d] [formerly b0d929231c] [formerly b2b44cd1d2 [formerly b0d929231c [formerly 03cfdbd4c8c74da4200781b8b716181eac759195]]]]
Former-commit-id: b2b44cd1d2
Former-commit-id: ac0d00e3d6 [formerly 7ddd6d4c61] [formerly 4dc511c73e193c9587b7cdc0e8b0ac3f2f661db4 [formerly 35bc4378ca]]
Former-commit-id: ad849d66b0caa535fb7690f603fd59b0b3a80bf4 [formerly d3bd916cf4]
Former-commit-id: ffaa5d5480
2013-11-06 15:23:02 -06:00
Max Schenkelberg
fe791cc7f7 Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
Amend: Fixed precision issue with float comparison, made factory better synchronized.

Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2

Former-commit-id: 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly c28fd2b38d [formerly 3369fbec2d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]]
Former-commit-id: c28fd2b38d
Former-commit-id: f88d913d31 [formerly e4b7f3618c] [formerly aa835a1580556a0e2e44448d20c96e5e1b78baed [formerly d53db3ddb6]]
Former-commit-id: 2e6b0a3f93931cd0f795d381bd6ddbc9268e4f25 [formerly 751b8f2315]
Former-commit-id: 53363b9bf7
2013-11-06 15:07:18 -06:00
Richard Peter
1dcfb3623b Merge "Issue #2494 Updated to use thread logger" into development
Former-commit-id: ff8db01e5f [formerly 3c49575ca0] [formerly 22bd1521be] [formerly ff8db01e5f [formerly 3c49575ca0] [formerly 22bd1521be] [formerly 10160e3783 [formerly 22bd1521be [formerly 8eb668a14e1674b3a67816c26b2baeb7c8f45fba]]]]
Former-commit-id: 10160e3783
Former-commit-id: 17c915ea58 [formerly b10d5952c0] [formerly fcaf2937a71343d6834a55f38f658f6c7fdbaa88 [formerly 88dbe31908]]
Former-commit-id: e8555088e0c72303d6f761ef669d51817d7e2de9 [formerly 28744971c4]
Former-commit-id: 70d5d65f35
2013-11-06 14:03:34 -06:00
Richard Peter
c0a20759e1 Merge "Issue #2450 - Send notifications to Notification Center when subscriptions expire. peer review comments" into development
Former-commit-id: 8ce3319d80 [formerly a699fed28b] [formerly 2e162de539] [formerly 8ce3319d80 [formerly a699fed28b] [formerly 2e162de539] [formerly d9c878bc51 [formerly 2e162de539 [formerly e52828f36303bd39521381149b0f585b6eb38439]]]]
Former-commit-id: d9c878bc51
Former-commit-id: 81b11b8309 [formerly e480cefa56] [formerly 886471047e9c7c9cec1530df34593c4836a27792 [formerly cdc4a81cc5]]
Former-commit-id: ead7424c788d1482ff79182612b8e1f6341946a8 [formerly a76579cf4e]
Former-commit-id: fda9c8fbba
2013-11-06 14:02:51 -06:00
Richard Peter
796bf9ff56 Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: 7d6785bd2d [formerly b4a0f11c66] [formerly 27aa0dd6ba] [formerly 7d6785bd2d [formerly b4a0f11c66] [formerly 27aa0dd6ba] [formerly 6ccb444219 [formerly 27aa0dd6ba [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]]]
Former-commit-id: 6ccb444219
Former-commit-id: db1def7540 [formerly 6b8bea4af5] [formerly 4b2de4194c997d5f3e973c7bdd1eeaca08c1345f [formerly f4bdb0caea]]
Former-commit-id: 0636b67d16f31ddc34f0ddaf9f6885cf8474beca [formerly b52c9482ea]
Former-commit-id: f39e0c68c0
2013-11-06 13:44:11 -06:00
Ben Steffensmeier
235cea183a Issue #2493 remove mesowest.
Former-commit-id: c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly 36916fedcd [formerly d0b7966458 [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]]
Former-commit-id: 36916fedcd
Former-commit-id: 726d1728fd [formerly 5d31aad5c2] [formerly 80b4ead107b43174bee5092e0af3bc24e421205f [formerly baebe37ba6]]
Former-commit-id: 855d5e9d4e64a0a70aaec8f5743dc44310b552bb [formerly afe014af99]
Former-commit-id: 925d8bca38
2013-11-06 13:42:38 -06:00
Slav Korolev
67bcc06687 Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: ff13287f05 [formerly cc90a7af4b] [formerly 076865bb61] [formerly ff13287f05 [formerly cc90a7af4b] [formerly 076865bb61] [formerly c25204d75b [formerly 076865bb61 [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]]]
Former-commit-id: c25204d75b
Former-commit-id: 5cd1d585b1 [formerly 8fbf625667] [formerly 2d965e7d5b9ce80b4a1638b7546c6d8d63a4d209 [formerly 3223cd19cd]]
Former-commit-id: 101603d2c5fe98d981f819cb5aec1f27534314e0 [formerly b8ebc9ac63]
Former-commit-id: a2e60dbe60
2013-11-06 14:38:55 -05:00
Matt Nash
c545b523bd Issue #2511 fix for edex localization adapter to allow filename to appear in path
Change-Id: I9fea157a67799e1168d4b5f7efaf5ef6cdd64933

Former-commit-id: a8dfdabe2a [formerly 5ab51caf38] [formerly 19bfe014c9] [formerly a8dfdabe2a [formerly 5ab51caf38] [formerly 19bfe014c9] [formerly b3ac4b7a9c [formerly 19bfe014c9 [formerly 8404299627c7d27731910821befc068767c43aa1]]]]
Former-commit-id: b3ac4b7a9c
Former-commit-id: a59609ecd8 [formerly 14e606f17d] [formerly cff015b05c205c6fec43bba94210ba6eaa1072af [formerly 65696b4148]]
Former-commit-id: deaab20a5011b3a3d8e09725b1406337afa02da4 [formerly 3445b9cbb5]
Former-commit-id: b08dedefae
2013-11-06 13:35:11 -06:00
Steve Harris
fad7156490 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: 8972badf50 [formerly cdb514cb5c] [formerly c218866826] [formerly 8972badf50 [formerly cdb514cb5c] [formerly c218866826] [formerly d8afc4c58c [formerly c218866826 [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]]]]
Former-commit-id: d8afc4c58c
Former-commit-id: 4add6dde39 [formerly a48b85a0b2] [formerly b07c466ba916dfa6be08058979658327eff3043c [formerly 7c71117a50]]
Former-commit-id: a251279b282347c226fb984df9e3f0a69db59c10 [formerly ff548f8557]
Former-commit-id: 878d57675c
2013-11-06 13:22:12 -06:00
Steve Harris
2608595d90 14.1.1-7 baseline
Former-commit-id: 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]]
Former-commit-id: 4fff87723f
Former-commit-id: 4d2f53ebc6 [formerly b694612fe0] [formerly d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653]]
Former-commit-id: 39afc27726ae906146c56faa8073b17caaeb711d [formerly 647b908fed]
Former-commit-id: cfb3194426
2013-11-06 14:16:14 -05:00
Roger Ferrel
cc2399d328 Issue #2478 Add debug infromation.
Change-Id: I830a760e2505a744da4962299bf97f46462f4784

Former-commit-id: 89645eca10 [formerly f198c27f3f] [formerly 07a7dd63c3] [formerly 89645eca10 [formerly f198c27f3f] [formerly 07a7dd63c3] [formerly e01b524542 [formerly 07a7dd63c3 [formerly db0434a66ca415554d1ab0c90586dc7358fd730d]]]]
Former-commit-id: e01b524542
Former-commit-id: f583a4cef6 [formerly d10ffdcca7] [formerly 228271710b56b51b9c4e8ee70ffda8ab1200c391 [formerly 274d52a694]]
Former-commit-id: 4f3f3e9f57c7e8fbbb9d46166143f836524eaef3 [formerly df1dc51d0d]
Former-commit-id: 8533c6e67c
2013-11-06 13:13:02 -06:00
Richard Peter
d2801eadb5 Issue #2499: Fix build
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c

Former-commit-id: 10764ed800 [formerly 15fd2f7a55] [formerly f3d8768b94] [formerly 10764ed800 [formerly 15fd2f7a55] [formerly f3d8768b94] [formerly c09f68615c [formerly f3d8768b94 [formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]]]
Former-commit-id: c09f68615c
Former-commit-id: 40066061ee [formerly 1b65a09a52] [formerly 2caca803544425b06082edf14d9c7fc48db84b66 [formerly a653f9625a]]
Former-commit-id: 1de821a71696b088539e4b3859b53d3eda3667d4 [formerly 3c129fb138]
Former-commit-id: 463f09984a
2013-11-06 13:09:32 -06:00
Steve Harris
24ec3c5993 14.1.1-6 baseline
Former-commit-id: f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly f44bae4383 [formerly 946a9be17e] [formerly 0cb2978c13] [formerly 6067af4252 [formerly 0cb2978c13 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]]
Former-commit-id: 6067af4252
Former-commit-id: 2a5f4c26d6 [formerly e86a0aa489] [formerly 70967acd51143f4f43cec1322c400d567f95c3ce [formerly 26da1ce793]]
Former-commit-id: 30c24036c09dc21bf6f32deefe9a7a44f35d8005 [formerly 270c5f1a2d]
Former-commit-id: 0aa90a7855
2013-11-06 14:08:33 -05:00
Mike Duff
27409bd03a Issue #2450 - Send notifications to Notification Center when subscriptions expire.
peer review comments

Change-Id: I18eb322d73ee25f30cd1d032b403ea156bc63653

Former-commit-id: a3931125da [formerly 2a97da896d] [formerly 00bb57b481] [formerly a3931125da [formerly 2a97da896d] [formerly 00bb57b481] [formerly f3d07a9185 [formerly 00bb57b481 [formerly fc6fe49db0576c70e2068cd8fac125553806e4c0]]]]
Former-commit-id: f3d07a9185
Former-commit-id: 4a2d377291 [formerly ecaef4d639] [formerly 34a98de0a9a5f176bd195b64d5d776dae48eef59 [formerly cc3846be0b]]
Former-commit-id: 76ee46484cca60f12689d07b9d08fdf8fbbdbc0e [formerly 70fbb031a2]
Former-commit-id: 8a8eb6ba4e
2013-11-06 12:23:09 -06:00
Mike Duff
0280c05aa7 Issue #2358 - Move config file management code to the subscription manager dialog.
Change-Id: I61b8093b1306404006c5d01b73874997054c4f2f

Former-commit-id: e8a14d975d [formerly 65f9da04a9] [formerly e1180868e7] [formerly e8a14d975d [formerly 65f9da04a9] [formerly e1180868e7] [formerly 35c4911e7e [formerly e1180868e7 [formerly 100fe3e61e5156dba32419005da4473bcd6d1e8b]]]]
Former-commit-id: 35c4911e7e
Former-commit-id: 89c7970f8b [formerly e1b9c9daa8] [formerly 046ac466943d54b80185d43c7b3cbf79bd485473 [formerly 7e28ffcaad]]
Former-commit-id: 61abd603abd41c6ab9bfa16115d3995c7257e435 [formerly 39dda9d18c]
Former-commit-id: 4cede401ec
2013-11-06 12:00:04 -06:00
Brian Clements
91e76074e8 Issue #2522 removing WCS and WMS from baseline
removed dependencies on static URN constants in NativeCrsAuthority and abstract wxxm translator


Former-commit-id: ae897e75a8 [formerly 09f8fe5d95] [formerly f50c286820] [formerly ae897e75a8 [formerly 09f8fe5d95] [formerly f50c286820] [formerly 4144db8bfc [formerly f50c286820 [formerly 6f113f3c68f13ebac010bd2f8e22d3534c0a8072]]]]
Former-commit-id: 4144db8bfc
Former-commit-id: 3ce0fcde29 [formerly d70dcff9c7] [formerly d4f122bf8a2d95ba614b5b019ae7f79564344707 [formerly 3d02cc5aac]]
Former-commit-id: 6423970255126b841b4b9f51156761b733d5ab4e [formerly 919592bebc]
Former-commit-id: 60101ea00a
2013-11-06 09:55:45 -06:00
Richard Peter
07f1e57662 Issue #2499: Update text feature dependency
Former-commit-id: f7f33364d9 [formerly cf4a5d659c] [formerly 361789672b] [formerly f7f33364d9 [formerly cf4a5d659c] [formerly 361789672b] [formerly 3910b81d1a [formerly 361789672b [formerly fe6fdf5a457be3e13774c946c9f425feac2bd88d]]]]
Former-commit-id: 3910b81d1a
Former-commit-id: 3ed0339762 [formerly 4081e959e5] [formerly cf9089b38edc0d5ca492c9b2c734dbec1392170f [formerly 374710dfff]]
Former-commit-id: e9ba5197c951d792531222727f92c1815892fd23 [formerly 85d17a0c28]
Former-commit-id: ea3a141818
2013-11-06 09:41:29 -06:00
Nate Jensen
a3350d45f3 Merge "Issue #2516 Remove classes causing WCS to not compile." into development
Former-commit-id: d79da040f5 [formerly 387fe10d2b] [formerly 52c5a3a966] [formerly d79da040f5 [formerly 387fe10d2b] [formerly 52c5a3a966] [formerly b6afeae19b [formerly 52c5a3a966 [formerly 9f8341790c94cc59b79a1226e23635298092670f]]]]
Former-commit-id: b6afeae19b
Former-commit-id: f1112a3619 [formerly 981146e079] [formerly 3879a062951e36862341027934369ea35b848fbf [formerly b1d6d16182]]
Former-commit-id: e39275355bb1b42427f165c28100e9e06968657e [formerly 57c1f7b87c]
Former-commit-id: 4094bce5c4
2013-11-06 08:56:17 -06:00
Dave Hladky
5e52684f9e Issue #2494 Updated to use thread logger
Former-commit-id: 493083a836 [formerly 8be14ab6b0] [formerly f890152abc] [formerly 493083a836 [formerly 8be14ab6b0] [formerly f890152abc] [formerly 14469d6e22 [formerly f890152abc [formerly 56505490277f53f77ad80e93aa6a31756a950db6]]]]
Former-commit-id: 14469d6e22
Former-commit-id: bbcccf221a [formerly 4911d0b9c4] [formerly 01427bbf31a9f9022b31a67d324f17fd8159e998 [formerly a2ff05afb9]]
Former-commit-id: 0add07317c3415d3d604303521b42b73433b310b [formerly ae9bde9f57]
Former-commit-id: 43dd4f308d
2013-11-06 08:26:25 -06:00
Bryan Kowal
19a648092a Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
	rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
	rpms/awips2.core/Installer.tools/component.spec
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
	rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh

Former-commit-id: 7f9f20c8a8 [formerly d73aaf9753] [formerly 4bad21e6cd] [formerly 7f9f20c8a8 [formerly d73aaf9753] [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4bad21e6cd [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]]
Former-commit-id: 3255bf3861
Former-commit-id: b85c53c8b0 [formerly 400b4a1328] [formerly fda65eb7f8713472578cb95e718895ab10e4b197 [formerly 76726372e5]]
Former-commit-id: 5afe499eab30a20cc0a548514e8ce73b292bc5ca [formerly 748ab480fb]
Former-commit-id: 2c31c6f4ab
2013-11-05 19:03:22 -06:00
Ben Steffensmeier
74a25404a0 Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64

Former-commit-id: 3273b6fc5f [formerly 4639cd69f4] [formerly 5b53cb4c98] [formerly 3273b6fc5f [formerly 4639cd69f4] [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 5b53cb4c98 [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]]
Former-commit-id: 1d35086e8d
Former-commit-id: 41a54ad666 [formerly b64221f27b] [formerly 5548cad8f6d7873bdd2beafefec42e2d00821e99 [formerly 8aefe5ff02]]
Former-commit-id: ba475ead914b07016d89a22aaa936b7307336535 [formerly a97ec9b8e5]
Former-commit-id: 5cf9a6ed01
2013-11-05 17:33:41 -06:00
Nate Jensen
f03196cb13 Merge "Issue #2521 DatasetMetaData URL update failure for point data. Change-Id: I3421bb6acdc3f44ef7341279c0b253acea2e59ea" into development
Former-commit-id: 63d6c69d5e [formerly e9c2738ffd] [formerly 29293977f5] [formerly 63d6c69d5e [formerly e9c2738ffd] [formerly 29293977f5] [formerly 0b5dfb8ecd [formerly 29293977f5 [formerly 56158b31325ccf0a06fe031790988eb8f39af7d9]]]]
Former-commit-id: 0b5dfb8ecd
Former-commit-id: 56b76616a9 [formerly 6e228eca0f] [formerly 6f41ca43b174e17527967bca7dd25d79c17bc3ca [formerly 5515ce94c7]]
Former-commit-id: 1a1b740d657ecac96808769874ec6ef8eeb79e7f [formerly 154c132ae4]
Former-commit-id: c84829347f
2013-11-05 15:57:00 -06:00
Richard Peter
29a5d36a9e Issue #2499: Remove defaultArchiveConfig.xml
Former-commit-id: efcd3c6454 [formerly 6af3e69ec8] [formerly 7507ae3460] [formerly efcd3c6454 [formerly 6af3e69ec8] [formerly 7507ae3460] [formerly 055057ed60 [formerly 7507ae3460 [formerly affca91a2999675f1e91f2add7cb276ae90535af]]]]
Former-commit-id: 055057ed60
Former-commit-id: 992690ef61 [formerly bdce762633] [formerly 5ebb5a5308b8cf5aa6810663aaf886c73334b2ea [formerly 406687d67f]]
Former-commit-id: 835aaf5d3ff6c364f342d6557864610d31977be2 [formerly c558318eab]
Former-commit-id: 37be7250ae
2013-11-05 15:56:50 -06:00
Nate Jensen
72dceb2918 Merge "Issue #2250 refactor JUtil to be less dependent on certain elements, make DAF easier to use" into development
Former-commit-id: 90c895ed1a [formerly 0251b0fc44] [formerly 02dad36407] [formerly 90c895ed1a [formerly 0251b0fc44] [formerly 02dad36407] [formerly 8c4d84c429 [formerly 02dad36407 [formerly 2192c52604b66e1a675c005c4bb9d972a166f5fb]]]]
Former-commit-id: 8c4d84c429
Former-commit-id: 599602729c [formerly 90bc290c33] [formerly f6fa5cb4e5df65c4b0fc7ad8a42711fff7f94d51 [formerly 59126bf527]]
Former-commit-id: d751985745fa77f6ea748b820108edb6a8c8c07d [formerly 68d0c9e726]
Former-commit-id: cb282cc273
2013-11-05 15:56:13 -06:00
Nate Jensen
02fdb50918 Merge "Issue #2520 - Update rpm query calls" into development
Former-commit-id: c846df9697 [formerly f5440862f3] [formerly 183f46df4b] [formerly c846df9697 [formerly f5440862f3] [formerly 183f46df4b] [formerly 76d21878e4 [formerly 183f46df4b [formerly d1234253ea620effba3f7bdb32f3e478562da92d]]]]
Former-commit-id: 76d21878e4
Former-commit-id: 8035a69b64 [formerly 131e6c803f] [formerly 8737a75125579709844d32b9db60c1910275a9a1 [formerly e604ea08f6]]
Former-commit-id: d8d8c9e937eea69cdef73530c9aee90b9f1d7edf [formerly 701fd08dd1]
Former-commit-id: 10e392a7e3
2013-11-05 15:55:57 -06:00