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

3005 commits

Author SHA1 Message Date
Nate Jensen
6d25649178 Merge "Issue #2895 fixed telestration when leadership returns to a previous leader" into development 
Former-commit-id: bc9f494604 [formerly 3ee42187e6] [formerly bc9f494604 [formerly 3ee42187e6] [formerly d44fee0588 [formerly ad4deae1563ea5f311c3428cefb82bf156392310]]]
Former-commit-id: d44fee0588
Former-commit-id: 116c66b685 [formerly 99643d9545]
Former-commit-id: beeabfec37
 2014-03-18 17:01:44 -05:00
Mike Duff
ae25f4e867 Issue #2433 - Implement view by priority check box menus 
review comments

Change-Id: I63c984c328336ebe9d6d06dbc48780051e3ea2e7

Former-commit-id: 9d24291927 [formerly a7e568e799] [formerly 9d24291927 [formerly a7e568e799] [formerly 202a822384 [formerly ca228b57089101c61f9d3f76d7edc4ba96c41b61]]]
Former-commit-id: 202a822384
Former-commit-id: b0554f903f [formerly 980e398584]
Former-commit-id: 43744f0255
 2014-03-18 16:42:58 -05:00
Nate Jensen
e25dd853df Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development 
Former-commit-id: 61c5a25407 [formerly 85e3ac041a] [formerly 61c5a25407 [formerly 85e3ac041a] [formerly 7e7745cd7b [formerly 5e03b83061e1cd7f1a15e939c2bc98d3b99cf393]]]
Former-commit-id: 7e7745cd7b
Former-commit-id: e3bc322d49 [formerly 3e32812f13]
Former-commit-id: f823e46676
 2014-03-18 13:13:53 -05:00
