Commit graph

1524 commits

Author SHA1 Message Date
Roger Ferrel
21a51d1177 Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: c0ee394e9c [formerly a73687c1b8] [formerly 6744238fce] [formerly c0ee394e9c [formerly a73687c1b8] [formerly 6744238fce] [formerly 9e8472bab6 [formerly 6744238fce [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]]]
Former-commit-id: 9e8472bab6
Former-commit-id: 47fa3496fb [formerly 7e5bb824d9] [formerly ff76a88839c216a130eb0e8c4e251734c7719b17 [formerly 3684c7efed]]
Former-commit-id: 7d566628343e1351cf48eeae57d0064db1054178 [formerly a8436c76ad]
Former-commit-id: 408663b2b4
2013-03-11 11:16:22 -05:00
Dave Hladky
b2fd11f9ba Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: b064d868db [formerly 50696bee89] [formerly 2a854d7c30] [formerly b064d868db [formerly 50696bee89] [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 2a854d7c30 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]]]
Former-commit-id: bb4c54eff0
Former-commit-id: f3c5756522 [formerly dd446abd03] [formerly 0d693e1163a146ba4b75d08a7448f53b6d3a905b [formerly 73c21a6ead]]
Former-commit-id: 35b46b23858ef8b9902cb3226539169a92f27a31 [formerly 6fe48593f0]
Former-commit-id: a24150df56
2013-03-08 09:58:17 -06:00
Nate Jensen
68ad66710b Issue #1753 log on user shutdown
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549

