Commit graph

2081 commits

Author SHA1 Message Date
Ben Steffensmeier
b487a896ae Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b

Former-commit-id: f505cda0bf [formerly b0870c55f6] [formerly 86b9a4d8c2] [formerly f505cda0bf [formerly b0870c55f6] [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly 86b9a4d8c2 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]]]
Former-commit-id: 9263ff1846
Former-commit-id: 9eb0c3e778 [formerly 8f4c2f2a39] [formerly 33c36155057aba55daf29a51f9519c3aef6b6940 [formerly 5a149c5dfa]]
Former-commit-id: 7b6491f72252fd10fa2101e74284719b65bbafb3 [formerly 77aef5f955]
Former-commit-id: c28a151884
2013-03-01 11:03:11 -06:00
Richard Peter
c18dde6d25 Merge "Issue #1744 actually fix deadlock this time" into omaha_13.3.1
Former-commit-id: 7408f18a45 [formerly f2ae906f93] [formerly 1754861897] [formerly 7408f18a45 [formerly f2ae906f93] [formerly 1754861897] [formerly c50e1cbe1c [formerly 1754861897 [formerly 7eafcb1e677fafadc039a5106f296dbee1245136]]]]
Former-commit-id: c50e1cbe1c
Former-commit-id: c7512064ee [formerly db5e8ed2dd] [formerly 206eb340e21d31137af07955d7ab127460d1b09b [formerly 6fd7af5362]]
Former-commit-id: d1c394304d3868de39f5212e82823b7896f217d2 [formerly a221c92731]
Former-commit-id: 9acad5a1a4
2013-03-01 10:50:33 -06:00
Nate Jensen
62e364213a Issue #1744 actually fix deadlock this time
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb

Former-commit-id: eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 8c84bc5fbb [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]]
Former-commit-id: 35007e0460
Former-commit-id: 49fc025594 [formerly 348f5f0f41] [formerly 713be7a0d247874d2807d3b5c3e1411449c3821e [formerly 33da766f63]]
Former-commit-id: 5b126ce31b7b2161f0bb83ad5035f926557f9ab1 [formerly eec5f87ab2]
Former-commit-id: 312e2e07ae
2013-03-01 10:48:03 -06:00
Richard Peter
33902e6780 Merge "Issue #1744 fix deadlock" into omaha_13.3.1
Former-commit-id: 75f91d596e [formerly ee1b0df106] [formerly 79c70dacbd] [formerly 75f91d596e [formerly ee1b0df106] [formerly 79c70dacbd] [formerly 7dcc007bee [formerly 79c70dacbd [formerly 6fbc789e08a5e6baf7ae6ff1348e1e2c5709c422]]]]
Former-commit-id: 7dcc007bee
Former-commit-id: 734f73d098 [formerly 73ea950d5f] [formerly 8253051531739d9db42149129c7464b598dc4b06 [formerly 3a8a2f5815]]
Former-commit-id: b1a061cbcd5b6041944f70c38515ff25206f20de [formerly 5a05a66757]
Former-commit-id: a34559065c
2013-03-01 10:27:36 -06:00
Nate Jensen
8a54597c1f Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
Former-commit-id: 4f9f0c29d2 [formerly 308de6885f] [formerly d695473b0f] [formerly 4f9f0c29d2 [formerly 308de6885f] [formerly d695473b0f] [formerly 302e851b67 [formerly d695473b0f [formerly 94e54241b7e85c523e019603cd9e815c179dc584]]]]
Former-commit-id: 302e851b67
Former-commit-id: 219bb543e9 [formerly a7cc38e3ba] [formerly 17d1c2aa06f8d4b7fa0a6d445508dd75428bbcf4 [formerly 0d0dfb474f]]
Former-commit-id: a12306c2784585b697737108a31eab10f86b3118 [formerly d03d447447]
Former-commit-id: 65ae433077
2013-03-01 10:15:46 -06:00
Nate Jensen
9654c80906 Issue #1744 fix deadlock
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f