Nate Jensen
1125203c93 Issue #2895 fixed telestration when leadership returns to a previous 
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: 68b60eba47 [formerly e75d3dfb7c] [formerly 68b60eba47 [formerly e75d3dfb7c] [formerly 2fc1030fad [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 8589374171 [formerly ca1ec93450]
Former-commit-id: 5cb38bd511
 2014-03-18 12:52:01 -05:00
Nate Jensen
19a66e94b9 Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development 
Former-commit-id: b5f2064207 [formerly 5f79ece006] [formerly b5f2064207 [formerly 5f79ece006] [formerly e9be36b08c [formerly 1c87269eac595b61cc54c1e39ec8624ba55fd6d8]]]
Former-commit-id: e9be36b08c
Former-commit-id: 8ebc031a07 [formerly a4728542c5]
Former-commit-id: 4483a54b05
 2014-03-18 12:38:48 -05:00
Mike Duff
179082ebf9 Issue #2798 - Fix issue with color not changing for existing user changing site. 
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57

Former-commit-id: ac65a87fe5 [formerly 3d10260065] [formerly ac65a87fe5 [formerly 3d10260065] [formerly 7bdef60a55 [formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]]]
Former-commit-id: 7bdef60a55
Former-commit-id: 1a3e88c5da [formerly 5bbe504f82]
Former-commit-id: b560f16623
 2014-03-18 11:55:00 -05:00
Mike Duff
397af6e36e Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. 
Peer review comments

Change-Id: Ie27e8f93d976dcc0573631472986898b3ad8c9ef

Former-commit-id: 26866f4d73 [formerly 105a11d8f9] [formerly 26866f4d73 [formerly 105a11d8f9] [formerly cb6a3e2cf5 [formerly 29a88687a788305be537ef97cce13e3f45338205]]]
Former-commit-id: cb6a3e2cf5
Former-commit-id: ae979e09f5 [formerly d98f4b2ab0]
Former-commit-id: ef7847bc14
 2014-03-18 11:32:28 -05:00
Nate Jensen
f609b46ec5 Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development 
Former-commit-id: 3d7de2ad9a [formerly 6ddf9a2ee7] [formerly 3d7de2ad9a [formerly 6ddf9a2ee7] [formerly 6148c00ed2 [formerly 5b287c87e27e77b07b2f72030bf9e23c72e50912]]]
Former-commit-id: 6148c00ed2
Former-commit-id: d2fbbdc147 [formerly e77738ef65]
Former-commit-id: c363fc886c
 2014-03-18 09:20:16 -05:00
Juliya Dynina
de68dcfeb4 Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2 
Former-commit-id: d6e2b7f741 [formerly c735051e00] [formerly d6e2b7f741 [formerly c735051e00] [formerly 867f00b438 [formerly 669d66d3b8279833df4a361c961c113e653a542d]]]
Former-commit-id: 867f00b438
Former-commit-id: ed07060240 [formerly c54631024a]
Former-commit-id: d34b5c1a2c
 2014-03-18 08:13:51 -05:00
Qinglu.Lin
119fc9840e ASM #335 - Watch wording not being inserted for SMW and SMW followup 
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05

Former-commit-id: 09e90dfe43 [formerly 4b3c821ce0] [formerly 09e90dfe43 [formerly 4b3c821ce0] [formerly af82143e84 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]
Former-commit-id: af82143e84
Former-commit-id: 1b352b8600 [formerly bd7d68bd16]
Former-commit-id: 72b8b32e25
 2014-03-17 18:17:49 -04:00
Steve Harris
a936941dff Merge branch 'omaha_14.2.1' (14.2.1-13) into development 
Former-commit-id: 5efb16fa8b [formerly d0aeb854f5] [formerly 5efb16fa8b [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 5d95d594f8 [formerly b5a2d2237f]
Former-commit-id: 3a82fa7ac6
 2014-03-17 15:55:41 -05:00
Steve Harris
a612c4e6dd Merge branch 'master_14.2.2' into omaha_14.2.2 
Former-commit-id: 951c9b0d31 [formerly d087c8c31e] [formerly 951c9b0d31 [formerly d087c8c31e] [formerly 24fe6a248f [formerly 543090e28936ce680e21cda802cfac73ff31ca58]]]
Former-commit-id: 24fe6a248f
Former-commit-id: 5abea804af [formerly f878fe8729]
Former-commit-id: 6cc8f3a295
 2014-03-17 15:53:31 -05:00
Matthew Howard
ab71d9e4d4 Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2 
Former-commit-id: 30e8d76f50 [formerly c1433db0fb] [formerly 30e8d76f50 [formerly c1433db0fb] [formerly 1d15cda9fd [formerly 1b46d5c169709a9498a5eb9963286a6223089af4]]]
Former-commit-id: 1d15cda9fd
Former-commit-id: 4ec6bd0a21 [formerly 6b5bbb1270]
Former-commit-id: 930eb52d95
 2014-03-14 19:47:32 -05:00
Nate Jensen
0014f6142f Issue #2908 attempt to fix build 
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480

Former-commit-id: b5f3aee368 [formerly 78afc6040c] [formerly b5f3aee368 [formerly 78afc6040c] [formerly 9cf43e7de6 [formerly 131d45e260ab446e9764d0fcc1f542ef012ff352]]]
Former-commit-id: 9cf43e7de6
Former-commit-id: cf171e67ed [formerly d4596770ee]
Former-commit-id: c6db5c24b1
 2014-03-14 14:14:37 -05:00
Rici.Yu
f32491f913 ASM #84 - fix default time range for smart tools 
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99

Former-commit-id: c559ade333 [formerly 74b1c827ee] [formerly c559ade333 [formerly 74b1c827ee] [formerly 58f9857344 [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]]]
Former-commit-id: 58f9857344
Former-commit-id: e877c81c88 [formerly 0ee8baf0c3]
Former-commit-id: 1684740d02
 2014-03-14 14:39:56 -04:00
Brian.Dyke
92ed2895fb Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 24a63fb05a [formerly 030a18f804] [formerly 24a63fb05a [formerly 030a18f804] [formerly 30084d7f84 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]
Former-commit-id: 30084d7f84
Former-commit-id: 916fec5a4f [formerly 2109409b24]
Former-commit-id: f20020876a
 2014-03-14 10:15:53 -04:00
Brian.Dyke
516ba8e81a Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: 4e3096631d [formerly d4b6d22ae2] [formerly 4e3096631d [formerly d4b6d22ae2] [formerly f999e48df0 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]]]
Former-commit-id: f999e48df0
Former-commit-id: 82756e3855 [formerly 3ab2df3507]
Former-commit-id: 76271269c5
 2014-03-14 08:44:39 -04:00
Bryan Kowal
a099c8d647 Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit 
Former-commit-id: 3e90c26b14 [formerly 9b2af366c1] [formerly 3e90c26b14 [formerly 9b2af366c1] [formerly 6ba13b2b44 [formerly 5f0d983aa7cd428d532aa3b418eaddf21e31718a]]]
Former-commit-id: 6ba13b2b44
Former-commit-id: f0ff052afc [formerly 2b053a3bc8]
Former-commit-id: 9cfde0458f
 2014-03-13 17:39:32 -05:00
Kevin P. Johnson
90a9e642e3 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: e3a951da78 [formerly b2797a0788] [formerly e3a951da78 [formerly b2797a0788] [formerly 4c833d3389 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]
Former-commit-id: 4c833d3389
Former-commit-id: 32b372db4b [formerly 17a4229072]
Former-commit-id: eb12ec9c14
 2014-03-13 20:42:12 +00:00
Nate Jensen
677ae81c6a Merge "Issue #2909 Remove useLegacyMergeSort java parameter" into development 
Former-commit-id: 57faf2b7b1 [formerly a2a46becc8] [formerly 57faf2b7b1 [formerly a2a46becc8] [formerly befff7be3a [formerly a221c18b0195cb5b8dd284c4f3ef1266a8efd999]]]
Former-commit-id: befff7be3a
Former-commit-id: 071ae3b61f [formerly 3f2ff13d14]
Former-commit-id: a47e73f056
 2014-03-13 12:41:14 -05:00
Nate Jensen
b1b0f40cdf Issue #2907 split edex.redbook plugin into common and edex redbook plugins 
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe

Former-commit-id: 692ec623b2 [formerly 087307a781] [formerly 692ec623b2 [formerly 087307a781] [formerly cc1cb28eed [formerly 62923fbae80131fab6256923bc32bc46e46940ba]]]
Former-commit-id: cc1cb28eed
Former-commit-id: 027a141c94 [formerly daf6997a59]
Former-commit-id: 1485f7ff48
 2014-03-13 12:23:35 -05:00
Ron Anderson
1ed943032d Issue #2909 Remove useLegacyMergeSort java parameter 
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a

Former-commit-id: f921b5c83b [formerly d1b36c4a72] [formerly f921b5c83b [formerly d1b36c4a72] [formerly dd8bfdf941 [formerly 3aeb50672f8de7b973f234e0ab351416cbf7670b]]]
Former-commit-id: dd8bfdf941
Former-commit-id: f24f542137 [formerly b82cf065b5]
Former-commit-id: 2bf7b94fe4
 2014-03-13 11:54:15 -05:00
Nate Jensen
b8b63869ed 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: a9381c505e [formerly 540d0f2e1d] [formerly a9381c505e [formerly 540d0f2e1d] [formerly 27625eb93a [formerly ee5c599bf4822f73e488e42240c5794189e2d70f]]]
Former-commit-id: 27625eb93a
Former-commit-id: 5f554ade56 [formerly d8edb8e91b]
Former-commit-id: 432926c40b
 2014-03-13 11:16:00 -05:00
Ron Anderson
98e22f6e59 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: ab69d3e318 [formerly 1c727465ee] [formerly ab69d3e318 [formerly 1c727465ee] [formerly bcfaf40ebf [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]
Former-commit-id: bcfaf40ebf
Former-commit-id: 06b0b5b684 [formerly 4b2a388628]
Former-commit-id: 4ffc16ce53
 2014-03-13 11:11:53 -05:00
Nate Jensen
b41cda0bda Merge "Issue #2898 Fix recycling of best res resource." into development 
Former-commit-id: 95fe9da5e2 [formerly c662bfb938] [formerly 95fe9da5e2 [formerly c662bfb938] [formerly 8ac509f37f [formerly 274b83f84f4bdda381c450b0853711564cae65a6]]]
Former-commit-id: 8ac509f37f
Former-commit-id: 614a106884 [formerly 42e2f15293]
Former-commit-id: 12b7028a8b
 2014-03-13 10:14:58 -05:00
Ben Steffensmeier
147a2a1b03 Issue #2898 Fix recycling of best res resource. 
Former-commit-id: 477b2b604a [formerly 90e464ad0b] [formerly 477b2b604a [formerly 90e464ad0b] [formerly d115db1a66 [formerly 1693e5e369a199dd2a824815e0c3e638fc7b0be3]]]
Former-commit-id: d115db1a66
Former-commit-id: 1a06a5c3f5 [formerly e4d861fc69]
Former-commit-id: 858774d699
 2014-03-12 18:05:10 -05:00
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
Juliya Dynina
a732e97bba Merge "ASM #380 - Hydro--TimeSeries:error thrown when click Table button" into asm_14.2.2 
Former-commit-id: 2a9de9706e [formerly 6ac6f6f1fc] [formerly 2a9de9706e [formerly 6ac6f6f1fc] [formerly b296595184 [formerly f28ab35657154bb028f3ca710ccc0b42d7c04b70]]]
Former-commit-id: b296595184
Former-commit-id: ced1197a83 [formerly ee8e55431b]
Former-commit-id: c2929b2bf3
 2014-03-12 11:36:38 -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
Loubna.Bousaidi
1eb79ede56 ASM #380 - Hydro--TimeSeries:error thrown when click Table button 
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09

Former-commit-id: 27447d7b76 [formerly 123007b18d] [formerly 27447d7b76 [formerly 123007b18d] [formerly ce2bea0a04 [formerly d2161a0fdd0bad7f8266a8b30659021edecaa549]]]
Former-commit-id: ce2bea0a04
Former-commit-id: b5cb73fd5a [formerly 6f7b1b6ca8]
Former-commit-id: 7eb94c4651
 2014-03-11 18:58:26 +00: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