Former-commit-id: 2a34c5757a [formerly f101934a30] [formerly a7e9cfdb39] [formerly 2a34c5757a [formerly f101934a30] [formerly a7e9cfdb39] [formerly 163f93019b [formerly a7e9cfdb39 [formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]]]
Former-commit-id: 163f93019b
Former-commit-id: 97172b7466 [formerly c4175c161f] [formerly 8af3fb81542f03f05402208a65fd3f1ea9cb1229 [formerly d6c3c84d30]]
Former-commit-id: 11c882caee37b0a404c2eafec38954769365f319 [formerly 63eb6e6d21]
Former-commit-id: 4a53109fb2
2013-03-06 09:36:00 -06:00
Jonathan Sanchez
b17c66eddc Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: edd4d9e02b [formerly 80ea3e1ec2] [formerly 8f70214f66] [formerly edd4d9e02b [formerly 80ea3e1ec2] [formerly 8f70214f66] [formerly 6a3281c878 [formerly 8f70214f66 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]]]
Former-commit-id: 6a3281c878
Former-commit-id: a5478559bc [formerly 234d73c905] [formerly 3d49dc5085631dccfa4591b739f0f1e02b09ecee [formerly c2b021427b]]
Former-commit-id: 20722369ae623501820dc3acb6a7289596f69a5b [formerly 1403713fab]
Former-commit-id: 852b61f7e1
2013-03-05 16:02:47 -06:00
Jonathan Sanchez
43699636a2 Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: f79907bf9f [formerly 3fface264c] [formerly 1a91fe52e7] [formerly f79907bf9f [formerly 3fface264c] [formerly 1a91fe52e7] [formerly 1f2db32448 [formerly 1a91fe52e7 [formerly 14676fe089c0132febc3f533e6cbf2d00f117b90]]]]
Former-commit-id: 1f2db32448
Former-commit-id: 0917628d1a [formerly 40f52ab049] [formerly 51bec9541946d539bda749f417d6c93398a63eb9 [formerly 42bcef0be0]]
Former-commit-id: bd9d63ecabb49e6cbdc69ab06ee9bafbea502490 [formerly 0caae30f26]
Former-commit-id: b24d6fa352
2013-03-05 15:05:19 -06:00
Steve Harris
b64731872c Merge branch 'omaha_13.3.1' into development
Former-commit-id: afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly afd934db35 [formerly 6b13492420] [formerly d5b80f9225] [formerly aa0e9acefd [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 1709c34b8f [formerly 4a0b8772ec] [formerly 6d472393251484c670223cabe82285a18503dc7c [formerly b9563da8a8]]
Former-commit-id: ad6ef96c444820a88fa41f79cf60d91bc2c26386 [formerly 46d0c9fcee]
Former-commit-id: 2b489e4e40
2013-03-05 12:29:44 -06:00
Steve Harris
2104c8b533 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 7ff64bf8cc [formerly b423579e4a] [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]]
Former-commit-id: 276acc0cf2f69b884f078f338890570213eec929 [formerly b630339eb7]
Former-commit-id: d842ed88a7
2013-03-05 12:27:49 -06:00
Steve Harris
f20c87110e 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]
Former-commit-id: e26f7eb151
Former-commit-id: aabd5cd51f [formerly a240379588] [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]]
Former-commit-id: 8b4bd6790f2136380dbac557b452d873c77bacc6 [formerly 1f98e01c57]
Former-commit-id: 79ff805090
2013-03-05 10:47:06 -06:00
Steve Harris
52aae101cc 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]]
Former-commit-id: 2edca90902
Former-commit-id: 4bfbb518c0 [formerly 3e0614b43a] [formerly c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]]
Former-commit-id: e4eaa93661df211ab065d6c9dd5f042f5011f151 [formerly 0df35cc5ec]
Former-commit-id: 153aadc1d7
2013-03-05 10:39:59 -06:00
Nate Jensen
645dce36ab Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
Former-commit-id: d7bc5750ae [formerly b393674ef3] [formerly b803ae3801] [formerly d7bc5750ae [formerly b393674ef3] [formerly b803ae3801] [formerly a952d48b3e [formerly b803ae3801 [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]]]
Former-commit-id: a952d48b3e
Former-commit-id: 790eb9ef79 [formerly 3c5ca0546f] [formerly a901506e2ccdd1f021aa7b64beb4727c4a3b7241 [formerly e3db522be4]]
Former-commit-id: f3f69b1fabddb12a309c17a0dde94e92a62eb48f [formerly bb5553abb1]
Former-commit-id: 081284a2f8
2013-03-05 09:10:52 -06:00
Richard Peter
3ab85aa0f3 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: 3cc3648b9b [formerly e74f6074e7] [formerly 070f62d08e] [formerly 3cc3648b9b [formerly e74f6074e7] [formerly 070f62d08e] [formerly 784cd2145f [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]]
Former-commit-id: 784cd2145f
Former-commit-id: c7a4dcede6 [formerly a4bf42628a] [formerly 63aff6583f8761a1de816d6c0659c2736bd51159 [formerly 180540eb47]]
Former-commit-id: 1992cb2228c9c7acfe9a1445250fc5508b45c157 [formerly 6b08735982]
Former-commit-id: fa19a76a42
2013-03-04 17:48:05 -06:00
Dave Hladky
69e1b5f133 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly fc36146f48 [formerly 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]]
Former-commit-id: fc36146f48
Former-commit-id: f47935a03c [formerly 0f3c9ba997] [formerly 88439cd2618a1c23c44807b5d72302de6137417a [formerly 1260b40307]]
Former-commit-id: d37acb68d5f6f91395fa98f52c09dffd4dcce861 [formerly fc90d47619]
Former-commit-id: ac69f97305
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
35d841ce41 Issue #1628 move xmx settings to linux so windows can override.
Former-commit-id: 9a8b585720 [formerly 5a88604ed6] [formerly fad56e32cc] [formerly 9a8b585720 [formerly 5a88604ed6] [formerly fad56e32cc] [formerly c1c5ac7926 [formerly fad56e32cc [formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]]]
Former-commit-id: c1c5ac7926
Former-commit-id: 3a92dd3b6d [formerly c99a17709e] [formerly c2221c67d2e2345aa9b44715379eafeb2a87f000 [formerly b16399cfdb]]
Former-commit-id: b84baab4f2996b50ad6459d4ff02ad81cb71bf9c [formerly c631b538e7]
Former-commit-id: 94b6f646b3
2013-03-04 16:47:11 -06:00
Dustin Johnson
3036d45756 Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
Amend:
  Use isEmpty() where possible in BandwidthManager.

Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec

Former-commit-id: 7bfc28b6f8 [formerly 73f884753a] [formerly 1161125c84] [formerly 7bfc28b6f8 [formerly 73f884753a] [formerly 1161125c84] [formerly 54c3980cba [formerly 1161125c84 [formerly 28c97849800c624bdaa161f05777703ee2a510ac]]]]
Former-commit-id: 54c3980cba
Former-commit-id: 286d1c3d36 [formerly 67d6a4ac99] [formerly 0e044dbd4df754584a21481f1a73073d2a862d91 [formerly c0a1ae396a]]
Former-commit-id: 9edbfa25c43a48c1c5e2440029f285038e17bbaf [formerly 5da3043a97]
Former-commit-id: 2f7bdb18f9
2013-03-04 14:55:50 -06:00
Nate Jensen
25422ac783 Merge "Issue #1476 make fix for collaboration for issues with closing of views when detached" into omaha_13.3.1
Former-commit-id: f832e5949c [formerly 5d772a2228] [formerly 0542f04538] [formerly f832e5949c [formerly 5d772a2228] [formerly 0542f04538] [formerly 773b39548d [formerly 0542f04538 [formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]]]]
Former-commit-id: 773b39548d
Former-commit-id: 300ec4fb40 [formerly e15d933ffb] [formerly 7ecaceea4b43ec1774bff495fb630d90c2281a3c [formerly aaac07f26c]]
Former-commit-id: 1af312afedb388d809c11d6cad5b5aaf71b22873 [formerly 4bc3496636]
Former-commit-id: 4c7d7bb7b9
2013-03-04 12:28:19 -06:00
Matt Nash
a12055eff6 Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: 999413b2e7 [formerly 311ac710ca] [formerly fdc6db0a50] [formerly 999413b2e7 [formerly 311ac710ca] [formerly fdc6db0a50] [formerly 1d25736871 [formerly fdc6db0a50 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]]]
Former-commit-id: 1d25736871
Former-commit-id: b0a0086da1 [formerly 739a4ac2db] [formerly 04b14b2dd0b28e80f7bd47e6d8aa7a5e1bb12a5f [formerly 274becd212]]
Former-commit-id: 2008f23e609dbfef312c46bbc800643d207b4fab [formerly f02246ab07]
Former-commit-id: bad1cef443
2013-03-04 09:41:11 -06:00
Ron Anderson
ea3fea38dd Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8

Former-commit-id: 3aba636666 [formerly f1d5ff7c9e] [formerly fdeb45705b] [formerly 3aba636666 [formerly f1d5ff7c9e] [formerly fdeb45705b] [formerly e8f1b460ce [formerly fdeb45705b [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]]]
Former-commit-id: e8f1b460ce
Former-commit-id: 29cf2d6ddd [formerly fd86a481a7] [formerly 96dbec8a7d73075e3bd577828a3e622bb4ad9fbb [formerly 78a8d8f1a1]]
Former-commit-id: f7815b2071f640cadd3abe08a63c67a8804c1c11 [formerly 51d7975583]
Former-commit-id: 45e3384b2f
2013-03-04 09:30:04 -06:00
Richard Peter
2eb3dcec5e Issue #1740: Baseline cave monitoring script
Former-commit-id: e54d4ba855 [formerly 1632bd2882] [formerly 163fb343de] [formerly e54d4ba855 [formerly 1632bd2882] [formerly 163fb343de] [formerly 783e9c1a25 [formerly 163fb343de [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]]]
Former-commit-id: 783e9c1a25
Former-commit-id: dd03372823 [formerly e00d5344b1] [formerly a89d3bf559e31d9b30dc0a377f40e68385713756 [formerly 94d804a301]]
Former-commit-id: b03f7055bcdd495f2fa8cef70e67b8096a4ddb4a [formerly 9c63bea9d2]
Former-commit-id: 80eafa9676
2013-03-01 16:17:25 -06:00
Bryan Kowal
21b332d04e Issue #1638 - remove apache camel from the ncep feature. no plugin in the feature currently even imports
a package from apache camel

Change-Id: I88a91b8802d93e88b2fe66801ee336c3eb4bfd5a

Former-commit-id: 99ffceb3e4 [formerly ec2ca3f1f1] [formerly 62e7cca531] [formerly 99ffceb3e4 [formerly ec2ca3f1f1] [formerly 62e7cca531] [formerly bd7877a71e [formerly 62e7cca531 [formerly e1bef5abe061a7dd550dc8e38318b275e6653470]]]]
Former-commit-id: bd7877a71e
Former-commit-id: 55419c805c [formerly c672931e5b] [formerly 235faa80403f0802745cd4005882ecad4b2e6098 [formerly 8fd24a3969]]
Former-commit-id: 3f7a350cb7d61ed7ce6a8f79f7ce7b0014e25062 [formerly 40f3cbb7da]
Former-commit-id: 661c050480
2013-03-01 14:32:31 -06:00
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
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
Bryan Kowal
cfaaafbd5a Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue

Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc

Former-commit-id: 875c17399a [formerly f806c880d3] [formerly d081a2afcd] [formerly 875c17399a [formerly f806c880d3] [formerly d081a2afcd] [formerly 4faf8aefbe [formerly d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: e005f18132 [formerly c4709b1bfb] [formerly 7cd233f6e540666556c9d7a93a89b4d6dfd51ec6 [formerly 497bf33892]]
Former-commit-id: a05976388b8f7d2005143e0d29a6962ef9b7b34e [formerly cb5a2677b9]
Former-commit-id: 4d50fec21f
2013-02-28 18:09:25 -06:00
Ben Steffensmeier
c903521884 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 2ca86633d6 [formerly f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 4936191404 [formerly 334af0001b] [formerly fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a]]
Former-commit-id: 387e3e95805ed9aa6efd193b1112d4ae6d8ac95a [formerly 0778375180]
Former-commit-id: 866c873f71
2013-02-28 17:00: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
Bryan Kowal
13ffe40b52 Issue #1638 - fix the build; temporarily copy features that are not built until the build
is capable of resolving its own dependencies.

Change-Id: Id6f31f6428178bf2174079e53f32ca522eeaa445

Former-commit-id: c042d3d31d [formerly c099bc0df8] [formerly 30f59c4bcc] [formerly c042d3d31d [formerly c099bc0df8] [formerly 30f59c4bcc] [formerly 4f30dbb2b8 [formerly 30f59c4bcc [formerly e2c597978c6559a4ef1d5eebb00328584745dae1]]]]
Former-commit-id: 4f30dbb2b8
Former-commit-id: 86ff2262b0 [formerly ecda5fe131] [formerly 10694ce03cdd06e8e954848cc190d39d10940fb3 [formerly 6a298318c5]]
Former-commit-id: d77726eb897d03c5b538900b6f365ccaf136c07d [formerly 7354f94d74]
Former-commit-id: 300e29bd30
2013-02-28 10:02:40 -06:00
Max Schenkelberg
805eacaa9a Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: 0fb8bb14d2 [formerly 1769edc026] [formerly ec40d261e5] [formerly 0fb8bb14d2 [formerly 1769edc026] [formerly ec40d261e5] [formerly 547c593dec [formerly ec40d261e5 [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]]
Former-commit-id: 547c593dec
Former-commit-id: b6a0a31731 [formerly fc58e7431a] [formerly 5b67b8fa2777f5d1c1e3d2378514221879eea2b9 [formerly 13a4056335]]
Former-commit-id: 984eb0a6ab87ef54eab69d0af6ddebb0e5af12f0 [formerly 0c8f3d2449]
Former-commit-id: 3dcfc90510
2013-02-27 16:19:58 -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
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
Max Schenkelberg
9b89da117c Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: d0b7850775 [formerly 2611980ca4] [formerly 4ed4ef8d71] [formerly d0b7850775 [formerly 2611980ca4] [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 4ed4ef8d71 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]]
Former-commit-id: e0ba97d547
Former-commit-id: 2aef608c3f [formerly 5617dfaa67] [formerly c22d83de78a7efcb6e70f98b882e95d6a6e64ae6 [formerly 6b1426dd34]]
Former-commit-id: 3e1df0aa7db6eca9855386f240baade979e24e3a [formerly 453ac44050]
Former-commit-id: 1073393fbb
2013-02-27 11:50:38 -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
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
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
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
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
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