Former-commit-id: 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 2a575a24e7 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]]
Former-commit-id: f4cccabc07
Former-commit-id: 91d577f4db [formerly c5600acf79] [formerly cea33e5e9d7f091f9ec47d746199097bf2783899 [formerly f7ffa22c7c]]
Former-commit-id: 60ba73c04c032b29fe9de5d4eedf3cbfefe3e10c [formerly c990477402]
Former-commit-id: 46ceab84c1
2013-03-01 10:12:56 -06:00
Ben Steffensmeier
bf50f7f871 Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
Former-commit-id: 1a87c84975 [formerly 74296b32db] [formerly df38a21e11] [formerly 1a87c84975 [formerly 74296b32db] [formerly df38a21e11] [formerly aaffde9bf5 [formerly df38a21e11 [formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]]]]
Former-commit-id: aaffde9bf5
Former-commit-id: a8f39fdca4 [formerly f49b8cec68] [formerly f9563e7cebad54220caad3834f5ca36d692dea86 [formerly 453723dc9d]]
Former-commit-id: 7e73c8169da1cde0a25dd8810a1036a321b1213d [formerly dbb965cf9d]
Former-commit-id: 12ce3faeb1
2013-02-28 14:04:53 -06:00
Ben Steffensmeier
a295c7abde Issue #1731 Remove unneccessary query in getDataStore.
Former-commit-id: f7148f5a98 [formerly 61875750c1] [formerly 52a64eda01] [formerly f7148f5a98 [formerly 61875750c1] [formerly 52a64eda01] [formerly 38728f3073 [formerly 52a64eda01 [formerly e78a920afcf25b94d5ea473f96d548ce227ea435]]]]
Former-commit-id: 38728f3073
Former-commit-id: 49d61bd471 [formerly 4bdd2946ee] [formerly 6bdf9d288a06719bf4062080d72ce5ced97ff2a3 [formerly 586438b393]]
Former-commit-id: 2f7ffd4a4eb0faed771ab38c9834ada70ff47c1b [formerly 303c30040d]
Former-commit-id: bec51951ec
2013-02-28 13:59:02 -06:00
Richard Peter
11cee91c75 Merge "Issue #1597 Moved some interpolation messages to Performance Log for consistency." into omaha_13.3.1
Former-commit-id: a1fac92d05 [formerly 2950dc9c42] [formerly 1ce1fb213b] [formerly a1fac92d05 [formerly 2950dc9c42] [formerly 1ce1fb213b] [formerly a9ffc8b170 [formerly 1ce1fb213b [formerly f4e326c44178ab01b6c5a7c4514dbdd5c9e00cba]]]]
Former-commit-id: a9ffc8b170
Former-commit-id: bbb5a8645a [formerly 7adde5c3aa] [formerly 8dc79a2423c207ef96e5603edea8afe8a585ccd7 [formerly c0e0a44e5f]]
Former-commit-id: 6b16d5b6e61e83c66d3031d20530a687254cb1f5 [formerly 93494fcea0]
Former-commit-id: 014bf4250b
2013-02-27 16:16:09 -06:00
Richard Peter
01f1a377d6 Merge "Issue #1659 Add time agnostic caching to grid derived parameters Change-Id: I59db267004a7acd51642c4360404e96d50378480" into omaha_13.3.1
Former-commit-id: 47021a729d [formerly 7c1c44c22f] [formerly 6535c1b6c7] [formerly 47021a729d [formerly 7c1c44c22f] [formerly 6535c1b6c7] [formerly 656d9d74ae [formerly 6535c1b6c7 [formerly ac6f072dbb19afe6dd76bfd368167ea60c2c8d00]]]]
Former-commit-id: 656d9d74ae
Former-commit-id: cd794fef64 [formerly b3c0f56954] [formerly dd6610474414ec15f44a01e78340010a011fcac5 [formerly ba4a86de16]]
Former-commit-id: 925ac079efe64ab366bf76d4ad0603aff8fd786a [formerly 706ec91548]
Former-commit-id: 7585176f50
2013-02-27 14:46:49 -06:00
Ron Anderson
ed91cb0e1b Issue #1597 Moved some interpolation messages to Performance Log for consistency.
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8

Former-commit-id: bbf1f71873 [formerly f491d7f7c3] [formerly c9ca7a2943] [formerly bbf1f71873 [formerly f491d7f7c3] [formerly c9ca7a2943] [formerly 079cdbcb29 [formerly c9ca7a2943 [formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]]]]
Former-commit-id: 079cdbcb29
Former-commit-id: ed6ca5734d [formerly b2bffcf0de] [formerly 846298e466d8aeb3c8339bc3ed51526767ad3154 [formerly a5195e137e]]
Former-commit-id: bbad242d1081f1ae3371db5d5858d0f14384b3cf [formerly ad73782c8b]
Former-commit-id: 6322f61325
2013-02-27 14:45:30 -06:00
Bryan Kowal
cebfff6ed4 Issue #1662 - wrapper parameters can now be used to specify the order
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters

Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c

Former-commit-id: 1b65ae1967 [formerly 5b3478d6c7] [formerly 8bf5e3ffad] [formerly 1b65ae1967 [formerly 5b3478d6c7] [formerly 8bf5e3ffad] [formerly 44349717fb [formerly 8bf5e3ffad [formerly aae64b29491d8da0001cf1182a357683546d4593]]]]
Former-commit-id: 44349717fb
Former-commit-id: 5231011f8c [formerly 65fb00c3c3] [formerly f8cc7d08a49eb461437d41b449d73fc597f0f504 [formerly 4f7fed259c]]
Former-commit-id: 068a050daac80aaedf080f8ee26023ab9c3b91e8 [formerly dc46b8eeb1]
Former-commit-id: 8210c0d984
2013-02-27 12:46:48 -06:00
Ben Steffensmeier
4b93a85eac Issue #1659 Add time agnostic caching to grid derived parameters
Change-Id: I59db267004a7acd51642c4360404e96d50378480

