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

2823 commits

Author SHA1 Message Date
Nate Jensen
718d69723b 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: 0e39a89ea3 [formerly 82778ad21b] [formerly 0e39a89ea3 [formerly 82778ad21b] [formerly f8180587d4 [formerly b723095f6d5d59b67370c7292f88f339d349993a]]]
Former-commit-id: f8180587d4
Former-commit-id: 32ccf77885 [formerly 34c5d1de25]
Former-commit-id: 2c0d7d2d3e
 2014-03-12 16:05:19 -05:00
Nate Jensen
297bea998c Merge "Issue #2871 Clean up ECMWF bundles." into development 
Former-commit-id: 185684ce9b [formerly 253d19af73] [formerly 185684ce9b [formerly 253d19af73] [formerly 3dd9c9bffb [formerly 86e55d14186870cc44f7d0a81e56f2175c66f1df]]]
Former-commit-id: 3dd9c9bffb
Former-commit-id: dd8e1a554b [formerly f5ca0cacc9]
Former-commit-id: d980ba1089
 2014-03-12 15:35:21 -05:00
Richard Peter
2b4100424b Merge "Issue #2858 - Implement NDM menus for ncep/hydro SPC Peer review comments" into development 
Former-commit-id: e69e07ce82 [formerly b9ad595f15] [formerly e69e07ce82 [formerly b9ad595f15] [formerly 6cf5eb346a [formerly 50e64a8948daed61e4c9422ef33732a018468e2a]]]
Former-commit-id: 6cf5eb346a
Former-commit-id: f762b25e22 [formerly 4b0379de16]
Former-commit-id: 9a100064d2
 2014-03-12 11:21:06 -05:00
Mike Duff
c1164aae5a Issue #2858 - Implement NDM menus for ncep/hydro SPC 
Peer review comments

Change-Id: Icbafa1e08ea9bc564c3f302715f527b92a5a55e5

Former-commit-id: 865ef97108 [formerly 9aa0b40ed5] [formerly 865ef97108 [formerly 9aa0b40ed5] [formerly b434ab5bb3 [formerly a74573fef8cc09ed15341d9873ae1dd2ba561478]]]
Former-commit-id: b434ab5bb3
Former-commit-id: 8c277c76f2 [formerly 693793eb92]
Former-commit-id: 7dccf753c4
 2014-03-12 11:19:18 -05:00
Ben Steffensmeier
2b6dba2ae6 Issue #2871 Clean up ECMWF bundles. 
Former-commit-id: 4953b487cd [formerly 17a940b6ce] [formerly 4953b487cd [formerly 17a940b6ce] [formerly fe55c49373 [formerly 5eb5f909c575205e3a261c3cce7ef7b05a57dd22]]]
Former-commit-id: fe55c49373
Former-commit-id: ce0023f1ea [formerly be4ec3d266]
Former-commit-id: 3b4d3af43e
 2014-03-12 11:16:42 -05:00
Mike Duff
6e1ef1196a 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: 6444131768 [formerly 8068c9aa83] [formerly 6444131768 [formerly 8068c9aa83] [formerly e01c5c3534 [formerly 13f134bafc5331939e23ce0e14d350593bb7c2e1]]]
Former-commit-id: e01c5c3534
Former-commit-id: 4fddc0c631 [formerly 832dd498fc]
Former-commit-id: fc1cc39479
 2014-03-12 10:52:18 -05:00
Richard Peter
8b425fed86 Merge branch 'omaha_14.2.1' (14.2.1-11) into development 
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1

Former-commit-id: 042468f761 [formerly 7af0cfaf38] [formerly 042468f761 [formerly 7af0cfaf38] [formerly 7ebbc0cf78 [formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]]]
Former-commit-id: 7ebbc0cf78
Former-commit-id: f5e1fb569a [formerly e8ea7b80e6]
Former-commit-id: e2ae7de485
 2014-03-12 09:47:29 -05:00
Lee Venable
66a87595af Issue #2865 - added more null and dispose checks 
Former-commit-id: fe6e7328c0 [formerly df65d7c7ce] [formerly fe6e7328c0 [formerly df65d7c7ce] [formerly 1f9d1af221 [formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]]]
Former-commit-id: 1f9d1af221
Former-commit-id: 8ef7fe57c4 [formerly 46fa017e1b]
Former-commit-id: 0931ce72c9
 2014-03-11 16:30:33 -05:00
