xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5675 commits 31 branches 40 tags 3.8 GiB
Commit graph

3137 commits

Author SHA1 Message Date
Kevin P. Johnson
54316530e4 ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call 
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67

Former-commit-id: c791f55d02 [formerly e3a951da78] [formerly b2797a0788] [formerly 4c833d3389 [formerly b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]
Former-commit-id: 4c833d3389
Former-commit-id: 6cd2437734cdee7992443a141d1ae3334e20f72d [formerly 17a4229072]
Former-commit-id: 32b372db4b
 2014-03-13 20:42:12 +00:00
Nate Jensen
127d260e38 Merge "Issue #2909 Remove useLegacyMergeSort java parameter" into development 
Former-commit-id: 57ba744427 [formerly 57faf2b7b1] [formerly a2a46becc8] [formerly befff7be3a [formerly a2a46becc8 [formerly a221c18b0195cb5b8dd284c4f3ef1266a8efd999]]]
Former-commit-id: befff7be3a
Former-commit-id: 1e5e1d618095429d94f96d6e10274a9f50958b2f [formerly 3f2ff13d14]
Former-commit-id: 071ae3b61f
 2014-03-13 12:41:14 -05:00
Nate Jensen
235d98173d Issue #2907 split edex.redbook plugin into common and edex redbook plugins 
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe

Former-commit-id: 0597c51f2e [formerly 692ec623b2] [formerly 087307a781] [formerly cc1cb28eed [formerly 087307a781 [formerly 62923fbae80131fab6256923bc32bc46e46940ba]]]
Former-commit-id: cc1cb28eed
Former-commit-id: 613b1f0300b324dd34716e78d0468f23f6b5842b [formerly daf6997a59]
Former-commit-id: 027a141c94
 2014-03-13 12:23:35 -05:00
Ron Anderson
291504f08d Issue #2909 Remove useLegacyMergeSort java parameter 
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a

Former-commit-id: 010666a971 [formerly f921b5c83b] [formerly d1b36c4a72] [formerly dd8bfdf941 [formerly d1b36c4a72 [formerly 3aeb50672f8de7b973f234e0ab351416cbf7670b]]]
Former-commit-id: dd8bfdf941
Former-commit-id: 4689925288bb72398ed1efadbc5c3d15c54a177e [formerly b82cf065b5]
Former-commit-id: f24f542137
 2014-03-13 11:54:15 -05:00
Nate Jensen
c2fde2241e Merge "Issue #2718 Update to GeoTools 10.5 Undo reformatting of ncep code Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util" into development 
Former-commit-id: a45175cbc9 [formerly a9381c505e] [formerly 540d0f2e1d] [formerly 27625eb93a [formerly 540d0f2e1d [formerly ee5c599bf4822f73e488e42240c5794189e2d70f]]]
Former-commit-id: 27625eb93a
Former-commit-id: 685d628805abded0ae9728b016ad3cb6833fc05a [formerly d8edb8e91b]
Former-commit-id: 5f554ade56
 2014-03-13 11:16:00 -05:00
Ron Anderson
cbd408ce4e Issue #2718 Update to GeoTools 10.5 
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: d752e068c7 [formerly ab69d3e318] [formerly 1c727465ee] [formerly bcfaf40ebf [formerly 1c727465ee [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: c46a1807b76708c6b5217ba3deb670bd9ca60b66 [formerly 4b2a388628]
Former-commit-id: 06b0b5b684
 2014-03-13 11:11:53 -05:00
Nate Jensen
f72551b031 Merge "Issue #2898 Fix recycling of best res resource." into development 
Former-commit-id: baead24016 [formerly 95fe9da5e2] [formerly c662bfb938] [formerly 8ac509f37f [formerly c662bfb938 [formerly 274b83f84f4bdda381c450b0853711564cae65a6]]]
Former-commit-id: 8ac509f37f
Former-commit-id: c749fc6329e1ec120ee600d3c4fa1fd2bd451d55 [formerly 42e2f15293]
Former-commit-id: 614a106884
 2014-03-13 10:14:58 -05:00
Ben Steffensmeier
9d151047ea Issue #2898 Fix recycling of best res resource. 
Former-commit-id: 3efcf94ac6 [formerly 477b2b604a] [formerly bd8adbea151c9e8a437836ef84d49ad73118d8c1 [formerly 90e464ad0b]] [formerly d115db1a66 [formerly 90e464ad0b [formerly 1693e5e369a199dd2a824815e0c3e638fc7b0be3]]]
Former-commit-id: d115db1a66
Former-commit-id: 7bc5f5f9095293676382cfec5ead778acc57fa5e [formerly e4d861fc69]
Former-commit-id: 1a06a5c3f5
 2014-03-12 18:05:10 -05:00
Nate Jensen
dd1818bcd9 Merge "Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean." into development 
Former-commit-id: 84d698b111 [formerly 0e39a89ea3] [formerly 82778ad21b] [formerly f8180587d4 [formerly 82778ad21b [formerly b723095f6d5d59b67370c7292f88f339d349993a]]]
Former-commit-id: f8180587d4
Former-commit-id: e60e13c06f98e845a0be9a81f12628aa3cec8c08 [formerly 34c5d1de25]
Former-commit-id: 32ccf77885
 2014-03-12 16:05:19 -05:00
Nate Jensen
772adcd86f Merge "Issue #2871 Clean up ECMWF bundles." into development 
Former-commit-id: 2c75a66182 [formerly 185684ce9b] [formerly 253d19af73] [formerly 3dd9c9bffb [formerly 253d19af73 [formerly 86e55d14186870cc44f7d0a81e56f2175c66f1df]]]
Former-commit-id: 3dd9c9bffb
Former-commit-id: b54849466f4e05882acd3240c78df24c400295dd [formerly f5ca0cacc9]
Former-commit-id: dd8e1a554b
 2014-03-12 15:35:21 -05:00
Juliya Dynina
1c14f20643 Merge "ASM #380 - Hydro--TimeSeries:error thrown when click Table button" into asm_14.2.2 
Former-commit-id: ccb6ccaf2e [formerly 2a9de9706e] [formerly 6ac6f6f1fc] [formerly b296595184 [formerly 6ac6f6f1fc [formerly f28ab35657154bb028f3ca710ccc0b42d7c04b70]]]
Former-commit-id: b296595184
Former-commit-id: 4a937d1367fc3b94819005e556bba210c664b8c2 [formerly ee8e55431b]
Former-commit-id: ced1197a83
 2014-03-12 11:36:38 -05:00
Richard Peter
772c59531e Merge "Issue #2858 - Implement NDM menus for ncep/hydro SPC Peer review comments" into development 
Former-commit-id: 1e90648b68 [formerly e69e07ce82] [formerly b9ad595f15] [formerly 6cf5eb346a [formerly b9ad595f15 [formerly 50e64a8948daed61e4c9422ef33732a018468e2a]]]
Former-commit-id: 6cf5eb346a
Former-commit-id: 74dff0c362e75705edbdbc9ed37b4c9420d10df6 [formerly 4b0379de16]
Former-commit-id: f762b25e22
 2014-03-12 11:21:06 -05:00
Mike Duff
530bd2469a Issue #2858 - Implement NDM menus for ncep/hydro SPC 
Peer review comments

Change-Id: Icbafa1e08ea9bc564c3f302715f527b92a5a55e5

Former-commit-id: 972c77589f [formerly 865ef97108] [formerly 9aa0b40ed5] [formerly b434ab5bb3 [formerly 9aa0b40ed5 [formerly a74573fef8cc09ed15341d9873ae1dd2ba561478]]]
Former-commit-id: b434ab5bb3
Former-commit-id: 8aaab8a34c7dabac5b97f89504144ae51e5ea6d8 [formerly 693793eb92]
Former-commit-id: 8c277c76f2
 2014-03-12 11:19:18 -05:00
Ben Steffensmeier
b5b4c7cd34 Issue #2871 Clean up ECMWF bundles. 
Former-commit-id: 3408bd4398 [formerly 4953b487cd] [formerly 17a940b6ce] [formerly fe55c49373 [formerly 17a940b6ce [formerly 5eb5f909c575205e3a261c3cce7ef7b05a57dd22]]]
Former-commit-id: fe55c49373
Former-commit-id: 94facb10c7f130ff2e66b4f4dccfec20be5b7f9b [formerly be4ec3d266]
Former-commit-id: ce0023f1ea
 2014-03-12 11:16:42 -05:00
Mike Duff
cbc15d479a Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean. 
Change-Id: I533e0831529038cb4205e38e706369ca74f4f824

Former-commit-id: bb2b251cd0 [formerly 6444131768] [formerly 8068c9aa83] [formerly e01c5c3534 [formerly 8068c9aa83 [formerly 13f134bafc5331939e23ce0e14d350593bb7c2e1]]]
Former-commit-id: e01c5c3534
Former-commit-id: ea4a4997b336401081920b43fb91017011502ca3 [formerly 832dd498fc]
Former-commit-id: 4fddc0c631
 2014-03-12 10:52:18 -05:00
Richard Peter
abf39442ba Merge branch 'omaha_14.2.1' (14.2.1-11) into development 
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1

Former-commit-id: 751b37616e [formerly 042468f761] [formerly 7af0cfaf38] [formerly 7ebbc0cf78 [formerly 7af0cfaf38 [formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]]]
Former-commit-id: 7ebbc0cf78
Former-commit-id: 67499353bc5b2802a0bbc17ca5f119b6ddd6836d [formerly e8ea7b80e6]
Former-commit-id: f5e1fb569a
 2014-03-12 09:47:29 -05:00
Lee Venable
9b11bcedb1 Issue #2865 - added more null and dispose checks 
Former-commit-id: 7f6792f1c5 [formerly fe6e7328c0] [formerly df65d7c7ce] [formerly 1f9d1af221 [formerly df65d7c7ce [formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]]]
Former-commit-id: 1f9d1af221
Former-commit-id: ebbc4eff228045a38bf9d41b60b39929f6e27fbe [formerly 46fa017e1b]
Former-commit-id: 8ef7fe57c4
 2014-03-11 16:30:33 -05:00
Loubna.Bousaidi
0a5dd21ea9 ASM #380 - Hydro--TimeSeries:error thrown when click Table button 
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09

Former-commit-id: 3a29602f9d [formerly 27447d7b76] [formerly 123007b18d] [formerly ce2bea0a04 [formerly 123007b18d [formerly d2161a0fdd0bad7f8266a8b30659021edecaa549]]]
Former-commit-id: ce2bea0a04
Former-commit-id: de3471a825bb008a8c6b4d7deb2d610059ce27a7 [formerly 6f7b1b6ca8]
Former-commit-id: b5cb73fd5a
 2014-03-11 18:58:26 +00:00
Nate Jensen
fd0a81a181 Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1 
Former-commit-id: a9811bdb2c [formerly cef0438c35] [formerly 85f5821a6f] [formerly afbdf6962c [formerly 85f5821a6f [formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]]]
Former-commit-id: afbdf6962c
Former-commit-id: 2ac85b86fee6285f476e7194d549ae07555767d9 [formerly 09f4bd9883]
Former-commit-id: 3411167042
 2014-03-11 12:35:44 -05:00
Nate Jensen
6eb08c2faf Merge "Issue #2900 Added NWSAuth to import for DD viz feature" into development 
Former-commit-id: 1516cd6177 [formerly 8e0fff8bb4] [formerly a1533481b3] [formerly 4ee98a10cd [formerly a1533481b3 [formerly 22518ce352166afc70950d631b5df8cbcc063a3d]]]
Former-commit-id: 4ee98a10cd
Former-commit-id: 0a164320bd83789017f0e070bf743231a5b0cdd6 [formerly abe081b019]
Former-commit-id: c0ee40b137
 2014-03-11 11:30:27 -05:00
Ben Steffensmeier
20b99bc6c5 Issue #2896 Fix sat best res on weird projections 
Former-commit-id: a9c4875038 [formerly c7fa392f3f] [formerly 8bb517836a] [formerly 560fc688bc [formerly 8bb517836a [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]
Former-commit-id: 560fc688bc
Former-commit-id: 3dd12b4d2d8faad952b606b3c39220f5602545d4 [formerly b474e92189]
Former-commit-id: 7a06fdd71a
 2014-03-11 11:07:43 -05:00
Dave Hladky
e804573ef9 Issue #2900 Added NWSAuth to import for DD viz feature 
Former-commit-id: 117064bbe1 [formerly e3701c0810] [formerly a2a66b028d] [formerly 171bb37b0a [formerly a2a66b028d [formerly 9800d488dfb626c12b8b84f34af06dbbd7d574b0]]]
Former-commit-id: 171bb37b0a
Former-commit-id: 2c10589792c97842540ded77984902908c6b1f40 [formerly b1fc6536c9]
Former-commit-id: 7e384d27a1
 2014-03-11 11:04:34 -05:00
Lee Venable
8bec7ebcb1 Issue #2865 - fixed font memory leak 
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 7aab4252d5 [formerly 44733489b9] [formerly 2c67c4f6c4] [formerly 58d7f759b2 [formerly 2c67c4f6c4 [formerly 2555d382f26278c5f972c17da778338142cdaaec]]]
Former-commit-id: 58d7f759b2
Former-commit-id: 8fe2ec93b5265755e9333c787d93b1c92293eceb [formerly a5487de998]
Former-commit-id: 86e6547a63
 2014-03-11 10:31:50 -05:00
Nate Jensen
219f232fcb Issue #2779 update memory settings for renamed NC perspective 
Former-commit-id: ebf5186d75 [formerly 17aa39ce0a] [formerly ccb06db199] [formerly 5eb892f4cf [formerly ccb06db199 [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: dc64b4c9b5a35e0a38967549f2d086cd34c1fedf [formerly 22ff235bcf]
Former-commit-id: 42c545804c
 2014-03-11 10:28:01 -05:00
Nate Jensen
c5ca4739cd Merge "Issue #2848 fixed session create, listen, join ordering" into development 
Former-commit-id: 3c6667cd58 [formerly 64b7c84018] [formerly 722216e319] [formerly fb2677db7d [formerly 722216e319 [formerly 89427f93a4459a2f5feeac4f9df00db3143eb998]]]
Former-commit-id: fb2677db7d
Former-commit-id: 118a405e684ed645c200cc1fd8cb608074029d93 [formerly 9633d5f252]
Former-commit-id: ac028d6583
 2014-03-10 17:36:06 -05:00
Steve Harris
15035a01cc Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development 
Former-commit-id: d8badc8bea [formerly e62a399e9f] [formerly 4c52fb5bb3] [formerly cfc9fea413 [formerly 4c52fb5bb3 [formerly 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3]]]
Former-commit-id: cfc9fea413
Former-commit-id: 47d576172614afbe5d714782f88cfa8fc696489d [formerly 57f2a3204e]
Former-commit-id: 0c0bc58b3e
 2014-03-10 16:01:16 -05:00
Ben Steffensmeier
d2ab10b037 Issue #2867 Better validation of image export frame range. 
Former-commit-id: 3a92ec7284 [formerly bde80aec1b] [formerly e75b961db5] [formerly cc8b71fbdf [formerly e75b961db5 [formerly 6a3a62b913de1d508fb0d470d06a8be4a61918a3]]]
Former-commit-id: cc8b71fbdf
Former-commit-id: e808a55480a4efe5ce4ecf95f2e66eabb231b4c8 [formerly 9c82499818]
Former-commit-id: 77e3f15d0b
 2014-03-10 15:24:07 -05:00
Ben Steffensmeier
60506ffe8a Issue #2791 Add numeric to alertViz feature. 
Former-commit-id: 6280932901 [formerly 525f6b19bf] [formerly f88e1c329e] [formerly 2f75103635 [formerly f88e1c329e [formerly 9918eeec97938cbc7c703738800521773fbb4a87]]]
Former-commit-id: 2f75103635
Former-commit-id: 3705b85b6fa911d7173a7bcd00ef46993c1ad2e6 [formerly eaa570c3f2]
Former-commit-id: db9729ef73
 2014-03-10 14:55:54 -05:00
brian.dyke
41a37605d4 Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1 
Former-commit-id: 730491d4bb [formerly 1a482f91bc] [formerly 654778bb0d] [formerly b1b216f196 [formerly 654778bb0d [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]
Former-commit-id: b1b216f196
Former-commit-id: 9bef04b7d89a16100ee76d159ab4225ead55540a [formerly d57a3dd24c]
Former-commit-id: d1b389ae05
 2014-03-10 15:36:56 -04:00
Brian Clements
67db5cb4f8 Issue #2848 fixed session create, listen, join ordering 
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions


Former-commit-id: 9b6c283fc9 [formerly 2456c2308f] [formerly dc55cd5b5c] [formerly aee98ecfb0 [formerly dc55cd5b5c [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]
Former-commit-id: aee98ecfb0
Former-commit-id: eb63cfebccc689b3ac62c518759624fc43c5c7b9 [formerly 4f9a2577f2]
Former-commit-id: 3486f1f241
 2014-03-10 14:06:45 -05:00
Nate Jensen
ba37e2937d Merge "Issue #2832 consolidate watch and warning recycle logic" into development 
Former-commit-id: e56dfc35c4 [formerly 89cdc44635] [formerly 9cb27d5e95] [formerly 2570c295d5 [formerly 9cb27d5e95 [formerly 4029d0d863bf6da254859028353a271dec70e335]]]
Former-commit-id: 2570c295d5
Former-commit-id: dcb2d2450927fda01dd0d5edc5f961b453d88fb4 [formerly cab7dadbe8]
Former-commit-id: f48251da57
 2014-03-10 13:52:53 -05:00
Nate Jensen
43fbd5573a Issue #2832 consolidate watch and warning recycle logic 
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889

Former-commit-id: 8fcbba4b82 [formerly 8e734f917e] [formerly 4fec0ffcd347c78ea0a9063a1d7bb3ceda5568da [formerly 057f7671a0]] [formerly 8cd98e0b9f [formerly 057f7671a0 [formerly 814d21d0a5b58c95f6339e1816788953692f5e95]]]
Former-commit-id: 8cd98e0b9f
Former-commit-id: 2e812a9ce3352be5f400be9322dc2565a3748076 [formerly 1646574f5a]
Former-commit-id: 39f2a03d21
 2014-03-10 13:02:45 -05:00
steve.naples
f7cfc3392a ASM #337 MeanMonthlyPrecip updated to handle precip values from PRISM data less than 1 inch. 
Change-Id: Iffa8644f68df362d4f988fa3d1a9bd16acd4be97

Former-commit-id: a687ff690a [formerly 0d44e46f88] [formerly 212677f94b] [formerly 20582ab173 [formerly 212677f94b [formerly cd7d6876338b98c320a8d7559c518e32e90e3000]]]
Former-commit-id: 20582ab173
Former-commit-id: 9647562d19e590ca239f9cbc61e484c2e6323119 [formerly 488d87dbe4]
Former-commit-id: 38fca1641f
 2014-03-10 17:47:25 +00:00
steve.naples
3da7f90763 ASM #336 MPEFieldResource updated to add case for PRISM data unit conversion. 
Change-Id: I8f129902079c051ca4fb508e43b8bf892cb19e0e

Former-commit-id: e7d6b6d08b [formerly c877c8b61b] [formerly 915e3c2c66] [formerly 7432b146ed [formerly 915e3c2c66 [formerly 482547a4f4eaff0fc24b6d3f1103a38a9f3aa314]]]
Former-commit-id: 7432b146ed
Former-commit-id: a4c90943789c41fe516b27147c94972a79097682 [formerly 796ba75949]
Former-commit-id: 36e3819aad
 2014-03-10 17:40:35 +00:00
Nate Jensen
5ff614276d Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development 
Former-commit-id: 9f70b30551 [formerly 60bff5c4af] [formerly 4c7bda09c0] [formerly 33d1e94c38 [formerly 4c7bda09c0 [formerly 99c2f252cab0901cedfefa5e2a6d6799f7e29db8]]]
Former-commit-id: 33d1e94c38
Former-commit-id: 0934d226d319cbf0db5b7c24ab420cd99f84cb70 [formerly f045d2fab0]
Former-commit-id: ee1efad5d7
 2014-03-10 11:36:16 -05:00
Nate Jensen
d32d855bb2 Issue #2779 add .ini generation of memory settings for other components 
Former-commit-id: b77dde280f [formerly 5a88f31a2b] [formerly 6a75fe686a] [formerly d599db4af2 [formerly 6a75fe686a [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]
Former-commit-id: d599db4af2
Former-commit-id: 097c1a455c355cc0ebe8f7b95797516bfc05c8c6 [formerly 5094008bea]
Former-commit-id: 39aa26c2b6
 2014-03-10 10:03:02 -05:00
Nate Jensen
fdb04e7b8c Merge "Issue #2876 - move NDM plugin feature entry." into development 
Former-commit-id: 63ca4e4cf8 [formerly 9026f93f20] [formerly c247535b96] [formerly 14e4807c02 [formerly c247535b96 [formerly 1a5d1cab01d14d0fef04046beb5737ed2c3d2e88]]]
Former-commit-id: 14e4807c02
Former-commit-id: 681ab5fd62e32acfb6ad0f21394c1bf87a87d68d [formerly 9dac73c948]
Former-commit-id: 3a66c42d37
 2014-03-10 09:49:28 -05:00
Mike Duff
d6e478f73e Issue #2876 - move NDM plugin feature entry. 
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f

Former-commit-id: 5c2d6189b4 [formerly bcd4b1490d] [formerly 6be6181108] [formerly 2fc712e1e8 [formerly 6be6181108 [formerly a3b334c9269a9753af0f2dd9f6507aef23177b9f]]]
Former-commit-id: 2fc712e1e8
Former-commit-id: 2cb3c387db5cc599a7efd039cccde7a292e38fbd [formerly 861013ad86]
Former-commit-id: 1eefba01ab
 2014-03-10 09:45:04 -05:00
Nate Jensen
c22f8f2a07 Merge "Issue #2751 ensured that room admins know real userids" into development 
Former-commit-id: 181060825e [formerly 1306957f2a] [formerly e787cac9af] [formerly e963c7c4a1 [formerly e787cac9af [formerly e6feac94800c2dd82afcf42ca9f387b24514deff]]]
Former-commit-id: e963c7c4a1
Former-commit-id: ba716a9976681eb2fe24b90c93cd383526039e18 [formerly 4dd4805e33]
Former-commit-id: ede24100b6
 2014-03-10 09:15:39 -05:00
Nate Jensen
c15c40c252 Merge "Issue #2826 fix collaboration mosaic image disposed issue" into development 
Former-commit-id: b98ec97406 [formerly bedb7b7653] [formerly f5a08f1f86] [formerly d04751a986 [formerly f5a08f1f86 [formerly 24492229a0bddc3db1b6945fcd2a89a486f1ef2e]]]
Former-commit-id: d04751a986
Former-commit-id: dba28ac337f99c6e321ea3a49f0294746750950c [formerly 9c5f87dc03]
Former-commit-id: c5555eaa0c
 2014-03-10 09:04:51 -05:00
Ben Steffensmeier
bf5b777b0d Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter. 
Former-commit-id: 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 8650074737 [formerly 9122b6da99 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]
Former-commit-id: 8650074737
Former-commit-id: b86eb15482eef7c6ed811b7be5a9d782dbcfa838 [formerly d3043fda5a]
Former-commit-id: 5e4c35e93f
 2014-03-07 18:15:32 -06:00
Steve Harris
edeb1833ae Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]
Former-commit-id: c24108e75b
 2014-03-07 15:43:40 -06:00
Brian Clements
cfe64d833a Issue #2751 ensured that room admins know real userids 
the server can be queried for userids by room admins
this does not update the stored participant info in muc
added cached, on-demand check for userid for participants
needed for leadership transfer


Former-commit-id: 8aff9ee95c [formerly 2afc1a9319] [formerly 44d161729f] [formerly dc94769c14 [formerly 44d161729f [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]]
Former-commit-id: dc94769c14
Former-commit-id: 7e2fb485cd2c4586601a3aa2ff0a182aaca10fab [formerly ac63129ad1]
Former-commit-id: acb20cfbbe
 2014-03-07 15:37:29 -06:00
Steve Harris
a94f800324 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]
Former-commit-id: 4d1fbf8743
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
e33de27296 ASM #378 - MPE gages are not listed/available in gage table 
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a

Former-commit-id: fb051c5a5f [formerly b46b87cb5e] [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 8c9f9b3ae0 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]
Former-commit-id: dc3aadd149
Former-commit-id: f304d2fa3946f5a199255a03597cdc0f3f79d636 [formerly 05bb380e77]
Former-commit-id: 68d8f9be14
 2014-03-07 12:57:36 -05:00
Brian.Dyke
eb6abe6faa Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: c2449e7821 [formerly a0e3f08fce] [formerly 394076196b] [formerly 7b798ab5d2 [formerly 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: e502d460a99724c0ff3efb14c8d0f8d731aad320 [formerly 6ced1bedc2]
Former-commit-id: fa189c0ef6
 2014-03-07 09:01:09 -05:00
Brian.Dyke
50621ec3e5 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]
Former-commit-id: 6414bdab57
Former-commit-id: 1e0890d0f70a0aeffbbcabd7f8be3e396daae297 [formerly 2f94480121]
Former-commit-id: 2eec413d72
 2014-03-07 08:57:07 -05:00
Brian.Dyke
3c9cde458a 14.1.1-22 baseline 
Former-commit-id: 1dcc56775d [formerly fe30e1d545] [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: f1658f5e11228e084b4f3ed536ccf891c20f621a [formerly a4c136fd60]
Former-commit-id: 9406a1d6c0
 2014-03-07 08:49:00 -05:00
Steve Harris
3f778f9f9f Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: 08dbf1f7ea [formerly dc7d6ceced] [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 8b6263bfbd [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]
Former-commit-id: 1c64a5c025
Former-commit-id: ce9b772480f62374b4f578a3aa3691569ae98b58 [formerly 7fbbc1e118]
Former-commit-id: 972fa3bee6
 2014-03-06 18:31:10 -06:00
Steve Harris
3715195901 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 93aa41a34b [formerly 3358e8d6ef] [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 7f1ad89df9 [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 4de1a1cd26a0d873cc898cd411cc38ab4cc889c6 [formerly 8ec20fc5e9]
Former-commit-id: 2371a74a29
 2014-03-06 18:19:55 -06:00