Nate Jensen
|
33c0f575b6
|
Merge "Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build" into development
Former-commit-id: 68716aedc0 [formerly c21079cc06] [formerly 75d959f536] [formerly 68716aedc0 [formerly c21079cc06] [formerly 75d959f536] [formerly 8d44b9ea05 [formerly 75d959f536 [formerly 9d53ac277f9a83c7060552e5becda2b2d708ee9e]]]]
Former-commit-id: 8d44b9ea05
Former-commit-id: 845bfbdf40 [formerly 70c75b3bcd] [formerly 58038f64e06edc4144e0225d0d7b12ec7bcb9d12 [formerly 910b8c7d25]]
Former-commit-id: 76e672d96b513e8ffdf92103cfaf1039148b1c5b [formerly 432a0d1550]
Former-commit-id: 2f8389cd69
|
2013-03-05 09:10:31 -06:00 |
|
Dustin Johnson
|
25b57f2e68
|
Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development
Former-commit-id: 14db0ef448 [formerly 9a6b647989] [formerly c6137e89e7] [formerly 14db0ef448 [formerly 9a6b647989] [formerly c6137e89e7] [formerly ef632b7bfa [formerly c6137e89e7 [formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]]]]
Former-commit-id: ef632b7bfa
Former-commit-id: df82d27418 [formerly 9932db9b09] [formerly 5ec9f8f6e00d06698b9909ef6ca138ee05c652e1 [formerly b3f7f77bf6]]
Former-commit-id: 785d4c9c6596ac5e49949935ccd6b4c0ff3b1495 [formerly a5c331790e]
Former-commit-id: b23fe8b9e7
|
2013-03-05 08:53:09 -06:00 |
|
Bryan Kowal
|
5811d998d6
|
Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build
Change-Id: I8284ad58f4f3ddd16ad04f00720f3de9e63a954a
Former-commit-id: 7434229e35 [formerly eb4d75de7f] [formerly 862f97a19b] [formerly 7434229e35 [formerly eb4d75de7f] [formerly 862f97a19b] [formerly cd08f88c43 [formerly 862f97a19b [formerly d92a3c612b59d594a24ea253ad1289af7e8b7b8b]]]]
Former-commit-id: cd08f88c43
Former-commit-id: ac13226b3e [formerly 8512836953] [formerly 54bda3a3d32452d27700bfd588e2f031149a62db [formerly d9c1a92b8e]]
Former-commit-id: 19cb9569f90dff9d616b104aa2a3b010f7f7bceb [formerly 5dae6fd039]
Former-commit-id: 0a60b0f122
|
2013-03-04 15:52:07 -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 |
|
Dustin Johnson
|
a6196589c5
|
Issue #1647 Configure NCF and WFO retrieval tasks
Change-Id: I038a8c297587982b98ca419311b4e38894947ed4
Former-commit-id: 446e86bd19 [formerly 527ed01fec] [formerly de7f387248] [formerly 446e86bd19 [formerly 527ed01fec] [formerly de7f387248] [formerly bf9eefe961 [formerly de7f387248 [formerly 14c1f2d908f4cba6353251fa87062f6f8722c7e9]]]]
Former-commit-id: bf9eefe961
Former-commit-id: 9e2042e75e [formerly bbba19a26f] [formerly d153466292c80a218a52ecf3208c5a1da3cfaedd [formerly 81fcd0bc65]]
Former-commit-id: 3e34676190f1c18e9115c5330e55f0f2ebd66056 [formerly 680a65490b]
Former-commit-id: 665752eebe
|
2013-03-04 10:22:16 -06:00 |
|
Dustin Johnson
|
5dfa228133
|
Issue #1644 Remove SWT jars from Eclipse tests project classpath
Change-Id: I50e48c5119fc05f49db8ed8cdb477f373b9c1242
Former-commit-id: 16a942b446 [formerly af245e134e] [formerly 3436c86641] [formerly 16a942b446 [formerly af245e134e] [formerly 3436c86641] [formerly 357b968ae1 [formerly 3436c86641 [formerly 492688be79bd2ddbffee25e0baa256c23cc766eb]]]]
Former-commit-id: 357b968ae1
Former-commit-id: 48c83859d8 [formerly b6936472c8] [formerly fa331a26833cf275d31de0b21d02c3a940b7cd4a [formerly dcd451229e]]
Former-commit-id: 931f6dee9f8be308f4f0991d12272f7067d48bca [formerly 3bcab39c93]
Former-commit-id: a932ae6264
|
2013-03-04 09:28:53 -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 |
|
Bryan Kowal
|
e23e2eeec2
|
Issue #1739 - fix Wes2Bridge
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814
Former-commit-id: 18a778cb8c [formerly 9022c53d53] [formerly 20d3c6bcaa] [formerly 18a778cb8c [formerly 9022c53d53] [formerly 20d3c6bcaa] [formerly 86a1f16e37 [formerly 20d3c6bcaa [formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]]]
Former-commit-id: 86a1f16e37
Former-commit-id: 0a93a4a25c [formerly 5958c0a876] [formerly 12218fd7f3fba3ae75003e4e79567e4ffd54c4d1 [formerly ed6e1003ff]]
Former-commit-id: 41c069f5b278b4893f615956f01f3a05822496ce [formerly 0e2cad14b2]
Former-commit-id: d0eb95dbbe
|
2013-03-01 11:49:09 -06:00 |
|
Bryan Kowal
|
2d5119e347
|
Issue #1739 - remove reference to non-existent junit version
Change-Id: If4f8825df05442173cbc537cdedb519dd382cf78
Former-commit-id: ed498a3b53 [formerly 29e157d94e] [formerly 5138fe5537] [formerly ed498a3b53 [formerly 29e157d94e] [formerly 5138fe5537] [formerly 44215e65e9 [formerly 5138fe5537 [formerly f4249d163f057560504b5cbc3745b7ae4b36f28c]]]]
Former-commit-id: 44215e65e9
Former-commit-id: ac84ac231a [formerly 0be2bc1f80] [formerly ec1d636d60f95d565582c00e5d92ffdce7b9a719 [formerly a2e3556f7e]]
Former-commit-id: f3958cb699de8789c3842aab868cd73187be60e3 [formerly e61e84fd6b]
Former-commit-id: 105951f556
|
2013-03-01 10:26:25 -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 |
|
Dustin Johnson
|
30de7b725b
|
Merge "Issue #1673: Moved data delivery specific files from minDB configuration where possible" into development
Former-commit-id: bd70b0d8f3 [formerly 64cfd1c51d] [formerly 44140d1e0f] [formerly bd70b0d8f3 [formerly 64cfd1c51d] [formerly 44140d1e0f] [formerly 59212a8241 [formerly 44140d1e0f [formerly fa998e70583a79d591eb956f9ab5deabc4eadea3]]]]
Former-commit-id: 59212a8241
Former-commit-id: 6da815e3d9 [formerly ad9d95ef08] [formerly 773826d511824279a85e603999ebf501937686bd [formerly c7d5feb7d6]]
Former-commit-id: 4efb6e5fbf407a299883eda6f0afa58e09b6f37a [formerly f5d2e1cdbb]
Former-commit-id: d67dead12a
|
2013-02-28 16:24:21 -06:00 |
|
Benjamin Phillippe
|
fb01a02f16
|
Issue #1738: Removed unused project com.raytheon.uf.edex.ebxml
Change-Id: I87783b45692c84cf851fb5695dae7efa79308655
Former-commit-id: c528a3572a [formerly fd5302a619] [formerly e0033900cf] [formerly c528a3572a [formerly fd5302a619] [formerly e0033900cf] [formerly e01ae283f7 [formerly e0033900cf [formerly 323bdc5919de9f04849e325dfdeb868ccdb39603]]]]
Former-commit-id: e01ae283f7
Former-commit-id: 36f3eb6c26 [formerly 1314c47acf] [formerly d0b44ceeaadb2df294bc2baaa3e56918394af32f [formerly 3940bf0a6d]]
Former-commit-id: a1bce088536c522eba3b9ee52d2ed913d0803cec [formerly 32a205e880]
Former-commit-id: b4fb275c29
|
2013-02-28 15:01:53 -06:00 |
|
Benjamin Phillippe
|
c110ed6e62
|
Issue #1673: Moved data delivery specific files from minDB configuration where possible
Change-Id: I09b34e7c429b4f657e586fc64bcbbcc1ceed3585
Former-commit-id: 90d05f13ff [formerly b2da92ac85] [formerly 29e2b0fd9e] [formerly 90d05f13ff [formerly b2da92ac85] [formerly 29e2b0fd9e] [formerly d3d5886233 [formerly 29e2b0fd9e [formerly b279ad4cc4401c54cd0e2af8170e254cbbc0e53b]]]]
Former-commit-id: d3d5886233
Former-commit-id: 0845c12f85 [formerly aaacef1396] [formerly 8e19790f55d362ee6924676da1933286a093f0a2 [formerly 3802541578]]
Former-commit-id: 8b311c052c8e70864a82389115ea214b854955b9 [formerly b03fecc650]
Former-commit-id: 09ed21b306
|
2013-02-28 14:56:31 -06:00 |
|
Bryan Kowal
|
b8abcf8692
|
Issue #1638 - update CAVE rpm name generation
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f
Former-commit-id: 37e9c0cb20 [formerly a9123a2b84] [formerly b8496877ff] [formerly 37e9c0cb20 [formerly a9123a2b84] [formerly b8496877ff] [formerly 5eb888fb98 [formerly b8496877ff [formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]]]
Former-commit-id: 5eb888fb98
Former-commit-id: 6f57b06d52 [formerly da0d99d22f] [formerly 16e35fbbb02090042f28676c5c7015864604ab11 [formerly 22acca8f3d]]
Former-commit-id: 8a05919b3352b9c20cdce27168ba0ceb43d51c4c [formerly 3c2210c80d]
Former-commit-id: bc668bc828
|
2013-02-28 14:43:53 -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 |
|
Max Schenkelberg
|
81dad90e5f
|
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: 2fd6f3ed4e [formerly c8a5f1a007] [formerly 0f1112fb3e] [formerly 2fd6f3ed4e [formerly c8a5f1a007] [formerly 0f1112fb3e] [formerly 38bba3705f [formerly 0f1112fb3e [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]]]
Former-commit-id: 38bba3705f
Former-commit-id: bde1619d1c [formerly 41706c42f2] [formerly 71ee9b4fe7ff08b057d3d7bee4f424a8213cdcca [formerly 6ebc058df4]]
Former-commit-id: abc90031c64b3efb5931ffb8669c4138a0d5dd1e [formerly 22a18ffe01]
Former-commit-id: 727602f011
|
2013-02-27 12:26:32 -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 |
|
Richard Peter
|
0a5fc08b3e
|
Merge "Issue #1576 - all of the qpid broker-plugins will now be built and included in the qpid broker rpm" into development
Former-commit-id: bcd6b4d82b [formerly b354ebb862] [formerly 6c766ddd85] [formerly bcd6b4d82b [formerly b354ebb862] [formerly 6c766ddd85] [formerly 84e1b2f999 [formerly 6c766ddd85 [formerly d89e15dc9528bfbc67f67cc1d8a2989e7390131d]]]]
Former-commit-id: 84e1b2f999
Former-commit-id: f3528bedea [formerly 0f1c3dd256] [formerly 1d88c5c600f75ba32fbd740729eacc1432ef74f4 [formerly 9fa37933e6]]
Former-commit-id: aba90ab67ec4f2013fcb3a9461b728e2addec1ff [formerly eff7670694]
Former-commit-id: 4b22cf71f4
|
2013-02-27 11:43:18 -06:00 |
|
Jonathan Sanchez
|
2ae162c1a5
|
Issue #1556 Added and exported jep from tests project
Change-Id: Ied6c3e85ead2152364ed50e69493aa454a1c5092
Former-commit-id: 0489850f1b [formerly fcc59d2334] [formerly 0d7bcdc42a] [formerly 0489850f1b [formerly fcc59d2334] [formerly 0d7bcdc42a] [formerly 16968223f2 [formerly 0d7bcdc42a [formerly 43a1786260e487f810489d0da3cb75dc0ce03d0a]]]]
Former-commit-id: 16968223f2
Former-commit-id: 82d2cf50e9 [formerly 45f84bc698] [formerly e08785ed56464b79d4dd97a1552bdf649c5b5897 [formerly 5ba52f21bd]]
Former-commit-id: 887fa8b1848a2911468b6001914f0f4d05362460 [formerly 002f468939]
Former-commit-id: e350bcfc12
|
2013-02-27 09:21:56 -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 |
|