Nate Jensen
39d73f1569 Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1 
Former-commit-id: cef0438c35 [formerly 85f5821a6f] [formerly cef0438c35 [formerly 85f5821a6f] [formerly afbdf6962c [formerly d463531d4cf3bce8862ce1c29b12e9a594d8c63b]]]
Former-commit-id: afbdf6962c
Former-commit-id: 3411167042 [formerly 09f4bd9883]
Former-commit-id: be9744c6f9
 2014-03-11 12:35:44 -05:00
Nate Jensen
0631214f1a Merge "Issue #2900 Added NWSAuth to import for DD viz feature" into development 
Former-commit-id: 8e0fff8bb4 [formerly a1533481b3] [formerly 8e0fff8bb4 [formerly a1533481b3] [formerly 4ee98a10cd [formerly 22518ce352166afc70950d631b5df8cbcc063a3d]]]
Former-commit-id: 4ee98a10cd
Former-commit-id: c0ee40b137 [formerly abe081b019]
Former-commit-id: 687b47272a
 2014-03-11 11:30:27 -05:00
Ben Steffensmeier
470ac4a1b9 Issue #2896 Fix sat best res on weird projections 
Former-commit-id: c7fa392f3f [formerly 8bb517836a] [formerly c7fa392f3f [formerly 8bb517836a] [formerly 560fc688bc [formerly 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb]]]
Former-commit-id: 560fc688bc
Former-commit-id: 7a06fdd71a [formerly b474e92189]
Former-commit-id: 30683880ee
 2014-03-11 11:07:43 -05:00
Dave Hladky
493246236c Issue #2900 Added NWSAuth to import for DD viz feature 
Former-commit-id: e3701c0810 [formerly a2a66b028d] [formerly e3701c0810 [formerly a2a66b028d] [formerly 171bb37b0a [formerly 9800d488dfb626c12b8b84f34af06dbbd7d574b0]]]
Former-commit-id: 171bb37b0a
Former-commit-id: 7e384d27a1 [formerly b1fc6536c9]
Former-commit-id: be0cfc0afe
 2014-03-11 11:04:34 -05:00
Lee Venable
374a2da1a1 Issue #2865 - fixed font memory leak 
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 44733489b9 [formerly 2c67c4f6c4] [formerly 44733489b9 [formerly 2c67c4f6c4] [formerly 58d7f759b2 [formerly 2555d382f26278c5f972c17da778338142cdaaec]]]
Former-commit-id: 58d7f759b2
Former-commit-id: 86e6547a63 [formerly a5487de998]
Former-commit-id: 97a124ca58
 2014-03-11 10:31:50 -05:00