Former-commit-id: 80ad26ea4a [formerly ebfedad360] [formerly db1028ee7a] [formerly 80ad26ea4a [formerly ebfedad360] [formerly db1028ee7a] [formerly 6d85856e60 [formerly db1028ee7a [formerly 9685d0b363f21afbb42df02e9871884123d75e2c]]]]
Former-commit-id: 6d85856e60
Former-commit-id: 8ca9ae2462 [formerly 0b2373ab4d] [formerly 6743106851e0b13bd181170f2dd98ba1304bea6d [formerly 8112f669b3]]
Former-commit-id: 40217d2977f00191cb82fb1e15630f722be2d1c5 [formerly bbf4ced67d]
Former-commit-id: 3a3f083a15
2013-02-27 12:37:14 -06:00
Ron Anderson
4a092dd292 Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27

Former-commit-id: 36268bb1e2 [formerly 50f5e44b39] [formerly 36be1c5850] [formerly 36268bb1e2 [formerly 50f5e44b39] [formerly 36be1c5850] [formerly c35e06d82c [formerly 36be1c5850 [formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]]]]
Former-commit-id: c35e06d82c
Former-commit-id: 48d3f2e700 [formerly e240568bb9] [formerly ec9f49b951e85cf9798a915887bf38d1be6b9eaf [formerly 5bd0dbcfca]]
Former-commit-id: 056fe94ad0e69095fc6dfe05911d95f00859fd76 [formerly d75331a5c9]
Former-commit-id: cb2ec02843
2013-02-27 12:34:40 -06:00
Ron Anderson
3fced7c523 Issue #1708 Fix redundant excution of evaluateQuery.
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a

