Nate Jensen
|
61e26e0fc6
|
Merge "Issue #2848 fixed session create, listen, join ordering" into development
Former-commit-id: 56d46a5fe5 [formerly 3c6667cd58] [formerly 64b7c84018] [formerly 64b7c84018 [formerly 722216e319]] [formerly 56d46a5fe5 [formerly 3c6667cd58] [formerly 64b7c84018] [formerly 64b7c84018 [formerly 722216e319]] [formerly fb2677db7d [formerly 64b7c84018 [formerly 722216e319] [formerly fb2677db7d [formerly 89427f93a4459a2f5feeac4f9df00db3143eb998]]]]]
Former-commit-id: fb2677db7d
Former-commit-id: 1214794fb8 [formerly c5ca4739cd] [formerly ac028d6583] [formerly 6f3efb3785106752012e7f43c9c87d33c2fe492c [formerly 118a405e684ed645c200cc1fd8cb608074029d93] [formerly ac028d6583 [formerly 9633d5f252]]]
Former-commit-id: 629738405f64d3e03b0cd7e358fdb9cc1af0bc54 [formerly c3aa591a5029b8a25e6e869f92fe4236b65574e7] [formerly f4dbdb33a3 [formerly aa096c1e2e]]
Former-commit-id: f4dbdb33a3
Former-commit-id: e7741e3512
|
2014-03-10 17:36:06 -05:00 |
|
Steve Harris
|
90d072d496
|
Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development
Former-commit-id: 2d82150b6a [formerly d8badc8bea] [formerly e62a399e9f] [formerly e62a399e9f [formerly 4c52fb5bb3]] [formerly 2d82150b6a [formerly d8badc8bea] [formerly e62a399e9f] [formerly e62a399e9f [formerly 4c52fb5bb3]] [formerly cfc9fea413 [formerly e62a399e9f [formerly 4c52fb5bb3] [formerly cfc9fea413 [formerly 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3]]]]]
Former-commit-id: cfc9fea413
Former-commit-id: 5267cae582 [formerly 15035a01cc] [formerly 0c0bc58b3e] [formerly 0b6545063a13b00a9d8b64d76498bab713ad5d65 [formerly 47d576172614afbe5d714782f88cfa8fc696489d] [formerly 0c0bc58b3e [formerly 57f2a3204e]]]
Former-commit-id: c8c93bbf5b5f0376431e4d4f8ed0931c72b4bf24 [formerly 773d007dceef6da9d83355be4f40dbf2ad6307ff] [formerly b40eee35c7 [formerly 51150e544b]]
Former-commit-id: b40eee35c7
Former-commit-id: 52b2a36583
|
2014-03-10 16:01:16 -05:00 |
|
Ben Steffensmeier
|
45cb1270f3
|
Issue #2867 Better validation of image export frame range.
Former-commit-id: 9700f4c365 [formerly 3a92ec7284] [formerly bde80aec1b] [formerly bde80aec1b [formerly e75b961db5]] [formerly 9700f4c365 [formerly 3a92ec7284] [formerly bde80aec1b] [formerly bde80aec1b [formerly e75b961db5]] [formerly cc8b71fbdf [formerly bde80aec1b [formerly e75b961db5] [formerly cc8b71fbdf [formerly 6a3a62b913de1d508fb0d470d06a8be4a61918a3]]]]]
Former-commit-id: cc8b71fbdf
Former-commit-id: a32034eca2 [formerly d2ab10b037] [formerly 77e3f15d0b] [formerly 854d919c3cfc1754607da926d2760e6b7a235621 [formerly e808a55480a4efe5ce4ecf95f2e66eabb231b4c8] [formerly 77e3f15d0b [formerly 9c82499818]]]
Former-commit-id: 2369cecc1a71f42177ab1d0d7cd0ad22066541c2 [formerly 2b71bdb49824ca771f898e4bea737fdf5d5904ea] [formerly e0a784d6bc [formerly 3afc79f90f]]
Former-commit-id: e0a784d6bc
Former-commit-id: 17b6c309cd
|
2014-03-10 15:24:07 -05:00 |
|
Ben Steffensmeier
|
3777140c5c
|
Issue #2791 Add numeric to alertViz feature.
Former-commit-id: fb18ed5042 [formerly 6280932901] [formerly 525f6b19bf] [formerly 525f6b19bf [formerly f88e1c329e]] [formerly fb18ed5042 [formerly 6280932901] [formerly 525f6b19bf] [formerly 525f6b19bf [formerly f88e1c329e]] [formerly 2f75103635 [formerly 525f6b19bf [formerly f88e1c329e] [formerly 2f75103635 [formerly 9918eeec97938cbc7c703738800521773fbb4a87]]]]]
Former-commit-id: 2f75103635
Former-commit-id: a0f2427fa8 [formerly 60506ffe8a] [formerly db9729ef73] [formerly 43168b0c59638978cb1b425edb8db58b6b72cc11 [formerly 3705b85b6fa911d7173a7bcd00ef46993c1ad2e6] [formerly db9729ef73 [formerly eaa570c3f2]]]
Former-commit-id: 85c0c51f8f304fb10eeed53182ca12d7b5c15818 [formerly f63f3607d4f5bec8b4c8567d5f97e6ca2e071e01] [formerly 5f4a8fb516 [formerly 1ef88aa125]]
Former-commit-id: 5f4a8fb516
Former-commit-id: 097617689b
|
2014-03-10 14:55:54 -05:00 |
|
brian.dyke
|
e45b8a86f2
|
Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1
Former-commit-id: 5c855cd99d [formerly 730491d4bb] [formerly 1a482f91bc] [formerly 1a482f91bc [formerly 654778bb0d]] [formerly 5c855cd99d [formerly 730491d4bb] [formerly 1a482f91bc] [formerly 1a482f91bc [formerly 654778bb0d]] [formerly b1b216f196 [formerly 1a482f91bc [formerly 654778bb0d] [formerly b1b216f196 [formerly 9dba33a7122e20c0502b2bf8036ec875e957798b]]]]]
Former-commit-id: b1b216f196
Former-commit-id: e6c8986639 [formerly 41a37605d4] [formerly d1b389ae05] [formerly 78c031054b9dfc2beb7420496b5c54ba5ed734f4 [formerly 9bef04b7d89a16100ee76d159ab4225ead55540a] [formerly d1b389ae05 [formerly d57a3dd24c]]]
Former-commit-id: b1b125510734a20d8f6e817c848397511e5d4c0a [formerly db4eabc17ce8b18f073611f9c641761f09467a04] [formerly fba0188c90 [formerly f3df3e3690]]
Former-commit-id: fba0188c90
Former-commit-id: 3b1dd43698
|
2014-03-10 15:36:56 -04:00 |
|
Brian Clements
|
ae2171dbb1
|
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: b149fd235d [formerly 9b6c283fc9] [formerly 2456c2308f] [formerly 2456c2308f [formerly dc55cd5b5c]] [formerly b149fd235d [formerly 9b6c283fc9] [formerly 2456c2308f] [formerly 2456c2308f [formerly dc55cd5b5c]] [formerly aee98ecfb0 [formerly 2456c2308f [formerly dc55cd5b5c] [formerly aee98ecfb0 [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]]]
Former-commit-id: aee98ecfb0
Former-commit-id: 04239e2c3a [formerly 67db5cb4f8] [formerly 3486f1f241] [formerly 91efa04c395a12ae3e34ab6f127ff1accf82ed41 [formerly eb63cfebccc689b3ac62c518759624fc43c5c7b9] [formerly 3486f1f241 [formerly 4f9a2577f2]]]
Former-commit-id: e66cbe5ae570e47be4797265f7ff81f571be743a [formerly 6188fed145573399f401e7319702f154913b200b] [formerly c4e9aff9fc [formerly 6245b550aa]]
Former-commit-id: 061d186dbece4c1ee44f046477936201872ebbf9 [formerly c4e9aff9fc]
Former-commit-id: ac70455dc6
|
2014-03-10 14:06:45 -05:00 |
|
Nate Jensen
|
d8c5b5ac8d
|
Merge "Issue #2832 consolidate watch and warning recycle logic" into development
Former-commit-id: e5eb24a164 [formerly e56dfc35c4] [formerly 89cdc44635] [formerly 89cdc44635 [formerly 9cb27d5e95]] [formerly e5eb24a164 [formerly e56dfc35c4] [formerly 89cdc44635] [formerly 89cdc44635 [formerly 9cb27d5e95]] [formerly 2570c295d5 [formerly 89cdc44635 [formerly 9cb27d5e95] [formerly 2570c295d5 [formerly 4029d0d863bf6da254859028353a271dec70e335]]]]]
Former-commit-id: 2570c295d5
Former-commit-id: 3a4fbbbf8e [formerly ba37e2937d] [formerly f48251da57] [formerly 9cc1df2b24129942592409496d2c7c3360f60d5c [formerly dcb2d2450927fda01dd0d5edc5f961b453d88fb4] [formerly f48251da57 [formerly cab7dadbe8]]]
Former-commit-id: 4368406c9f3f9408d4588adbba6e32bd0acf26d9 [formerly ab831dac12081e7004bda0f15eeb4535b42baec0] [formerly 5b9fdc7612 [formerly 035cf99c65]]
Former-commit-id: 5b9fdc7612
Former-commit-id: a9dd154005
|
2014-03-10 13:52:53 -05:00 |
|
Nate Jensen
|
0094861c4a
|
Issue #2832 consolidate watch and warning recycle logic
Change-Id: I9d7e284bafbe8073ac99eb3ce0e7fbd81f3ff889
Former-commit-id: 06eb561520 [formerly 8fcbba4b82] [formerly 8e734f917e] [formerly 8e734f917e [formerly 057f7671a0]] [formerly 06eb561520 [formerly 8fcbba4b82] [formerly 8e734f917e] [formerly 8e734f917e [formerly 057f7671a0]] [formerly 8cd98e0b9f [formerly 8e734f917e [formerly 057f7671a0] [formerly 8cd98e0b9f [formerly 814d21d0a5b58c95f6339e1816788953692f5e95]]]]]
Former-commit-id: 8cd98e0b9f
Former-commit-id: 5d9ed8727c [formerly 43fbd5573a] [formerly 39f2a03d21] [formerly 18cab0e8bee25d51f48e09abcb651e68b0b96efc [formerly 2e812a9ce3352be5f400be9322dc2565a3748076] [formerly 39f2a03d21 [formerly 1646574f5a]]]
Former-commit-id: f66273fac506a4ee15e11461973938648ef38bcb [formerly 6f30e553eadca65527a1815a5df5b7b0e2172268] [formerly 7731f09550 [formerly 33d7e39376]]
Former-commit-id: 7731f09550
Former-commit-id: ed20601f72
|
2014-03-10 13:02:45 -05:00 |
|
Nate Jensen
|
9fef0758f3
|
Merge "Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter." into development
Former-commit-id: 285e31e08a [formerly 9f70b30551] [formerly 60bff5c4af] [formerly 60bff5c4af [formerly 4c7bda09c0]] [formerly 285e31e08a [formerly 9f70b30551] [formerly 60bff5c4af] [formerly 60bff5c4af [formerly 4c7bda09c0]] [formerly 33d1e94c38 [formerly 60bff5c4af [formerly 4c7bda09c0] [formerly 33d1e94c38 [formerly 99c2f252cab0901cedfefa5e2a6d6799f7e29db8]]]]]
Former-commit-id: 33d1e94c38
Former-commit-id: 83fca1eb52 [formerly 5ff614276d] [formerly ee1efad5d7] [formerly c22f45f3ce64f6827a5cbdae6e103e3884b310a1 [formerly 0934d226d319cbf0db5b7c24ab420cd99f84cb70] [formerly ee1efad5d7 [formerly f045d2fab0]]]
Former-commit-id: d988a94a3b60ebd11502832b050c3469a98f458e [formerly e84179b88c890d8d3d8ba3c32b61678ba8b8d378] [formerly 00b39d0a56 [formerly decd1ed31f]]
Former-commit-id: 00b39d0a56
Former-commit-id: cc7d30fe1b
|
2014-03-10 11:36:16 -05:00 |
|
Nate Jensen
|
2e3da45136
|
Issue #2779 add .ini generation of memory settings for other components
Former-commit-id: 201b5c6928 [formerly b77dde280f] [formerly 5a88f31a2b] [formerly 5a88f31a2b [formerly 6a75fe686a]] [formerly 201b5c6928 [formerly b77dde280f] [formerly 5a88f31a2b] [formerly 5a88f31a2b [formerly 6a75fe686a]] [formerly d599db4af2 [formerly 5a88f31a2b [formerly 6a75fe686a] [formerly d599db4af2 [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]]]
Former-commit-id: d599db4af2
Former-commit-id: 7a0f06c03a [formerly d32d855bb2] [formerly 39aa26c2b6] [formerly 47255c8b9e5d3049eff92cde37f418883db60446 [formerly 097c1a455c355cc0ebe8f7b95797516bfc05c8c6] [formerly 39aa26c2b6 [formerly 5094008bea]]]
Former-commit-id: 2ac870f8e005b6cc3996a96834fcae6a41a57897 [formerly fdddd15a0dc1ec336fdf3059c126c4240f794f5c] [formerly 6bafc51abe [formerly 19a0cfb972]]
Former-commit-id: 6bafc51abe
Former-commit-id: c508c4d9bb
|
2014-03-10 10:03:02 -05:00 |
|
Nate Jensen
|
f7051c24f1
|
Merge "Issue #2876 - move NDM plugin feature entry." into development
Former-commit-id: 522b41c564 [formerly 63ca4e4cf8] [formerly 9026f93f20] [formerly 9026f93f20 [formerly c247535b96]] [formerly 522b41c564 [formerly 63ca4e4cf8] [formerly 9026f93f20] [formerly 9026f93f20 [formerly c247535b96]] [formerly 14e4807c02 [formerly 9026f93f20 [formerly c247535b96] [formerly 14e4807c02 [formerly 1a5d1cab01d14d0fef04046beb5737ed2c3d2e88]]]]]
Former-commit-id: 14e4807c02
Former-commit-id: c68986d268 [formerly fdb04e7b8c] [formerly 3a66c42d37] [formerly 54769641c6e51513c8818167dddd5bb463a2f5da [formerly 681ab5fd62e32acfb6ad0f21394c1bf87a87d68d] [formerly 3a66c42d37 [formerly 9dac73c948]]]
Former-commit-id: e64efff62969d4fc4b430d30eb78ae676da2981a [formerly 0c8225009ec65b740207d149a8cc261c0a9fd68f] [formerly 6f1981102d [formerly ea372042a5]]
Former-commit-id: 6f1981102d
Former-commit-id: 4b1fbc1d9e
|
2014-03-10 09:49:28 -05:00 |
|
Mike Duff
|
8eb6849a9c
|
Issue #2876 - move NDM plugin feature entry.
Change-Id: I3a0bc2b0deeaf565215cec588d71b177ef6a456f
Former-commit-id: d1d3446e45 [formerly 5c2d6189b4] [formerly bcd4b1490d] [formerly bcd4b1490d [formerly 6be6181108]] [formerly d1d3446e45 [formerly 5c2d6189b4] [formerly bcd4b1490d] [formerly bcd4b1490d [formerly 6be6181108]] [formerly 2fc712e1e8 [formerly bcd4b1490d [formerly 6be6181108] [formerly 2fc712e1e8 [formerly a3b334c9269a9753af0f2dd9f6507aef23177b9f]]]]]
Former-commit-id: 2fc712e1e8
Former-commit-id: 48b17ec0a2 [formerly d6e478f73e] [formerly 1eefba01ab] [formerly 245e4d38483987bce46e19fc996066a1083db487 [formerly 2cb3c387db5cc599a7efd039cccde7a292e38fbd] [formerly 1eefba01ab [formerly 861013ad86]]]
Former-commit-id: 5381aabd403270644b35be7a539745e548afd56a [formerly 713a379da26585f1d2034377c5164bd4874a48e2] [formerly f46a80e936 [formerly 75218fb1aa]]
Former-commit-id: f46a80e936
Former-commit-id: 156f18d197
|
2014-03-10 09:45:04 -05:00 |
|
Nate Jensen
|
e51929a73a
|
Merge "Issue #2751 ensured that room admins know real userids" into development
Former-commit-id: 05be1357dc [formerly 181060825e] [formerly 1306957f2a] [formerly 1306957f2a [formerly e787cac9af]] [formerly 05be1357dc [formerly 181060825e] [formerly 1306957f2a] [formerly 1306957f2a [formerly e787cac9af]] [formerly e963c7c4a1 [formerly 1306957f2a [formerly e787cac9af] [formerly e963c7c4a1 [formerly e6feac94800c2dd82afcf42ca9f387b24514deff]]]]]
Former-commit-id: e963c7c4a1
Former-commit-id: 8fd9297571 [formerly c22f8f2a07] [formerly ede24100b6] [formerly 70bcfe2438dbf72a19794ceae067a34f298f10de [formerly ba716a9976681eb2fe24b90c93cd383526039e18] [formerly ede24100b6 [formerly 4dd4805e33]]]
Former-commit-id: 6458ddd9d3574a33d701e3f6a36a58e93013d141 [formerly e3fccb43adb804eee9552e8406b1c63c475b17ee] [formerly 66180a8e05 [formerly 3e61d24967]]
Former-commit-id: 66180a8e05
Former-commit-id: 49d1251578
|
2014-03-10 09:15:39 -05:00 |
|
Nate Jensen
|
731e4e2c44
|
Merge "Issue #2826 fix collaboration mosaic image disposed issue" into development
Former-commit-id: fc50d91561 [formerly b98ec97406] [formerly bedb7b7653] [formerly bedb7b7653 [formerly f5a08f1f86]] [formerly fc50d91561 [formerly b98ec97406] [formerly bedb7b7653] [formerly bedb7b7653 [formerly f5a08f1f86]] [formerly d04751a986 [formerly bedb7b7653 [formerly f5a08f1f86] [formerly d04751a986 [formerly 24492229a0bddc3db1b6945fcd2a89a486f1ef2e]]]]]
Former-commit-id: d04751a986
Former-commit-id: 1d602ca909 [formerly c15c40c252] [formerly c5555eaa0c] [formerly 9944f9428ac128d41b61279cd6443f7778a48599 [formerly dba28ac337f99c6e321ea3a49f0294746750950c] [formerly c5555eaa0c [formerly 9c5f87dc03]]]
Former-commit-id: 40eea90117188edfc3cfb1599a7f785425186064 [formerly 1daa87b6f11cca3c72b64aa3ba1b94b48020d323] [formerly 358658d1af [formerly bf58ef25b0]]
Former-commit-id: 358658d1af
Former-commit-id: b3a3ab1467
|
2014-03-10 09:04:51 -05:00 |
|
Ben Steffensmeier
|
a19842fb52
|
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
Former-commit-id: 738c59586c [formerly 094086b5c2] [formerly c0b478eb97] [formerly c0b478eb97 [formerly 9122b6da99]] [formerly 738c59586c [formerly 094086b5c2] [formerly c0b478eb97] [formerly c0b478eb97 [formerly 9122b6da99]] [formerly 8650074737 [formerly c0b478eb97 [formerly 9122b6da99] [formerly 8650074737 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]]]
Former-commit-id: 8650074737
Former-commit-id: 66987f1f94 [formerly bf5b777b0d] [formerly 5e4c35e93f] [formerly a095ce7dbd028a07c57ecd6193b01aca6137239d [formerly b86eb15482eef7c6ed811b7be5a9d782dbcfa838] [formerly 5e4c35e93f [formerly d3043fda5a]]]
Former-commit-id: d36677e45987cd62f29a7a454eac54016372aab2 [formerly 97f709f323c3b2bc50eb72f596874288c2f388b5] [formerly ad4ce67e85 [formerly a1ac082c94]]
Former-commit-id: ad4ce67e85
Former-commit-id: fd2fbe839d
|
2014-03-07 18:15:32 -06:00 |
|
Steve Harris
|
81618c3995
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: d75a4b3cd5 [formerly 865fef97b1] [formerly 51b755a476] [formerly 51b755a476 [formerly 873bd6b889]] [formerly d75a4b3cd5 [formerly 865fef97b1] [formerly 51b755a476] [formerly 51b755a476 [formerly 873bd6b889]] [formerly f60aba35d6 [formerly 51b755a476 [formerly 873bd6b889] [formerly f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]]
Former-commit-id: f60aba35d6
Former-commit-id: b9ff2a49ba [formerly edeb1833ae] [formerly c24108e75b] [formerly 7f8215da41a95a263a59e77fd7e9353b01be981b [formerly dd4a41540248d59f726530a16fc9cba204845e67] [formerly c24108e75b [formerly 708485427e]]]
Former-commit-id: 7aeba52063b24f0cb2ee310f9d0a9f8c69ac126b [formerly 5762fd74e7f2363c52a036a1f2863c4bad83bfa3] [formerly ed7921643c [formerly 61af779433]]
Former-commit-id: 02803b931e676cee86186c72e6d2df30149410c0 [formerly ed7921643c]
Former-commit-id: 9c0f484340
|
2014-03-07 15:43:40 -06:00 |
|
Brian Clements
|
0a6499148b
|
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: e930e8eedf [formerly 8aff9ee95c] [formerly 2afc1a9319] [formerly 2afc1a9319 [formerly 44d161729f]] [formerly e930e8eedf [formerly 8aff9ee95c] [formerly 2afc1a9319] [formerly 2afc1a9319 [formerly 44d161729f]] [formerly dc94769c14 [formerly 2afc1a9319 [formerly 44d161729f] [formerly dc94769c14 [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]]]]
Former-commit-id: dc94769c14
Former-commit-id: f9aa74c8ac [formerly cfe64d833a] [formerly acb20cfbbe] [formerly 079b4c780a559512c7426918a1285b813e6095a9 [formerly 7e2fb485cd2c4586601a3aa2ff0a182aaca10fab] [formerly acb20cfbbe [formerly ac63129ad1]]]
Former-commit-id: 91a101a40c781971f0fddcb36e55d75ef08a499b [formerly f030c8528ac78571000ec83546e396d509e9d0ae] [formerly 975bfca460 [formerly 6590587d9e]]
Former-commit-id: 975bfca460
Former-commit-id: e81c8368dd
|
2014-03-07 15:37:29 -06:00 |
|
Steve Harris
|
7f6debc2c5
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 75dfbf2f50 [formerly da2d7fc334] [formerly 068297b90a] [formerly 068297b90a [formerly 92232fa063]] [formerly 75dfbf2f50 [formerly da2d7fc334] [formerly 068297b90a] [formerly 068297b90a [formerly 92232fa063]] [formerly 40b543f9a8 [formerly 068297b90a [formerly 92232fa063] [formerly 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: c9fe927a17 [formerly a94f800324] [formerly 4d1fbf8743] [formerly efba617a73c26bfacea16cc9961421508d57dd5c [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb] [formerly 4d1fbf8743 [formerly f992a6b046]]]
Former-commit-id: 12f0692d5652bc442f51abcadf8aa619047cc4c8 [formerly 0b70d2b7739772b630136c56408866dc53a2bdcd] [formerly e29b96b6bd [formerly ea01373320]]
Former-commit-id: e29b96b6bd
Former-commit-id: 3348f6857a
|
2014-03-07 15:16:18 -06:00 |
|
Shawn.Hooper
|
e18fd10210
|
ASM #378 - MPE gages are not listed/available in gage table
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a
Former-commit-id: 81a558c120 [formerly fb051c5a5f] [formerly b46b87cb5e] [formerly b46b87cb5e [formerly 8c9f9b3ae0]] [formerly 81a558c120 [formerly fb051c5a5f] [formerly b46b87cb5e] [formerly b46b87cb5e [formerly 8c9f9b3ae0]] [formerly dc3aadd149 [formerly b46b87cb5e [formerly 8c9f9b3ae0] [formerly dc3aadd149 [formerly 55b1066b8674a044602297e64cb557ced5faf92a]]]]]
Former-commit-id: dc3aadd149
Former-commit-id: 53d1b15925 [formerly e33de27296] [formerly 68d8f9be14] [formerly 9b98e1e2fc891e0dc40c509f43fdaa86fd31504e [formerly f304d2fa3946f5a199255a03597cdc0f3f79d636] [formerly 68d8f9be14 [formerly 05bb380e77]]]
Former-commit-id: dbf82bfefa6f202f6623e28913fd0f0475d4c3cf [formerly 701e61da1838f2875ec87860a05500044bd28ae9] [formerly db1c090463 [formerly 26a112b34b]]
Former-commit-id: db1c090463
Former-commit-id: 20c67c86e1
|
2014-03-07 12:57:36 -05:00 |
|
Brian.Dyke
|
6bc2e4535d
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 103b06b186 [formerly c2449e7821] [formerly a0e3f08fce] [formerly a0e3f08fce [formerly 394076196b]] [formerly 103b06b186 [formerly c2449e7821] [formerly a0e3f08fce] [formerly a0e3f08fce [formerly 394076196b]] [formerly 7b798ab5d2 [formerly a0e3f08fce [formerly 394076196b] [formerly 7b798ab5d2 [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: 3664571639 [formerly eb6abe6faa] [formerly fa189c0ef6] [formerly 04d354461e6f8a3957ce212199076a8d6419f4d3 [formerly e502d460a99724c0ff3efb14c8d0f8d731aad320] [formerly fa189c0ef6 [formerly 6ced1bedc2]]]
Former-commit-id: 481514ac434bfc7de1a0b297e45cc195df92dbd2 [formerly c243cc113e92d596862d61e7a6a2878bf1eafda3] [formerly ac07a4fc49 [formerly c8b3730fef]]
Former-commit-id: ac07a4fc49
Former-commit-id: 603695a2a4
|
2014-03-07 09:01:09 -05:00 |
|
Brian.Dyke
|
f557956bc4
|
Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: 74d19f707a [formerly e1cc8eb59a] [formerly 0bbf137b05] [formerly 0bbf137b05 [formerly 312cd8a3e8]] [formerly 74d19f707a [formerly e1cc8eb59a] [formerly 0bbf137b05] [formerly 0bbf137b05 [formerly 312cd8a3e8]] [formerly 6414bdab57 [formerly 0bbf137b05 [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]]]
Former-commit-id: 6414bdab57
Former-commit-id: 3e787975d2 [formerly 50621ec3e5] [formerly 2eec413d72] [formerly eb691e30c988ae59a417e5e908b795b25b945453 [formerly 1e0890d0f70a0aeffbbcabd7f8be3e396daae297] [formerly 2eec413d72 [formerly 2f94480121]]]
Former-commit-id: 887e32b93aa0be2d6e80624ef335e498dbfbb3db [formerly d006a47edee1a1939aadf15ef61024f22a80931d] [formerly da36dde938 [formerly 8f2271403d]]
Former-commit-id: da36dde938
Former-commit-id: b8ee763baa
|
2014-03-07 08:57:07 -05:00 |
|
Brian.Dyke
|
8de1a65d9f
|
14.1.1-22 baseline
Former-commit-id: 935c79a5dd [formerly 1dcc56775d] [formerly fe30e1d545] [formerly fe30e1d545 [formerly 21f17d4f9b]] [formerly 935c79a5dd [formerly 1dcc56775d] [formerly fe30e1d545] [formerly fe30e1d545 [formerly 21f17d4f9b]] [formerly 08d8f1a0ee [formerly fe30e1d545 [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly ae37ad5bac445251d1456f37588819fccfede061]]]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 90aae085ad [formerly 3c9cde458a] [formerly 9406a1d6c0] [formerly 24ebeb47069cc97206387ce7b40d8dbb66247a7d [formerly f1658f5e11228e084b4f3ed536ccf891c20f621a] [formerly 9406a1d6c0 [formerly a4c136fd60]]]
Former-commit-id: 4b2defbe98126c30e265edc98bfd5af37a5f0445 [formerly 385ffc492ff49872acfb40d1c47fffb7dff76ec2] [formerly c1dab50ce0 [formerly 067802b104]]
Former-commit-id: c1dab50ce0
Former-commit-id: ed94e1bc6b
|
2014-03-07 08:49:00 -05:00 |
|
Steve Harris
|
cb1dc0fbde
|
Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: 653fb44d87 [formerly 08dbf1f7ea] [formerly dc7d6ceced] [formerly dc7d6ceced [formerly 8b6263bfbd]] [formerly 653fb44d87 [formerly 08dbf1f7ea] [formerly dc7d6ceced] [formerly dc7d6ceced [formerly 8b6263bfbd]] [formerly 1c64a5c025 [formerly dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]]]
Former-commit-id: 1c64a5c025
Former-commit-id: fc1ae80078 [formerly 3f778f9f9f] [formerly 972fa3bee6] [formerly a43476b7803d23c5d5d4c5743c6969b1bf6672b4 [formerly ce9b772480f62374b4f578a3aa3691569ae98b58] [formerly 972fa3bee6 [formerly 7fbbc1e118]]]
Former-commit-id: 1b5f2e57254273452ff3d5388fd45f472403c01b [formerly 4dd289fbedb14cff7837a7f1aeed66c5959e4ee1] [formerly d65c768373 [formerly 7f932399b9]]
Former-commit-id: d65c768373
Former-commit-id: 2acd9aac73
|
2014-03-06 18:31:10 -06:00 |
|
Steve Harris
|
0908bde34a
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: afbf38d76f [formerly 93aa41a34b] [formerly 3358e8d6ef] [formerly 3358e8d6ef [formerly 7f1ad89df9]] [formerly afbf38d76f [formerly 93aa41a34b] [formerly 3358e8d6ef] [formerly 3358e8d6ef [formerly 7f1ad89df9]] [formerly a2e36f4c6c [formerly 3358e8d6ef [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 0ee6eca712 [formerly 3715195901] [formerly 2371a74a29] [formerly 932e6bd0cced8920652c51cdb795a6002399ca41 [formerly 4de1a1cd26a0d873cc898cd411cc38ab4cc889c6] [formerly 2371a74a29 [formerly 8ec20fc5e9]]]
Former-commit-id: 12bed867bcdd8dca8ff57d7a87ae372836fcc6d9 [formerly 550b2170a0e7b2252cdcb3421b25e5704cf2cdac] [formerly 71c8e15b78 [formerly 104b3d369a]]
Former-commit-id: 71c8e15b78
Former-commit-id: f7a15a87e5
|
2014-03-06 18:19:55 -06:00 |
|
Nate Jensen
|
aa30c0557b
|
Issue #2826 fix collaboration mosaic image disposed issue
Change-Id: I0f54a95b710c6c4e092052be08771500fbb4f614
Former-commit-id: 74f2940c04 [formerly 95bc80c8d0] [formerly d9af17287d] [formerly d9af17287d [formerly 7fa8bf636f]] [formerly 74f2940c04 [formerly 95bc80c8d0] [formerly d9af17287d] [formerly d9af17287d [formerly 7fa8bf636f]] [formerly 7bfad8ce17 [formerly d9af17287d [formerly 7fa8bf636f] [formerly 7bfad8ce17 [formerly 50b3e6bb7fcee54f1199b78354d404f325b32773]]]]]
Former-commit-id: 7bfad8ce17
Former-commit-id: 19e5a0cf1f [formerly 488451e9aa] [formerly cb81644412] [formerly 6ebccb1ec74d3137dfd183d179e2d16e474599be [formerly 41f274281fde4fea1d15e1e1d46e9ffa39d95f5d] [formerly cb81644412 [formerly 04d7ef0e7a]]]
Former-commit-id: 6fae162b0af8862cda4c08b2f6a6fe03a3b638b8 [formerly 8fdf2bb6022e36b9b68b7b679abfa23d5a4fd59e] [formerly 45ff104294 [formerly 69bdf2bd60]]
Former-commit-id: 45ff104294
Former-commit-id: 8086172968
|
2014-03-06 18:07:40 -06:00 |
|
Brad Gonzales
|
c699025fef
|
Issue #2885 Updated java version in build.properties.p2.
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: 8ed4799cfb [formerly 5cdaee1f29] [formerly dadcd2e10b] [formerly dadcd2e10b [formerly 2e224094ad]] [formerly 8ed4799cfb [formerly 5cdaee1f29] [formerly dadcd2e10b] [formerly dadcd2e10b [formerly 2e224094ad]] [formerly b47dc5df40 [formerly dadcd2e10b [formerly 2e224094ad] [formerly b47dc5df40 [formerly d1f3c5e508cf268198531a31fd3a91faba0159df]]]]]
Former-commit-id: b47dc5df40
Former-commit-id: c770ccf89a [formerly 57edccd75d] [formerly 574f6f8d92] [formerly 3d767f38127e4707db7185687c2b88083f8d42b2 [formerly ed7d205dcc0e144d1e2e5f8235030437d4f247ca] [formerly 574f6f8d92 [formerly 66386f340a]]]
Former-commit-id: bb861eef30b3be1ab8e044d4ac1a3c237500df91 [formerly 17ffdf3bef26803fabc92808abfef89b3f6355e2] [formerly c50ea20d9e [formerly 7b3b48d9b3]]
Former-commit-id: c50ea20d9e
Former-commit-id: 81c47e89ba
|
2014-03-06 17:35:43 -06:00 |
|
Brad Gonzales
|
2b7d49ddb2
|
Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: e317164318 [formerly 885a9567bc] [formerly a24cbcfa77] [formerly a24cbcfa77 [formerly 0e3dc17872]] [formerly e317164318 [formerly 885a9567bc] [formerly a24cbcfa77] [formerly a24cbcfa77 [formerly 0e3dc17872]] [formerly dea17a19da [formerly a24cbcfa77 [formerly 0e3dc17872] [formerly dea17a19da [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]]]
Former-commit-id: dea17a19da
Former-commit-id: 88556ffdc6 [formerly 09c083ce1f] [formerly 4ba60d8a6f] [formerly e670e0feade57e374fb1c735b6e19bb44c2507cb [formerly f2869efb05c763771e03bc02057aa196d29b6d1a] [formerly 4ba60d8a6f [formerly 78d35d4033]]]
Former-commit-id: 43355841aa7d98fe8c5428fbd0be540315ce710d [formerly f70dd002a68a434eb5e81131bb0b82d4784e717e] [formerly 4cbc3b1b05 [formerly c4064160ec]]
Former-commit-id: 4cbc3b1b05
Former-commit-id: e7295b16d2
|
2014-03-06 16:29:37 -06:00 |
|
Ben Steffensmeier
|
a1fc9dbb60
|
Issue #2831 Fix No Data Value in collaboration images.
Former-commit-id: 6ec62d21b9 [formerly 0d05c6135b] [formerly c9eb976b65] [formerly c9eb976b65 [formerly 82b8790050]] [formerly 6ec62d21b9 [formerly 0d05c6135b] [formerly c9eb976b65] [formerly c9eb976b65 [formerly 82b8790050]] [formerly 6962f80c5a [formerly c9eb976b65 [formerly 82b8790050] [formerly 6962f80c5a [formerly 30a2518e0f780e4c344ec0e8fcdac39c9e3d617c]]]]]
Former-commit-id: 6962f80c5a
Former-commit-id: e2ca84338e [formerly d2ded3028f] [formerly 346cd75e59] [formerly 067a9a2955b0cf733a734236f54d54edfc065eb8 [formerly 9ff7588f62c742568fc0192bed734c0aadbb6bad] [formerly 346cd75e59 [formerly 062e3ddb48]]]
Former-commit-id: 2c3adb88b947d2df7bcd09992c5abe80eeafc067 [formerly 88261a1aea851feb7c5351fb5280d06aaf345964] [formerly abc97d429c [formerly 4bc84e916d]]
Former-commit-id: abc97d429c
Former-commit-id: 6bdb5c5ea9
|
2014-03-06 13:37:08 -06:00 |
|
Brian.Dyke
|
f35a08d2b4
|
ASM #124 - Display GLD360 lightning data
Former-commit-id: 27dc8e8eb2 [formerly 972c2c284b] [formerly bd81ebd8c2] [formerly bd81ebd8c2 [formerly db274c890f]] [formerly 27dc8e8eb2 [formerly 972c2c284b] [formerly bd81ebd8c2] [formerly bd81ebd8c2 [formerly db274c890f]] [formerly eefe8c45fe [formerly bd81ebd8c2 [formerly db274c890f] [formerly eefe8c45fe [formerly 1edba9216beac913f9bd867da9988e213394a396]]]]]
Former-commit-id: eefe8c45fe
Former-commit-id: 6732b47d23 [formerly 6ef9f7fd37] [formerly 26140187b1] [formerly 44df9b28594b77e69793f3a9ca468dcbb216ef7c [formerly 44a38ade0727afc9f135777d46659f273033a036] [formerly 26140187b1 [formerly b657767cb1]]]
Former-commit-id: d27b72416c5e056812025e560edc8b3f6377b0d8 [formerly 5fde31dc71e51a7f747df35d265aff302392ec26] [formerly 8de6b2d57b [formerly b9e9126e11]]
Former-commit-id: 8de6b2d57b
Former-commit-id: db44e7f0ec
|
2014-03-06 10:54:15 -05:00 |
|
Steve Harris
|
48ae4a3aa3
|
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: 06c150bcdd [formerly 52226061e9] [formerly 3ba28aabea] [formerly 3ba28aabea [formerly 069093884f]] [formerly 06c150bcdd [formerly 52226061e9] [formerly 3ba28aabea] [formerly 3ba28aabea [formerly 069093884f]] [formerly ffcc34f8d4 [formerly 3ba28aabea [formerly 069093884f] [formerly ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 4cfc6d84a7 [formerly d2a6b0c18b] [formerly 587f15a95d] [formerly 1fa0e84ac0f2dd8de749139eafb9aa66140436cc [formerly 075449ff82fabd2fc67648dd472bd7d35adee380] [formerly 587f15a95d [formerly 96658d8ce0]]]
Former-commit-id: 5c0f036af8f316e16fd73f1b69840385e4c7b0bb [formerly 988fe07191d81cd8942573f69248d26d68d20315] [formerly 2db5dcf6eb [formerly 36a0533f19]]
Former-commit-id: 2db5dcf6eb
Former-commit-id: a19beb1e5d
|
2014-03-06 08:39:43 -06:00 |
|
Nate Jensen
|
90a10c9eb3
|
Merge "Issue #2791 Move D2D Grids to direct memory." into development
Former-commit-id: f24cf5bcbc [formerly 451a7fe552] [formerly 0d547ab0bf] [formerly 0d547ab0bf [formerly be9cc9397f]] [formerly f24cf5bcbc [formerly 451a7fe552] [formerly 0d547ab0bf] [formerly 0d547ab0bf [formerly be9cc9397f]] [formerly a91e941d3e [formerly 0d547ab0bf [formerly be9cc9397f] [formerly a91e941d3e [formerly acd6c523e7b1ab836b3529bacdbebb5fcfce3c3c]]]]]
Former-commit-id: a91e941d3e
Former-commit-id: 0c979a2344 [formerly 8e316de47f] [formerly 76ded096a8] [formerly 62fda2c08f406a16d4e741c1a0edff38d1209076 [formerly 266a7471ea5ed64f00aec1ecc850d972c7695845] [formerly 76ded096a8 [formerly fb50424456]]]
Former-commit-id: a1693036bdb74f6d4c6e35798f0c611bf71464cd [formerly 3825e78867b11b21650e3ba6a3d9b336e1daaba6] [formerly f19837e0ed [formerly 7bb56ce041]]
Former-commit-id: 8a97708f992d3d6402bfafd65382f1cb643b2e7c [formerly f19837e0ed]
Former-commit-id: 9e5f1cd87d
|
2014-03-05 15:02:46 -06:00 |
|
Ben Steffensmeier
|
5bbf5fbfd6
|
Issue #2791 Move D2D Grids to direct memory.
Former-commit-id: 978794fa1b [formerly 6dc44e895f] [formerly fd34cf3993] [formerly fd34cf3993 [formerly 12ed63619a]] [formerly 978794fa1b [formerly 6dc44e895f] [formerly fd34cf3993] [formerly fd34cf3993 [formerly 12ed63619a]] [formerly 775c29e77c [formerly fd34cf3993 [formerly 12ed63619a] [formerly 775c29e77c [formerly 8d8a06be12652349032f15ab1e31d5f23adf0b24]]]]]
Former-commit-id: 775c29e77c
Former-commit-id: 6d5231b388 [formerly ceb056d304] [formerly 2bc8805fbc] [formerly ec7d7a316367f723beff0b0c5e4ab647ad5e80f3 [formerly e70e825d566372eb4b060f189bea9a1c2b022f0d] [formerly 2bc8805fbc [formerly a06a98750f]]]
Former-commit-id: d2b8729f57319e0316b3451a01d7081d18db09a4 [formerly a89a30db3acd3cf5e17ecb35b2b039bc72f90b99] [formerly ab265087eb [formerly 3f62075baa]]
Former-commit-id: ab265087eb
Former-commit-id: 0b48d33f0b
|
2014-03-05 14:57:28 -06:00 |
|
Nate Jensen
|
605291fb36
|
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
Former-commit-id: be4474fbbd [formerly dcbafebc0d] [formerly ae9adefbf7] [formerly ae9adefbf7 [formerly cf4631f9bf]] [formerly be4474fbbd [formerly dcbafebc0d] [formerly ae9adefbf7] [formerly ae9adefbf7 [formerly cf4631f9bf]] [formerly 48fa8f8d1b [formerly ae9adefbf7 [formerly cf4631f9bf] [formerly 48fa8f8d1b [formerly e6dc5f076bfd4811b2b1cdaf3782a5066e032381]]]]]
Former-commit-id: 48fa8f8d1b
Former-commit-id: 2adc0d8179 [formerly ddebec5791] [formerly b097d488ca] [formerly a7e514b10624eeeb8ad8f352c3f00f7d60528845 [formerly 81dc1f611ab2e4fba7afbbabdd044e8afece9c33] [formerly b097d488ca [formerly d3f18729c3]]]
Former-commit-id: dbe1c15f9d2f9748569c5b81c44fda7bccd7cc92 [formerly 7efdb261cff848db48e2d71cacdd8d5280fbeb1f] [formerly f84030e2b7 [formerly 8380226f6b]]
Former-commit-id: f84030e2b7
Former-commit-id: 2bc7230179
|
2014-03-05 14:41:12 -06:00 |
|
Mike Duff
|
4840f9b2be
|
Issue #2798 - Fix user presence messages and settings
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: b42cb216cb [formerly ec892bb7a7] [formerly 25425a4268] [formerly 25425a4268 [formerly e97e745b61]] [formerly b42cb216cb [formerly ec892bb7a7] [formerly 25425a4268] [formerly 25425a4268 [formerly e97e745b61]] [formerly 9c873e6dd9 [formerly 25425a4268 [formerly e97e745b61] [formerly 9c873e6dd9 [formerly b087558dce4e19596c93d47e986af50fae806a74]]]]]
Former-commit-id: 9c873e6dd9
Former-commit-id: 55e06d50ee [formerly b88162e504] [formerly 0251ad5bca] [formerly a225b8cd8888e32dbda89ea1f1e4d4c2b5cda6f6 [formerly acfecc3a2b5c6336080649496608081ffae17a97] [formerly 0251ad5bca [formerly c0bf150e15]]]
Former-commit-id: acdf76db2c187d23a3c8a2cf8505c3e7d15ba878 [formerly 96b5f8c7c3c165fba26eb85059fdf5317d2287b5] [formerly 8a798710c5 [formerly 15c32a1513]]
Former-commit-id: 3e08a4eb2051ed982a7296f1cf999fe1d60a759c [formerly 8a798710c5]
Former-commit-id: f061ae43a1
|
2014-03-05 14:39:55 -06:00 |
|
Nate Jensen
|
d44903ca4e
|
Merge "Issue #2861 added synchronized blocks where necessary" into development
Former-commit-id: 4d5914d411 [formerly d0fd1154d4] [formerly 54d015cb4f] [formerly 54d015cb4f [formerly 59dcb3a97d]] [formerly 4d5914d411 [formerly d0fd1154d4] [formerly 54d015cb4f] [formerly 54d015cb4f [formerly 59dcb3a97d]] [formerly 2eea0b9205 [formerly 54d015cb4f [formerly 59dcb3a97d] [formerly 2eea0b9205 [formerly e108aa41bb586593f50970da53109a82d2bb8452]]]]]
Former-commit-id: 2eea0b9205
Former-commit-id: 456124bf8d [formerly 12e353a3d6] [formerly 2def452e2c] [formerly 44dec1ebc3a0c6a9363290806315e2a8e1e5238a [formerly dbdb17eebbf238d2f134aa977e9bff14bc685964] [formerly 2def452e2c [formerly 17ee130b2a]]]
Former-commit-id: 9047c6c560287907681b9949619a13bce9efd701 [formerly 5c28c8136285e34a68583c52929831d84fd9bf5c] [formerly d7b438bccf [formerly f8e7bfa835]]
Former-commit-id: d7b438bccf
Former-commit-id: 222c9cce6d
|
2014-03-05 14:14:25 -06:00 |
|
Max Schenkelberg
|
ce2821a244
|
Issue #2861 added synchronized blocks where necessary
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: 34b98455b7 [formerly 1dad35e391] [formerly 83ac37724e] [formerly 83ac37724e [formerly 10bfa59aef]] [formerly 34b98455b7 [formerly 1dad35e391] [formerly 83ac37724e] [formerly 83ac37724e [formerly 10bfa59aef]] [formerly b5ed7ac361 [formerly 83ac37724e [formerly 10bfa59aef] [formerly b5ed7ac361 [formerly 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede]]]]]
Former-commit-id: b5ed7ac361
Former-commit-id: d6a4c419f0 [formerly 035d96ce04] [formerly a8b436c867] [formerly 6038fc6af294bbadb25a59c8ab158fd6f13a0701 [formerly 71e348fc3ebb000927a4b5fcacb3a3ed1a3931df] [formerly a8b436c867 [formerly 0fbc2df17d]]]
Former-commit-id: 5aa52b0ae04f9b08bb30228b3c28cf994d3dff18 [formerly 8592b8675d7935c017f6b4c0dadcc51fc7542fa0] [formerly 7f9bea7552 [formerly 9b26076206]]
Former-commit-id: 7f9bea7552
Former-commit-id: d26bd1b3d6
|
2014-03-05 13:51:06 -06:00 |
|
Mike Duff
|
10c6d8d02f
|
Issue #2632 - Fix problem with multiple notifiers per user.
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 08ce74faf2 [formerly a670398424] [formerly 14107f0914] [formerly 14107f0914 [formerly 8c693a5f70]] [formerly 08ce74faf2 [formerly a670398424] [formerly 14107f0914] [formerly 14107f0914 [formerly 8c693a5f70]] [formerly 9963324b60 [formerly 14107f0914 [formerly 8c693a5f70] [formerly 9963324b60 [formerly 168a656194aa3b455f403aa92b290bbbe17d3b45]]]]]
Former-commit-id: 9963324b60
Former-commit-id: 6df1846790 [formerly 1c0d844dc2] [formerly 198d9e6780] [formerly 51e1a9d4e75b3295e4f1d7d96830580febef585d [formerly fd61ded4da051608ff2b758971fbc5bacbaca791] [formerly 198d9e6780 [formerly 3bdf20dea3]]]
Former-commit-id: b6812745bea24d145412927cfd6a09b5fb8bea99 [formerly fad3c8f0caa37c2db8f82dd2e72cb5514148ddc8] [formerly c6e743bbc1 [formerly 85ac8c85e0]]
Former-commit-id: c6e743bbc1
Former-commit-id: fd2f53f5cf
|
2014-03-05 12:02:33 -06:00 |
|
Nate Jensen
|
3d8a39b892
|
Merge "Issue #2843 Harden recycle." into development
Former-commit-id: c9855b5e4c [formerly c65bb2a011] [formerly 09311b8270] [formerly 09311b8270 [formerly 7a2a489c77]] [formerly c9855b5e4c [formerly c65bb2a011] [formerly 09311b8270] [formerly 09311b8270 [formerly 7a2a489c77]] [formerly 308ab7c314 [formerly 09311b8270 [formerly 7a2a489c77] [formerly 308ab7c314 [formerly c36359b0aaa1540f6d941e9445b41ed929a91e14]]]]]
Former-commit-id: 308ab7c314
Former-commit-id: 26adad4aba [formerly b6d570e336] [formerly d07da4c425] [formerly 811378d1cbd674950fccc5f6132a118b5339f8b1 [formerly 60f7401ff670afef592b5d2107984da7668e6b19] [formerly d07da4c425 [formerly d82a7d3640]]]
Former-commit-id: 0e08cf081a2f5e55bdb40042d24ffcfad6a739aa [formerly 747d4abf8bb0abb04dd0861ac5346dbfb232b880] [formerly e97545fd54 [formerly d4305f1578]]
Former-commit-id: e97545fd54
Former-commit-id: 4d29d2ee80
|
2014-03-05 11:41:05 -06:00 |
|
Ben Steffensmeier
|
d1452322e9
|
Issue #2843 Harden recycle.
Former-commit-id: 3c8625ba40 [formerly 291d5f55df] [formerly 22adc336df] [formerly 22adc336df [formerly 26c1a8e494]] [formerly 3c8625ba40 [formerly 291d5f55df] [formerly 22adc336df] [formerly 22adc336df [formerly 26c1a8e494]] [formerly 3cd6b29e75 [formerly 22adc336df [formerly 26c1a8e494] [formerly 3cd6b29e75 [formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]]]]
Former-commit-id: 3cd6b29e75
Former-commit-id: 606e549b35 [formerly be60a9564d] [formerly ed0ec90407] [formerly 06c2af7244c0852f56cf6ac9f32e099cf6ffac24 [formerly 202049adf2dd36c8c9f4cee72fdf77a6f408f169] [formerly ed0ec90407 [formerly af1bdf1b53]]]
Former-commit-id: b2dc145a9c4b1be77252c982b784cc32c4510373 [formerly 8c49c3bbe4c3c8e4454bff4e5d906233823d63d5] [formerly 4b966138f6 [formerly 2c687a4064]]
Former-commit-id: fa14d919da893f10d917cbfb5dbb9fb4f861641d [formerly 4b966138f6]
Former-commit-id: 424d4da21f
|
2014-03-05 11:16:12 -06:00 |
|
Brian Clements
|
ce7ad25fc2
|
Issue #2837 collaboration icon changes
changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group
Former-commit-id: dbb0076f53 [formerly 17661200a1] [formerly d76dd2a8f6] [formerly d76dd2a8f6 [formerly c0e4615967]] [formerly dbb0076f53 [formerly 17661200a1] [formerly d76dd2a8f6] [formerly d76dd2a8f6 [formerly c0e4615967]] [formerly c9906cde88 [formerly d76dd2a8f6 [formerly c0e4615967] [formerly c9906cde88 [formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]]]]
Former-commit-id: c9906cde88
Former-commit-id: 328e5fe74f [formerly f4a6d2a30d] [formerly 3d4323b447] [formerly 67bd24d7f9d56eb79363e39291cebcf9c660c3cc [formerly 1d8422aecbe75d313717ff186a0a87becafd9906] [formerly 3d4323b447 [formerly d06182573e]]]
Former-commit-id: e22002ffe520e3ec29f15d3c6d8820ca115f6032 [formerly eca406e298a4b6e7098a2a7b0f34a68bbede8557] [formerly 6dc478d975 [formerly dec443b1af]]
Former-commit-id: 6dc478d975
Former-commit-id: e75dde54ab
|
2014-03-05 09:00:57 -06:00 |
|
Lee Venable
|
47976f80f9
|
Issue #2833 - fixed a widget disposed error.
Former-commit-id: 0af9cf1a89 [formerly 3c85140ba0] [formerly f38afb0976] [formerly f38afb0976 [formerly e71dad9c80]] [formerly 0af9cf1a89 [formerly 3c85140ba0] [formerly f38afb0976] [formerly f38afb0976 [formerly e71dad9c80]] [formerly 980e21ca5a [formerly f38afb0976 [formerly e71dad9c80] [formerly 980e21ca5a [formerly eb3cf0ade9203766a437512b85e55f32108db1e3]]]]]
Former-commit-id: 980e21ca5a
Former-commit-id: 3282c01496 [formerly 8cd4bc1705] [formerly 3966bc355c] [formerly 9afe403f14a70fab79d319d1f13e08424023fde5 [formerly 992ef4747311d55c577dcc1e3ae1650fbf7416ad] [formerly 3966bc355c [formerly 98daa663b4]]]
Former-commit-id: 637dad91cd47b6a412cf6c223ade9570337e44b1 [formerly d18a297a33ea753e8022b130be13924780e330ac] [formerly 4b81954f16 [formerly 7e45b908af]]
Former-commit-id: 4b81954f16
Former-commit-id: fadccce7dc
|
2014-03-05 08:37:13 -06:00 |
|
Nate Jensen
|
54fd4e3f38
|
Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
Former-commit-id: b9d04a34b6 [formerly 6b4d16b750] [formerly 8ebe236ce9] [formerly 8ebe236ce9 [formerly 67fa21cfd9]] [formerly b9d04a34b6 [formerly 6b4d16b750] [formerly 8ebe236ce9] [formerly 8ebe236ce9 [formerly 67fa21cfd9]] [formerly faf3dbb670 [formerly 8ebe236ce9 [formerly 67fa21cfd9] [formerly faf3dbb670 [formerly 27ce4812affb11b506a21b5cf54c4b74b8c49031]]]]]
Former-commit-id: faf3dbb670
Former-commit-id: e96f0880de [formerly 12f218292c] [formerly 0b827a343b] [formerly ff0b45ff305671505782d211ae335f19cf0cdba4 [formerly b1b15434c34d3a515d2e371f1abe646a64b39293] [formerly 0b827a343b [formerly ddf96ad45b]]]
Former-commit-id: 9d21542f90c18edd112f3eae0539f2a968c37e5b [formerly d8ea0cb6bbb64296de147485da1e59278c68db60] [formerly 6d836f5d82 [formerly c427ff8471]]
Former-commit-id: b3684eab6bb190e77d9c4720f0f1e941149baffb [formerly 6d836f5d82]
Former-commit-id: 2a3734d8f1
|
2014-03-04 13:59:01 -06:00 |
|
Nate Jensen
|
85caa9c1e4
|
Issue #2832 fix watches and warnings in collaboration displays
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f
Former-commit-id: ceaa1d11a9 [formerly 41d80f6fce] [formerly 559b1794af] [formerly 559b1794af [formerly e3d211c8d7]] [formerly ceaa1d11a9 [formerly 41d80f6fce] [formerly 559b1794af] [formerly 559b1794af [formerly e3d211c8d7]] [formerly 3c3e483d18 [formerly 559b1794af [formerly e3d211c8d7] [formerly 3c3e483d18 [formerly bb84ca01bb74bc93710ba92fcbdb13b30dc2454e]]]]]
Former-commit-id: 3c3e483d18
Former-commit-id: 8577c479eb [formerly 0094132846] [formerly e08b21fc40] [formerly 24afda98abb7e885284fc7c6f03a3ece4e326476 [formerly f48033e99ccba349f23f107d1871ca7961b89c90] [formerly e08b21fc40 [formerly 4c0df85caf]]]
Former-commit-id: fa4bcee164705b2d295add2cc5cddd72ad859017 [formerly 1eb150c96f1ae70e476c5e05424388ca1a5e9caa] [formerly fb903ade0b [formerly 21d3110c28]]
Former-commit-id: fb903ade0b
Former-commit-id: 1152408b08
|
2014-03-04 13:18:16 -06:00 |
|
Richard Peter
|
64dc4fe0e7
|
Merge "Issue #2791 Use Data Source for all grid data access." into development
Former-commit-id: 2bf2effb8d [formerly 83b99aad5c] [formerly 090829f75e] [formerly 090829f75e [formerly f87a913017]] [formerly 2bf2effb8d [formerly 83b99aad5c] [formerly 090829f75e] [formerly 090829f75e [formerly f87a913017]] [formerly 873fa00fac [formerly 090829f75e [formerly f87a913017] [formerly 873fa00fac [formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]]]
Former-commit-id: 873fa00fac
Former-commit-id: 1cb5af89b4 [formerly 7e096adc4a] [formerly 3a96d0758a] [formerly 7e3772e9e820b32e78978762725b7470efdbe8a0 [formerly 31ea5b7bbf5848e0ada30ca517c3c6b17e7d4154] [formerly 3a96d0758a [formerly 2a5b0fb3ba]]]
Former-commit-id: 439fb1e8e09aef2b3cdad5d294745fa0c0f0edae [formerly 20555b967806297585643060463c34a49a7adbb0] [formerly 13bad4e99e [formerly dfa3f06e8e]]
Former-commit-id: 13bad4e99e
Former-commit-id: 9bacf68628
|
2014-03-04 12:43:17 -06:00 |
|
Nate Jensen
|
bad57cfca6
|
Merge "Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done." into development
Former-commit-id: fd6af404be [formerly b0e727938b] [formerly 75611f0631] [formerly 75611f0631 [formerly f50a2789dd]] [formerly fd6af404be [formerly b0e727938b] [formerly 75611f0631] [formerly 75611f0631 [formerly f50a2789dd]] [formerly 7ac7dd5f01 [formerly 75611f0631 [formerly f50a2789dd] [formerly 7ac7dd5f01 [formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]]]]
Former-commit-id: 7ac7dd5f01
Former-commit-id: adaf73d534 [formerly b3a4e1d562] [formerly 44e9b34927] [formerly 0d1df41c3f6ba54d0fa021f0851c0cc93deb8bab [formerly 9ffb218b0f72703775dd6d2766c567fee092b78a] [formerly 44e9b34927 [formerly a2b3bc717e]]]
Former-commit-id: ad6122b8b4e32365c70ea2a2930ded861146a4df [formerly 87a0bdce28aac08b5040af41b1ac94bb28c275ad] [formerly 1d27417675 [formerly cb9d2a3298]]
Former-commit-id: 31c12c7724e0ac1b0867bdd8ddd2e8d353a17a0d [formerly 1d27417675]
Former-commit-id: af047be03c
|
2014-03-04 10:55:05 -06:00 |
|
Brian.Dyke
|
7b100b9376
|
OB_14.1.1-21 baseline
Former-commit-id: 899aef9036 [formerly 5179a4f970] [formerly 271ec85c0c] [formerly 271ec85c0c [formerly 1d92e5bab6]] [formerly 899aef9036 [formerly 5179a4f970] [formerly 271ec85c0c] [formerly 271ec85c0c [formerly 1d92e5bab6]] [formerly 29681c7ca4 [formerly 271ec85c0c [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]]]
Former-commit-id: 29681c7ca4
Former-commit-id: b4501645a6 [formerly c1ef56e0d7] [formerly c68649b4f9] [formerly a7388b6f6e1d17112305a43b7d7de0a197a9c73a [formerly 146eb0a75db603df40a613354b8cbc0908ec3abb] [formerly c68649b4f9 [formerly 7cad374af5]]]
Former-commit-id: 693683efa2f274e24c22da06268ff677cca46f28 [formerly db6e513aaa9a15a7b11a5aee1b3716c9a5587928] [formerly ea56516bf5 [formerly 079cc93f89]]
Former-commit-id: ea56516bf5
Former-commit-id: c8111a7ebb
|
2014-03-04 11:47:42 -05:00 |
|
Max Schenkelberg
|
e75f1c3dbb
|
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: 75d19d6be6 [formerly dbc6cc3fc6] [formerly 59434c8a60] [formerly 59434c8a60 [formerly a01a6d68d0]] [formerly 75d19d6be6 [formerly dbc6cc3fc6] [formerly 59434c8a60] [formerly 59434c8a60 [formerly a01a6d68d0]] [formerly cbf8b9249c [formerly 59434c8a60 [formerly a01a6d68d0] [formerly cbf8b9249c [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: cef1660684 [formerly d85fd52c26] [formerly 39e1c4fa46] [formerly 98b658ee3024e50c70a3a9e734120a03e368a302 [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2] [formerly 39e1c4fa46 [formerly 654da3c0a2]]]
Former-commit-id: 0af58fe5c63d46e47391570eeddad5b3cae58623 [formerly 22a289abbef9ce66bd6d9f68b9610a2b65dc9258] [formerly c6cf08db73 [formerly f509321134]]
Former-commit-id: 9eadbcf5b459cbf8e5d87871218bd1a78327a18f [formerly c6cf08db73]
Former-commit-id: 7c66cf792b
|
2014-03-04 09:23:36 -06:00 |
|
Max Schenkelberg
|
3f97b77096
|
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 70fec6a068 [formerly 4bcdc9f85b] [formerly 6edfb8965f] [formerly 6edfb8965f [formerly dbcbd1b560]] [formerly 70fec6a068 [formerly 4bcdc9f85b] [formerly 6edfb8965f] [formerly 6edfb8965f [formerly dbcbd1b560]] [formerly 1854bbb477 [formerly 6edfb8965f [formerly dbcbd1b560] [formerly 1854bbb477 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]]]
Former-commit-id: 1854bbb477
Former-commit-id: 19d25e1f8c [formerly c37910a689] [formerly bff80c3ee9] [formerly 8560eb0aef67c72443f4df3086c608f06a5633e2 [formerly 64e66813ccc56d3b7a703a331fd119c8cbcceb08] [formerly bff80c3ee9 [formerly 6658c94e6e]]]
Former-commit-id: 700d3caaa366fc60355ca674c37b2af27364f8fd [formerly ac56a95b831199d75f4f7799c88a6cd9f119118f] [formerly 83103254e7 [formerly 96bdc00728]]
Former-commit-id: 83103254e7
Former-commit-id: bee18f29d0
|
2014-03-03 17:59:48 -06:00 |
|
Nate Jensen
|
c8776f170c
|
Issue #2792 enforce getDensity() will not return above max
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1
Former-commit-id: e7e9623378 [formerly 0044c21ad5] [formerly 7f31e34dc9] [formerly 7f31e34dc9 [formerly 384b531d26]] [formerly e7e9623378 [formerly 0044c21ad5] [formerly 7f31e34dc9] [formerly 7f31e34dc9 [formerly 384b531d26]] [formerly 22153d43bb [formerly 7f31e34dc9 [formerly 384b531d26] [formerly 22153d43bb [formerly a502a64219e869401b1bff82fbb73e67565a6dae]]]]]
Former-commit-id: 22153d43bb
Former-commit-id: f36f1fa5c0 [formerly 47deb8f80c] [formerly e40fbf0ba0] [formerly 13aaf24790b6a18b09d437a84d20f5a7e9fee3dc [formerly 8163999a8004a10d68d6b96b3ec92494a440eed2] [formerly e40fbf0ba0 [formerly 58c9dc0c69]]]
Former-commit-id: 3d0b37bea657e81214e3c6ba7ef760115c4e7ba1 [formerly c5c84333b34bdec81881012dcde557968d4e96f1] [formerly 224fd09dab [formerly 6f488f855f]]
Former-commit-id: 224fd09dab
Former-commit-id: 662883bd88
|
2014-03-03 14:44:16 -06:00 |
|
Brian Clements
|
07396698f6
|
Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed
Former-commit-id: 60dc43daea [formerly dedd9e80ed] [formerly 5d21675a91] [formerly 5d21675a91 [formerly 91936beadf]] [formerly 60dc43daea [formerly dedd9e80ed] [formerly 5d21675a91] [formerly 5d21675a91 [formerly 91936beadf]] [formerly 7a7d476899 [formerly 5d21675a91 [formerly 91936beadf] [formerly 7a7d476899 [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]]]
Former-commit-id: 7a7d476899
Former-commit-id: 5ad8c94f37 [formerly 472d08d2ad] [formerly bf4c119278] [formerly 45f33a2bdb2b4b91c2d6a33264e9513dc71a5eb6 [formerly dbc2261d04afbbeaa80308981a4752188bec6977] [formerly bf4c119278 [formerly 724bafd44f]]]
Former-commit-id: 507a2f893a48b4c8977cd16ffd5b686ba2a97a7c [formerly fcbaab390c314bd0db75b372cf855bd45a12a942] [formerly 44fdea985e [formerly dc8667011b]]
Former-commit-id: 973eec04b49d63787908a0beca2b9e40d52f0ca8 [formerly 44fdea985e]
Former-commit-id: dbb33ceac2
|
2014-03-03 13:17:05 -06:00 |
|