Nate Jensen
391deee18c Issue #2779 update memory settings for renamed NC perspective 
Former-commit-id: 17aa39ce0a [formerly ccb06db199] [formerly 17aa39ce0a [formerly ccb06db199] [formerly 5eb892f4cf [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: 42c545804c [formerly 22ff235bcf]
Former-commit-id: 15a2fb216e
 2014-03-11 10:28:01 -05:00
Nate Jensen
f4dbdb33a3 Merge "Issue #2848 fixed session create, listen, join ordering" into development 
Former-commit-id: 64b7c84018 [formerly 722216e319] [formerly 64b7c84018 [formerly 722216e319] [formerly fb2677db7d [formerly 89427f93a4459a2f5feeac4f9df00db3143eb998]]]
Former-commit-id: fb2677db7d
Former-commit-id: ac028d6583 [formerly 9633d5f252]
Former-commit-id: aa096c1e2e
 2014-03-10 17:36:06 -05:00
Steve Harris
b40eee35c7 Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development 
Former-commit-id: e62a399e9f [formerly 4c52fb5bb3] [formerly e62a399e9f [formerly 4c52fb5bb3] [formerly cfc9fea413 [formerly 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3]]]
Former-commit-id: cfc9fea413
Former-commit-id: 0c0bc58b3e [formerly 57f2a3204e]
Former-commit-id: 51150e544b
 2014-03-10 16:01:16 -05:00
Ben Steffensmeier
e0a784d6bc Issue #2867 Better validation of image export frame range. 
Former-commit-id: bde80aec1b [formerly e75b961db5] [formerly bde80aec1b [formerly e75b961db5] [formerly cc8b71fbdf [formerly 6a3a62b913de1d508fb0d470d06a8be4a61918a3]]]
Former-commit-id: cc8b71fbdf
Former-commit-id: 77e3f15d0b [formerly 9c82499818]
Former-commit-id: 3afc79f90f
 2014-03-10 15:24:07 -05:00
Ben Steffensmeier
5f4a8fb516 Issue #2791 Add numeric to alertViz feature. 
Former-commit-id: 525f6b19bf [formerly f88e1c329e] [formerly 525f6b19bf [formerly f88e1c329e] [formerly 2f75103635 [formerly 9918eeec97938cbc7c703738800521773fbb4a87]]]
Former-commit-id: 2f75103635
Former-commit-id: db9729ef73 [formerly eaa570c3f2]
Former-commit-id: 1ef88aa125
 2014-03-10 14:55:54 -05:00
brian.dyke
fba0188c90 Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1 
Former-commit-id: 1a482f91bc [formerly 654778bb0d] [formerly 1a482f91bc [formerly 654778bb0d] [formerly b1b216f196 [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]
Former-commit-id: b1b216f196
Former-commit-id: d1b389ae05 [formerly d57a3dd24c]
Former-commit-id: f3df3e3690
 2014-03-10 15:36:56 -04:00
Brian Clements
c4e9aff9fc 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: 2456c2308f [formerly dc55cd5b5c] [formerly 2456c2308f [formerly dc55cd5b5c] [formerly aee98ecfb0 [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]
Former-commit-id: aee98ecfb0
Former-commit-id: 3486f1f241 [formerly 4f9a2577f2]
Former-commit-id: 6245b550aa
 2014-03-10 14:06:45 -05:00
Nate Jensen
5b9fdc7612 Merge "Issue #2832 consolidate watch and warning recycle logic" into development 
Former-commit-id: 89cdc44635 [formerly 9cb27d5e95] [formerly 89cdc44635 [formerly 9cb27d5e95] [formerly 2570c295d5 [formerly 4029d0d863bf6da254859028353a271dec70e335]]]
Former-commit-id: 2570c295d5
Former-commit-id: f48251da57 [formerly cab7dadbe8]
Former-commit-id: 035cf99c65
 2014-03-10 13:52:53 -05:00
Nate Jensen
7731f09550 Issue #2832 consolidate watch and warning recycle logic 
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889

Former-commit-id: 8e734f917e [formerly 057f7671a0] [formerly 8e734f917e [formerly 057f7671a0] [formerly 8cd98e0b9f [formerly 814d21d0a5b58c95f6339e1816788953692f5e95]]]
Former-commit-id: 8cd98e0b9f
Former-commit-id: 39f2a03d21 [formerly 1646574f5a]
Former-commit-id: 33d7e39376
 2014-03-10 13:02:45 -05:00
Nate Jensen
00b39d0a56 Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development 
Former-commit-id: 60bff5c4af [formerly 4c7bda09c0] [formerly 60bff5c4af [formerly 4c7bda09c0] [formerly 33d1e94c38 [formerly 99c2f252cab0901cedfefa5e2a6d6799f7e29db8]]]
Former-commit-id: 33d1e94c38
Former-commit-id: ee1efad5d7 [formerly f045d2fab0]
Former-commit-id: decd1ed31f
 2014-03-10 11:36:16 -05:00
Nate Jensen
6bafc51abe Issue #2779 add .ini generation of memory settings for other components 
Former-commit-id: 5a88f31a2b [formerly 6a75fe686a] [formerly 5a88f31a2b [formerly 6a75fe686a] [formerly d599db4af2 [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]
Former-commit-id: d599db4af2
Former-commit-id: 39aa26c2b6 [formerly 5094008bea]
Former-commit-id: 19a0cfb972
 2014-03-10 10:03:02 -05:00
Nate Jensen
6f1981102d Merge "Issue #2876 - move NDM plugin feature entry." into development 
Former-commit-id: 9026f93f20 [formerly c247535b96] [formerly 9026f93f20 [formerly c247535b96] [formerly 14e4807c02 [formerly 1a5d1cab01d14d0fef04046beb5737ed2c3d2e88]]]
Former-commit-id: 14e4807c02
Former-commit-id: 3a66c42d37 [formerly 9dac73c948]
Former-commit-id: ea372042a5
 2014-03-10 09:49:28 -05:00
Mike Duff
f46a80e936 Issue #2876 - move NDM plugin feature entry. 
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f

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

Former-commit-id: 51b755a476 [formerly 873bd6b889] [formerly 51b755a476 [formerly 873bd6b889] [formerly f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: c24108e75b [formerly 708485427e]
Former-commit-id: 61af779433
 2014-03-07 15:43:40 -06:00
Brian Clements
975bfca460 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: 2afc1a9319 [formerly 44d161729f] [formerly 2afc1a9319 [formerly 44d161729f] [formerly dc94769c14 [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]]
Former-commit-id: dc94769c14
Former-commit-id: acb20cfbbe [formerly ac63129ad1]
Former-commit-id: 6590587d9e
 2014-03-07 15:37:29 -06:00
Steve Harris
e29b96b6bd Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 068297b90a [formerly 92232fa063] [formerly 068297b90a [formerly 92232fa063] [formerly 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]
Former-commit-id: 40b543f9a8
Former-commit-id: 4d1fbf8743 [formerly f992a6b046]
Former-commit-id: ea01373320
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
db1c090463 ASM #378 - MPE gages are not listed/available in gage table 
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a

Former-commit-id: b46b87cb5e [formerly 8c9f9b3ae0] [formerly b46b87cb5e [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]
Former-commit-id: dc3aadd149
Former-commit-id: 68d8f9be14 [formerly 05bb380e77]
Former-commit-id: 26a112b34b
 2014-03-07 12:57:36 -05:00
Brian.Dyke
ac07a4fc49 Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: a0e3f08fce [formerly 394076196b] [formerly a0e3f08fce [formerly 394076196b] [formerly 7b798ab5d2 [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: fa189c0ef6 [formerly 6ced1bedc2]
Former-commit-id: c8b3730fef
 2014-03-07 09:01:09 -05:00
Brian.Dyke
da36dde938 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: 0bbf137b05 [formerly 312cd8a3e8] [formerly 0bbf137b05 [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]
Former-commit-id: 6414bdab57
Former-commit-id: 2eec413d72 [formerly 2f94480121]
Former-commit-id: 8f2271403d
 2014-03-07 08:57:07 -05:00
Brian.Dyke
c1dab50ce0 14.1.1-22 baseline 
Former-commit-id: fe30e1d545 [formerly 21f17d4f9b] [formerly fe30e1d545 [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly ae37ad5bac445251d1456f37588819fccfede061]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 9406a1d6c0 [formerly a4c136fd60]
Former-commit-id: 067802b104
 2014-03-07 08:49:00 -05:00
Steve Harris
d65c768373 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: dc7d6ceced [formerly 8b6263bfbd] [formerly dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]
Former-commit-id: 1c64a5c025
Former-commit-id: 972fa3bee6 [formerly 7fbbc1e118]
Former-commit-id: 7f932399b9
 2014-03-06 18:31:10 -06:00
Steve Harris
71c8e15b78 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 3358e8d6ef [formerly 7f1ad89df9] [formerly 3358e8d6ef [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 2371a74a29 [formerly 8ec20fc5e9]
Former-commit-id: 104b3d369a
 2014-03-06 18:19:55 -06:00
Nate Jensen
45ff104294 Issue #2826 fix collaboration mosaic image disposed issue 
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614

Former-commit-id: d9af17287d [formerly 7fa8bf636f] [formerly d9af17287d [formerly 7fa8bf636f] [formerly 7bfad8ce17 [formerly 50b3e6bb7fcee54f1199b78354d404f325b32773]]]
Former-commit-id: 7bfad8ce17
Former-commit-id: cb81644412 [formerly 04d7ef0e7a]
Former-commit-id: 69bdf2bd60
 2014-03-06 18:07:40 -06:00
Brad Gonzales
c50ea20d9e Issue #2885 Updated java version in build.properties.p2. 
Change-Id: Ifb266696902142ab59977025ae75010540836ed5

Former-commit-id: dadcd2e10b [formerly 2e224094ad] [formerly dadcd2e10b [formerly 2e224094ad] [formerly b47dc5df40 [formerly d1f3c5e508cf268198531a31fd3a91faba0159df]]]
Former-commit-id: b47dc5df40
Former-commit-id: 574f6f8d92 [formerly 66386f340a]
Former-commit-id: 7b3b48d9b3
 2014-03-06 17:35:43 -06:00
Brad Gonzales
4cbc3b1b05 Issue #2885 Updated all of the PDE builds to Java 1.7. 
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: a24cbcfa77 [formerly 0e3dc17872] [formerly a24cbcfa77 [formerly 0e3dc17872] [formerly dea17a19da [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]
Former-commit-id: dea17a19da
Former-commit-id: 4ba60d8a6f [formerly 78d35d4033]
Former-commit-id: c4064160ec
 2014-03-06 16:29:37 -06:00
Ben Steffensmeier
abc97d429c Issue #2831 Fix No Data Value in collaboration images. 
Former-commit-id: c9eb976b65 [formerly 82b8790050] [formerly c9eb976b65 [formerly 82b8790050] [formerly 6962f80c5a [formerly 30a2518e0f780e4c344ec0e8fcdac39c9e3d617c]]]
Former-commit-id: 6962f80c5a
Former-commit-id: 346cd75e59 [formerly 062e3ddb48]
Former-commit-id: 4bc84e916d
 2014-03-06 13:37:08 -06:00
Brian.Dyke
8de6b2d57b ASM #124 - Display GLD360 lightning data 
Former-commit-id: bd81ebd8c2 [formerly db274c890f] [formerly bd81ebd8c2 [formerly db274c890f] [formerly eefe8c45fe [formerly 1edba9216beac913f9bd867da9988e213394a396]]]
Former-commit-id: eefe8c45fe
Former-commit-id: 26140187b1 [formerly b657767cb1]
Former-commit-id: b9e9126e11
 2014-03-06 10:54:15 -05:00
Steve Harris
2db5dcf6eb Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 3ba28aabea [formerly 069093884f] [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 587f15a95d [formerly 96658d8ce0]
Former-commit-id: 36a0533f19
 2014-03-06 08:39:43 -06:00
Nate Jensen
f19837e0ed Merge "Issue #2791 Move D2D Grids to direct memory." into development 
Former-commit-id: 0d547ab0bf [formerly be9cc9397f] [formerly 0d547ab0bf [formerly be9cc9397f] [formerly a91e941d3e [formerly acd6c523e7b1ab836b3529bacdbebb5fcfce3c3c]]]
Former-commit-id: a91e941d3e
Former-commit-id: 76ded096a8 [formerly fb50424456]
Former-commit-id: 7bb56ce041
 2014-03-05 15:02:46 -06:00
Ben Steffensmeier
ab265087eb Issue #2791 Move D2D Grids to direct memory. 
Former-commit-id: fd34cf3993 [formerly 12ed63619a] [formerly fd34cf3993 [formerly 12ed63619a] [formerly 775c29e77c [formerly 8d8a06be12652349032f15ab1e31d5f23adf0b24]]]
Former-commit-id: 775c29e77c
Former-commit-id: 2bc8805fbc [formerly a06a98750f]
Former-commit-id: 3f62075baa
 2014-03-05 14:57:28 -06:00
Nate Jensen
f84030e2b7 Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development 
Former-commit-id: ae9adefbf7 [formerly cf4631f9bf] [formerly ae9adefbf7 [formerly cf4631f9bf] [formerly 48fa8f8d1b [formerly e6dc5f076bfd4811b2b1cdaf3782a5066e032381]]]
Former-commit-id: 48fa8f8d1b
Former-commit-id: b097d488ca [formerly d3f18729c3]
Former-commit-id: 8380226f6b
 2014-03-05 14:41:12 -06:00
Mike Duff
8a798710c5 Issue #2798 - Fix user presence messages and settings 
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: 25425a4268 [formerly e97e745b61] [formerly 25425a4268 [formerly e97e745b61] [formerly 9c873e6dd9 [formerly b087558dce4e19596c93d47e986af50fae806a74]]]
Former-commit-id: 9c873e6dd9
Former-commit-id: 0251ad5bca [formerly c0bf150e15]
Former-commit-id: 15c32a1513
 2014-03-05 14:39:55 -06:00
Nate Jensen
d7b438bccf Merge "Issue #2861 added synchronized blocks where necessary" into development 
Former-commit-id: 54d015cb4f [formerly 59dcb3a97d] [formerly 54d015cb4f [formerly 59dcb3a97d] [formerly 2eea0b9205 [formerly e108aa41bb586593f50970da53109a82d2bb8452]]]
Former-commit-id: 2eea0b9205
Former-commit-id: 2def452e2c [formerly 17ee130b2a]
Former-commit-id: f8e7bfa835
 2014-03-05 14:14:25 -06:00
Max Schenkelberg
7f9bea7552 Issue #2861 added synchronized blocks where necessary 
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811

Former-commit-id: 83ac37724e [formerly 10bfa59aef] [formerly 83ac37724e [formerly 10bfa59aef] [formerly b5ed7ac361 [formerly 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede]]]
Former-commit-id: b5ed7ac361
Former-commit-id: a8b436c867 [formerly 0fbc2df17d]
Former-commit-id: 9b26076206
 2014-03-05 13:51:06 -06:00