Former-commit-id: db805e2097 [formerly 2212f333a3] [formerly a5a273c1c2] [formerly db805e2097 [formerly 2212f333a3] [formerly a5a273c1c2] [formerly 274ce762d8 [formerly a5a273c1c2 [formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]]]]
Former-commit-id: 274ce762d8
Former-commit-id: e362632eca [formerly 93382aeed8] [formerly b2dd338df0ca4db81b2171b950912c2d66219f23 [formerly 84bd642290]]
Former-commit-id: 12cf79beef90156f4bcff318c969c5db91c154b9 [formerly 36f44524d0]
Former-commit-id: 48abd41c6e
2013-02-26 19:00:56 -06:00
Ron Anderson
690755510b Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: 547f0d086f [formerly d43afc8c67] [formerly bfe3c684df] [formerly 547f0d086f [formerly d43afc8c67] [formerly bfe3c684df] [formerly f37999b1eb [formerly bfe3c684df [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]]
Former-commit-id: f37999b1eb
Former-commit-id: dc8d1dd95c [formerly 541557e0b0] [formerly bf9a2b39ec50125619129c86673eb152b84b87e6 [formerly 77fbbb6a61]]
Former-commit-id: 431ce16b88c5fefb7469a176b83f3aee74719be9 [formerly 92abcad349]
Former-commit-id: 59c7ee5120
2013-02-26 18:44:51 -06:00
Nate Jensen
3e4c9990c0 Merge "Issue #1642: Fix QPID Deadlock scenario - Address peer review comments" into development
Former-commit-id: 0cd78444b8 [formerly a020438c99] [formerly 58957d30e5] [formerly 0cd78444b8 [formerly a020438c99] [formerly 58957d30e5] [formerly 24c94ef55b [formerly 58957d30e5 [formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]]]
Former-commit-id: 24c94ef55b
Former-commit-id: ec7eecbb4f [formerly 652ac25d12] [formerly e65c9fe57e543cc92e2c686a843d870e73f0bdb8 [formerly b6fc51a18c]]
Former-commit-id: d60ecc846ff540e5dba00c4076dffbcedfcb8109 [formerly 841ddd8509]
Former-commit-id: 0ac9146923
2013-02-26 18:00:50 -06:00
Richard Peter
787b2e3afd Issue #1642: Fix QPID Deadlock scenario
- Address peer review comments

Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462

Former-commit-id: 3e5ab03ecf [formerly 7d4206420c] [formerly 9a0177861f] [formerly 3e5ab03ecf [formerly 7d4206420c] [formerly 9a0177861f] [formerly 5b2650599d [formerly 9a0177861f [formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]]]
Former-commit-id: 5b2650599d
Former-commit-id: 0b51936566 [formerly ea806139d3] [formerly 34da74ced85f0f692350cc266348ad7532e0abff [formerly 4deaf372a1]]
Former-commit-id: a69b7f2df6d702e8f84d343464a46a7e090af1c1 [formerly e964d248fe]
Former-commit-id: 294914b403
2013-02-26 16:01:25 -06:00
Dustin Johnson
b24c3f23c7 Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7

Former-commit-id: 1d9690f299 [formerly 8038b840d8] [formerly 7852f88352] [formerly 1d9690f299 [formerly 8038b840d8] [formerly 7852f88352] [formerly 88a9b953b6 [formerly 7852f88352 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]]
Former-commit-id: 88a9b953b6
Former-commit-id: c23b8a58c3 [formerly 94300e0c1d] [formerly 188d47a162860963a3b8ee6af04bd72c07f6168a [formerly cc0254ba03]]
Former-commit-id: 9b2a38cdff53a695ca327ed0c3edd1084fed67fd [formerly 2d6df74b67]
Former-commit-id: 6bb570ce5c
2013-02-26 15:06:04 -06:00
Lee Venable
98c4ed63c8 Merge "Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down" into development
Former-commit-id: 41820c3632 [formerly a4b41e0309] [formerly 9cf3ca07b7] [formerly 41820c3632 [formerly a4b41e0309] [formerly 9cf3ca07b7] [formerly 46ff81108a [formerly 9cf3ca07b7 [formerly 26fa358838588643c003287d8125e58949c3648f]]]]
Former-commit-id: 46ff81108a
Former-commit-id: 923e4b413e [formerly 4212af7e8a] [formerly eb05278da104f386aa87461ec56cd8a9b2591419 [formerly cb7fd87715]]
Former-commit-id: 588077b0012241687ac59191ef10be6096ab9d8d [formerly 7b9ed39534]
Former-commit-id: 1dff036c6a
2013-02-26 14:11:35 -06:00
Mike Duff
51c7035fcb Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down
Change-Id: I92016564da48f7f736bebf58fdc0afca5cc1d9ff

Former-commit-id: dda044a519 [formerly fdd5e903c6] [formerly b48e70fff4] [formerly dda044a519 [formerly fdd5e903c6] [formerly b48e70fff4] [formerly c77602652e [formerly b48e70fff4 [formerly 1d9c456b697a79f6093550a26cb3d2d4f972548d]]]]
Former-commit-id: c77602652e
Former-commit-id: 9af05ad9b2 [formerly 882c46dd85] [formerly 1f9618136922328b8ba3926387a2723b1af8659d [formerly 3071eb8456]]
Former-commit-id: b2a360f9ea588190ce0918bae269bfbbbead8c8b [formerly bb240a10db]
Former-commit-id: a62b8b824e
2013-02-26 14:03:55 -06:00
Nate Jensen
02b44369f4 Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
Former-commit-id: eb2e9f64f4 [formerly 15c4c4dfa0] [formerly b062299796] [formerly eb2e9f64f4 [formerly 15c4c4dfa0] [formerly b062299796] [formerly 36d4eff2c6 [formerly b062299796 [formerly 03591924b4efdc13f1cc01182d39e280309cf381]]]]
Former-commit-id: 36d4eff2c6
Former-commit-id: 5853f48992 [formerly b173d34ba9] [formerly 6b86c197517307ff2a80b25f90eb928605a06ecd [formerly 5c33098315]]
Former-commit-id: 3e677462839f8afaa67be1cf2099dee3fdc6466c [formerly c06d4abcee]
Former-commit-id: 360b33b854
2013-02-26 13:53:40 -06:00
Nate Jensen
ff0c1963f9 Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development
Former-commit-id: 5ecc23350c [formerly f5ebeb1330] [formerly 1e50b3a0e8] [formerly 5ecc23350c [formerly f5ebeb1330] [formerly 1e50b3a0e8] [formerly 4e60fa682d [formerly 1e50b3a0e8 [formerly 698d1d88b5c67498046dcec558361797a01b07f5]]]]
Former-commit-id: 4e60fa682d
Former-commit-id: a336b044bb [formerly 2b81ce6028] [formerly 23d5874d2070097f18269874ad648fd0961e9e33 [formerly e1660e51f8]]
Former-commit-id: a70261b5179407f5aea2250a4c6e0e12b4f50b37 [formerly eced16c428]
Former-commit-id: 66e2da8c31
2013-02-26 13:46:30 -06:00
Dustin Johnson
70e7a3dd5c Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development
Former-commit-id: 5f4301cb7f [formerly 074fb0aa64] [formerly 47cb278c01] [formerly 5f4301cb7f [formerly 074fb0aa64] [formerly 47cb278c01] [formerly d31392d740 [formerly 47cb278c01 [formerly bf86849d284696553ed4cbc3f347afe2f791968d]]]]
Former-commit-id: d31392d740
Former-commit-id: 78d88f4517 [formerly 8e4a990d1a] [formerly c8e8c462b09d5dae42fc85b112751c19ae6721cd [formerly a7d4b23597]]
Former-commit-id: 81ecfdf3da29ef7aa77bed8c4d373acbc6471796 [formerly abf85b6b0e]
Former-commit-id: 7b73dbc256
2013-02-26 13:41:46 -06:00
Dustin Johnson
2045797829 Merge "Issue #1643 Add NCF bandwidth manager router" into development
Former-commit-id: 256e2076a2 [formerly 50b412b34e] [formerly 42402c5d73] [formerly 256e2076a2 [formerly 50b412b34e] [formerly 42402c5d73] [formerly fb235e3f43 [formerly 42402c5d73 [formerly e2bb08df9a9aa2ac143e0f7fc82b911f72b4b87c]]]]
Former-commit-id: fb235e3f43
Former-commit-id: df02d5d97d [formerly 4153bdd79e] [formerly a78f2da83b324e23865f0b4f3aa9e968cc1e0fcc [formerly a648519673]]
Former-commit-id: a713e511181361e60701be8352ddabcb9feb50f9 [formerly 50e749e38e]
Former-commit-id: 8502d29497
2013-02-26 13:41:36 -06:00
Dustin Johnson
ab7224b7fb Merge "Issue #1588 - Fix match any/all in data browser dialog" into development
Former-commit-id: ab8506bab4 [formerly 3dd36d29cf] [formerly fb38cceecd] [formerly ab8506bab4 [formerly 3dd36d29cf] [formerly fb38cceecd] [formerly 76738dbf7d [formerly fb38cceecd [formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]]]]
Former-commit-id: 76738dbf7d
Former-commit-id: 6e3dfd6764 [formerly bb5f6cc568] [formerly b84a0916484c6fa68206e55b951062f4706a545c [formerly b77ebdc924]]
Former-commit-id: 9495e9569a8ae2df8bcdae36f4e5bd5025d90045 [formerly 77f811d090]
Former-commit-id: 7bc8125917
2013-02-26 13:37:14 -06:00
Matt Nash
ab25be3e1c Issue #1668 add gsd pattern to allow for their plugins to be deployed
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6

Former-commit-id: 9dc4390b7e [formerly 41bbd4cf2d] [formerly a2fb0db684] [formerly 9dc4390b7e [formerly 41bbd4cf2d] [formerly a2fb0db684] [formerly 051b36ad73 [formerly a2fb0db684 [formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]]]
Former-commit-id: 051b36ad73
Former-commit-id: 9ac60409d6 [formerly 32096feba8] [formerly ae09dddec53fb271e50dd90fd45b73f94ff690be [formerly b1fe380c44]]
Former-commit-id: f1dae5c4963ec5df64921535a8f7825033676c4f [formerly 1c51407ffd]
Former-commit-id: 2841c495af
2013-02-26 13:29:04 -06:00
Matt Nash
44c0b52257 Issue #1506 fix deadlock and edit areas showing up from query
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49

Former-commit-id: f18955a1ed [formerly 4be89bdd43] [formerly c728f72ea3] [formerly f18955a1ed [formerly 4be89bdd43] [formerly c728f72ea3] [formerly b749edca54 [formerly c728f72ea3 [formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]]]
Former-commit-id: b749edca54
Former-commit-id: ac795d4948 [formerly daea84a1e8] [formerly 7fd44919b46c967d986955013a9d92fff46bb8e8 [formerly 51e6302178]]
Former-commit-id: a7d670602ec66dc8e6db3280f49aba1590a4a6f2 [formerly 18ccbd7c5d]
Former-commit-id: feb05cfeda
2013-02-26 12:20:08 -06:00
Dustin Johnson
1399820264 Issue #1592 Don't submit adhoc query when X button clicked
Change-Id: I7a06857fa64a6d54279ec2dca1404062179fe279

Former-commit-id: 0ba5133583 [formerly 604a7c82b2] [formerly 598eb88a04] [formerly 0ba5133583 [formerly 604a7c82b2] [formerly 598eb88a04] [formerly c6975aa379 [formerly 598eb88a04 [formerly 9cb2114c239e6782961e8127fe85b10a7ee38f06]]]]
Former-commit-id: c6975aa379
Former-commit-id: c606b31379 [formerly 898d7500aa] [formerly 3f87c958340fba7c8c1875d78e5925e2eb83506a [formerly ab1dc2272b]]
Former-commit-id: d40795ffcec917dd94f28b556a39caa51d51b076 [formerly 21bd89a9fd]
Former-commit-id: 5ee13ae1b3
2013-02-26 12:07:36 -06:00
Dustin Johnson
1b880d1178 Issue #1643 Add NCF bandwidth manager router
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8

Former-commit-id: eaa295dddb [formerly ebf02481f0] [formerly d58d28c636] [formerly eaa295dddb [formerly ebf02481f0] [formerly d58d28c636] [formerly 722e41b8b0 [formerly d58d28c636 [formerly 2b52368c81272df18f3af1334057295d11bb4b52]]]]
Former-commit-id: 722e41b8b0
Former-commit-id: e6d447b00d [formerly 219e882fc5] [formerly 1fb58b752e38ec55f49ddf711fd9f47baf778025 [formerly cf86c92fad]]
Former-commit-id: 2e5f667d7ca6b4eeabba4faa28273511e86c137d [formerly b62631b9d1]
Former-commit-id: fa87f70100
2013-02-26 11:32:03 -06:00
Steve Harris
4507edb908 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 82d50b3eb6 [formerly 7ed1eacb6b] [formerly 9bcabe2c5d] [formerly 82d50b3eb6 [formerly 7ed1eacb6b] [formerly 9bcabe2c5d] [formerly 098b1e1579 [formerly 9bcabe2c5d [formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]]]
Former-commit-id: 098b1e1579
Former-commit-id: e48cc61522 [formerly 41e1594be7] [formerly becf9f6f60e4c46d8479291d783adafb70f1f495 [formerly 57440abebb]]
Former-commit-id: 675941344338017ce17f6d55f5adf59670efacf7 [formerly 3df38c0fc6]
Former-commit-id: 1e41b4a44a
2013-02-25 20:41:26 -06:00
Richard Peter
67e1890465 Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development
Former-commit-id: 2a69ad78b6 [formerly 2553955249] [formerly be9370576a] [formerly 2a69ad78b6 [formerly 2553955249] [formerly be9370576a] [formerly 1669945cdb [formerly be9370576a [formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]]]]
Former-commit-id: 1669945cdb
Former-commit-id: 6f6c1b22c4 [formerly 56771955b4] [formerly 8cf852aa069619e371c2c57b44205b3c23c5a9cc [formerly aa5f3c80a0]]
Former-commit-id: 765d14d0c4ba19c9cb20c0b64bea020265e74669 [formerly d1917a79a2]
Former-commit-id: 5618a65540
2013-02-25 17:47:14 -06:00
Richard Peter
9295231161 Merge "Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests." into development
Former-commit-id: 2e15dd3a75 [formerly af33dd1743] [formerly b98bdb3d81] [formerly 2e15dd3a75 [formerly af33dd1743] [formerly b98bdb3d81] [formerly 3b718bea52 [formerly b98bdb3d81 [formerly bedfb6a21680961421b42bcbcec470e41bb9523d]]]]
Former-commit-id: 3b718bea52
Former-commit-id: b5205f6b13 [formerly 25909b2ee1] [formerly 7ce74c902674348f2cef516514b2f29b684f8bc2 [formerly c21a1e9f61]]
Former-commit-id: 22690c8c79adae749fe865d0c69b19437758ec45 [formerly 731710f355]
Former-commit-id: 4fbbfc52c9
2013-02-25 17:46:26 -06:00
Lee Venable
8bb221f14a Merge "Issue #1625 Updated addOrRemoveCounty method." into development
Former-commit-id: 0be080c78b [formerly e54eb4ab55] [formerly e024e4e087] [formerly 0be080c78b [formerly e54eb4ab55] [formerly e024e4e087] [formerly 7f769af427 [formerly e024e4e087 [formerly cda14b7c5e6563a9165fa734f35766816bccccf1]]]]
Former-commit-id: 7f769af427
Former-commit-id: 7fb13648f0 [formerly 444a1f5d47] [formerly 0ab76cc18f600944e9a5f7f710dd240e73c4737f [formerly 0125935a7f]]
Former-commit-id: a3c27e8bf6b5d20994ee55c202c2c279aadd7cde [formerly 8af64a568d]
Former-commit-id: de7c07dcab
2013-02-25 17:25:56 -06:00
Jonathan Sanchez
c6800cbf49 Issue #1625 Updated addOrRemoveCounty method.
Former-commit-id: 4ee3a8d412 [formerly f59a08963c] [formerly cd6dd3c178] [formerly 4ee3a8d412 [formerly f59a08963c] [formerly cd6dd3c178] [formerly 8c2c7c97f7 [formerly cd6dd3c178 [formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]]]
Former-commit-id: 8c2c7c97f7
Former-commit-id: c62a02700a [formerly c861c71ae6] [formerly 98a2ef23744e01ccb963e6b3513b3786a6c91d5c [formerly d4f4832d1a]]
Former-commit-id: d0efdc1424c72f849de83750a953e3605ddf5aac [formerly b275cdf701]
Former-commit-id: f0a64fa33f
2013-02-25 17:15:09 -06:00
Ben Steffensmeier
4c8f62134c Issue #1659 Stop derived parameters from sending empty requests for cached times
Former-commit-id: ab23c25b35 [formerly ff232b87b4] [formerly 71652af086] [formerly ab23c25b35 [formerly ff232b87b4] [formerly 71652af086] [formerly 9edeadc966 [formerly 71652af086 [formerly 9605118022d378eb35c38d784729410d160d46df]]]]
Former-commit-id: 9edeadc966
Former-commit-id: b534254207 [formerly 9ec0008743] [formerly aa80a8187de2e4d543605366748b0f19a7a88e41 [formerly d6c59cb85a]]
Former-commit-id: 04c1b4bc338ecfedad186011077cf639448744e9 [formerly de75bbf5a7]
Former-commit-id: 677412cf10
2013-02-25 17:08:12 -06:00
Ben Steffensmeier
1b9c987907 Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests.
Former-commit-id: 92954639db [formerly f56b305581] [formerly fd2450c0df] [formerly 92954639db [formerly f56b305581] [formerly fd2450c0df] [formerly 2fa5fb488e [formerly fd2450c0df [formerly 4826ccdd4db42342f913cfc9e9fef6bc276dcea9]]]]
Former-commit-id: 2fa5fb488e
Former-commit-id: 483cff49ba [formerly 5e1b9383a5] [formerly 68f149d87e2b399b7952382baa7c61797a67f3a4 [formerly e1e7a12ca2]]
Former-commit-id: 5cabbbb607cd6d751d89fdd93bd1348270c7e3a5 [formerly bb8554031f]
Former-commit-id: c324ba1b1a
2013-02-25 16:58:25 -06:00
Nate Jensen
fd2eec06ac Merge "Issue #1659 Cache station in StationUtils" into development
Former-commit-id: 02b52de3ce [formerly c7d01eb0c5] [formerly bbbdc17c06] [formerly 02b52de3ce [formerly c7d01eb0c5] [formerly bbbdc17c06] [formerly 66e1411de1 [formerly bbbdc17c06 [formerly 70f064bed284629fe521ac8d3596cb8ac798c0c7]]]]
Former-commit-id: 66e1411de1
Former-commit-id: 666f38eb64 [formerly 7201499124] [formerly 763f66512c91a8e39853e4872f2284081df92ee7 [formerly 135006ff0c]]
Former-commit-id: e0932a9913f4c483417dfd063b9615edcbc65872 [formerly 2e3f3f66b3]
Former-commit-id: 6e50b1f914
2013-02-25 16:56:55 -06:00
Ben Steffensmeier
dfaa05d74e Issue #1659 Cache station in StationUtils
Former-commit-id: 98ec05e12c [formerly 0ff907499c] [formerly 842437870e] [formerly 98ec05e12c [formerly 0ff907499c] [formerly 842437870e] [formerly 39bf907df7 [formerly 842437870e [formerly 5bd8303893ad59a23571c0564984b21da9ffe785]]]]
Former-commit-id: 39bf907df7
Former-commit-id: abe93c1f6e [formerly 8ebeb61cea] [formerly 9e36b2f9b09d3f4dc4f9cdf074839d358f49c86a [formerly 5be0eab696]]
Former-commit-id: 38a9f5360483f11a03ae1fa16cb8fd9f4b816898 [formerly 02f1f6a065]
Former-commit-id: 932db84314
2013-02-25 16:25:55 -06:00
Steve Harris
86c1edf4ea Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 650db426b9 [formerly cd99e680bb] [formerly b50e384a0f] [formerly 650db426b9 [formerly cd99e680bb] [formerly b50e384a0f] [formerly e8135b9c14 [formerly b50e384a0f [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]]
Former-commit-id: e8135b9c14
Former-commit-id: e4b9ef2cd3 [formerly 901cbbf56d] [formerly 516b4ee30c97e99a87f971673c76dd8b45556e63 [formerly 2398ef1e85]]
Former-commit-id: 2360d951adc310ab576e9dbbb7077bb09c817c57 [formerly 1d8b6e0256]
Former-commit-id: 108abd5e69
2013-02-25 16:05:22 -06:00
Steve Harris
9d9a17aa64 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]]
Former-commit-id: 6ec9e73035
Former-commit-id: f30d1cdf87 [formerly e46625f8f2] [formerly bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1]]
Former-commit-id: 8958c8255ceab6eb6c8e58c5cb4c8a688e5de950 [formerly 140ae3191c]
Former-commit-id: 9db68d0585
2013-02-25 15:58:48 -06:00
Steve Harris
7afe192a2e 13.3.1-3 baseline
Merge branch 'master_13.3.1' of ../ss_build_transfer_copy into master_13.3.1

conflicts resolved by 'theirs' strategy (all of 13.3.1-10)

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 786642589b [formerly 07167ec04f] [formerly cf951785c8] [formerly 786642589b [formerly 07167ec04f] [formerly cf951785c8] [formerly db761c0f19 [formerly cf951785c8 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]]]
Former-commit-id: db761c0f19
Former-commit-id: 9e33e5aed0 [formerly 988430b44d] [formerly e1e30a87bbefe4ace1cec506478f31b1c194a07f [formerly 62e15dacdb]]
Former-commit-id: 8a7424cb5ccac6a26cfe8489b629abcc460e0589 [formerly f14049cf3f]
Former-commit-id: 225af35fbe
2013-02-25 15:54:24 -06:00
Mike Duff
d6fbe05ab7 Issue #1588 - Fix match any/all in data browser dialog
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49

Former-commit-id: af47a02e47 [formerly 0d2c817680] [formerly d00a790d7b] [formerly af47a02e47 [formerly 0d2c817680] [formerly d00a790d7b] [formerly 086d24acc8 [formerly d00a790d7b [formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]]]
Former-commit-id: 086d24acc8
Former-commit-id: f73faee133 [formerly dccb6b94b9] [formerly f34a7712b345b1738f4e1c4927c8c43d0e321466 [formerly 1365596d4d]]
Former-commit-id: 5556e6f398a9c701dd666e73aee68a1b5fe828a7 [formerly ce30c45c88]
Former-commit-id: 7fc320844f
2013-02-25 15:53:55 -06:00
Bryan Kowal
e9cbfb8c57 Issue #1634 - fix EDEX debug with YAJSW Wrapper
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96

Former-commit-id: 1ea7fbe69e [formerly 4d160993fb] [formerly b05073fbe3] [formerly 1ea7fbe69e [formerly 4d160993fb] [formerly b05073fbe3] [formerly 0d2262c0bf [formerly b05073fbe3 [formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]]]
Former-commit-id: 0d2262c0bf
Former-commit-id: f4bf7e1adb [formerly f8c920c6cd] [formerly 090c61777cb5dad1fa90214f62e271692c5b167e [formerly 36a887416f]]
Former-commit-id: 4279afad443b9b6aab6051e4b7a738fe37ac5e91 [formerly ebe04d4919]
Former-commit-id: e38658e939
2013-02-25 11:30:13 -06:00
Dustin Johnson
a9e237eaca Merge "Issue #1620 - Fix set clean issue with job loader." into development
Former-commit-id: 81c261936f [formerly 79718b6a9c] [formerly 83a915210d] [formerly 81c261936f [formerly 79718b6a9c] [formerly 83a915210d] [formerly eff20112d2 [formerly 83a915210d [formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]]]
Former-commit-id: eff20112d2
Former-commit-id: 6b5fdb5672 [formerly b702146272] [formerly 77de144645b1acb61a1f55f57de766de97e3ddb8 [formerly 1255b87e2e]]
Former-commit-id: be882616305c403f60b2fde5a11baec3b0c31e33 [formerly c67c766b34]
Former-commit-id: 36b5228641
2013-02-25 09:43:19 -06:00
Nate Jensen
0ce5b4805c Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development
Former-commit-id: 4f3ed0ef67 [formerly 5d7edbc0c1] [formerly b514792bbc] [formerly 4f3ed0ef67 [formerly 5d7edbc0c1] [formerly b514792bbc] [formerly 5d828d4d62 [formerly b514792bbc [formerly 1fec56c55d81b35df45c2266fc234747df3791df]]]]
Former-commit-id: 5d828d4d62
Former-commit-id: 2924ef9340 [formerly 3a66566610] [formerly d6b5c39b47f714b55716489494afc5902a140ab1 [formerly cb37bab362]]
Former-commit-id: 123aed11ae81f496fa2e8c758744d47466e2c0ed [formerly df183bb4da]
Former-commit-id: 55a721ecbe
2013-02-25 09:31:55 -06:00
Nate Jensen
8ddaaa2495 Merge "Issue #1628 lower Xmx on windows in awips.product." into development
Former-commit-id: df11a1bc40 [formerly ae20ee7665] [formerly c1becf797a] [formerly df11a1bc40 [formerly ae20ee7665] [formerly c1becf797a] [formerly 545caf22fb [formerly c1becf797a [formerly 8525b4ac1db570160253cf7bb180914967e0b647]]]]
Former-commit-id: 545caf22fb
Former-commit-id: 32f74cfe32 [formerly 530d3bfa00] [formerly d31418ec7c77062c9087ed4434fdf6776b2c9630 [formerly 87a745eb2f]]
Former-commit-id: fdec8fafefc3833803048c7d34a1397551444bb2 [formerly ff80c774e3]
Former-commit-id: c0679fd504
2013-02-25 09:31:20 -06:00
Mike Duff
d1fec7bb15 Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 81649d346a [formerly 8bddd467b1 [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]]
Former-commit-id: 81649d346a
Former-commit-id: 5439b30b6a [formerly 01ef273417] [formerly 3908739d5516b0d12bdcb9c95d991ddec48a13d9 [formerly b1a549a99f]]
Former-commit-id: 0b55db4b6b45148de1eef1eb4f0dbf9090315261 [formerly a92492ed07]
Former-commit-id: 383f5c075e
2013-02-25 09:29:16 -06:00
Steve Harris
02f04a926e 13.3.1-3 baseline
Former-commit-id: 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]]
Former-commit-id: 8a64f142e5
Former-commit-id: 30efc4c86a [formerly 05eb25f124] [formerly ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3]]
Former-commit-id: 1fe55774d4f2229cf3fdf3a4a342eab88f5b63cd [formerly 1ba778753f]
Former-commit-id: 9da8db0212
2013-02-25 10:24:53 -05:00
Steve Harris
dbaeb28c82 13.3.1-2 baseline
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]]
Former-commit-id: 3d115ed3be
Former-commit-id: f2428e968a [formerly 370ed98038] [formerly 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]]
Former-commit-id: 6be2b60d013b857004e97817b3188f6eb4ae78f5 [formerly 2a2a9e03b7]
Former-commit-id: a43233f8c2
2013-02-25 10:18:36 -05:00