Commit graph

2086 commits

Author SHA1 Message Date
Bryan Kowal
80cb164e61 Issue #1750 - edexBridge will now set the QPID persistence flag
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98

Former-commit-id: d484acbca0 [formerly 3a8efd5edf] [formerly d484acbca0 [formerly 3a8efd5edf] [formerly 8b4dce1c3d [formerly d466b647d0d810418a88c875f39e55d98d680aa1]]]
Former-commit-id: 8b4dce1c3d
Former-commit-id: 0d9400b2ec [formerly eba8ccc6cd]
Former-commit-id: 4204310294
2013-03-04 17:58:04 -06:00
Dustin Johnson
665752eebe Issue #1647 Configure NCF and WFO retrieval tasks
Change-Id: I038a8c297587982b98ca419311b4e38894947ed4

Former-commit-id: 527ed01fec [formerly de7f387248] [formerly 527ed01fec [formerly de7f387248] [formerly bf9eefe961 [formerly 14c1f2d908f4cba6353251fa87062f6f8722c7e9]]]
Former-commit-id: bf9eefe961
Former-commit-id: bbba19a26f [formerly 81fcd0bc65]
Former-commit-id: 680a65490b
2013-03-04 10:22:16 -06:00
Dustin Johnson
a932ae6264 Issue #1644 Remove SWT jars from Eclipse tests project classpath
Change-Id: I50e48c5119fc05f49db8ed8cdb477f373b9c1242

Former-commit-id: af245e134e [formerly 3436c86641] [formerly af245e134e [formerly 3436c86641] [formerly 357b968ae1 [formerly 492688be79bd2ddbffee25e0baa256c23cc766eb]]]
Former-commit-id: 357b968ae1
Former-commit-id: b6936472c8 [formerly dcd451229e]
Former-commit-id: 3bcab39c93
2013-03-04 09:28:53 -06:00
Bryan Kowal
661c050480 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: ec2ca3f1f1 [formerly 62e7cca531] [formerly ec2ca3f1f1 [formerly 62e7cca531] [formerly bd7877a71e [formerly e1bef5abe061a7dd550dc8e38318b275e6653470]]]
Former-commit-id: bd7877a71e
Former-commit-id: c672931e5b [formerly 8fd24a3969]
Former-commit-id: 40f3cbb7da
2013-03-01 14:32:31 -06:00
Bryan Kowal
d0eb95dbbe Issue #1739 - fix Wes2Bridge
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814

Former-commit-id: 9022c53d53 [formerly 20d3c6bcaa] [formerly 9022c53d53 [formerly 20d3c6bcaa] [formerly 86a1f16e37 [formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]]
Former-commit-id: 86a1f16e37
Former-commit-id: 5958c0a876 [formerly ed6e1003ff]
Former-commit-id: 0e2cad14b2
2013-03-01 11:49:09 -06:00
Bryan Kowal
105951f556 Issue #1739 - remove reference to non-existent junit version
Change-Id: If4f8825df05442173cbc537cdedb519dd382cf78

Former-commit-id: 29e157d94e [formerly 5138fe5537] [formerly 29e157d94e [formerly 5138fe5537] [formerly 44215e65e9 [formerly f4249d163f057560504b5cbc3745b7ae4b36f28c]]]
Former-commit-id: 44215e65e9
Former-commit-id: 0be2bc1f80 [formerly a2e3556f7e]
Former-commit-id: e61e84fd6b
2013-03-01 10:26:25 -06:00
Bryan Kowal
4d50fec21f 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: f806c880d3 [formerly d081a2afcd] [formerly f806c880d3 [formerly d081a2afcd] [formerly 4faf8aefbe [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: c4709b1bfb [formerly 497bf33892]
Former-commit-id: cb5a2677b9
2013-02-28 18:09:25 -06:00
Ben Steffensmeier
866c873f71 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
2013-02-28 17:00:56 -06:00
Dustin Johnson
d67dead12a Merge "Issue #1673: Moved data delivery specific files from minDB configuration where possible" into development
Former-commit-id: 64cfd1c51d [formerly 44140d1e0f] [formerly 64cfd1c51d [formerly 44140d1e0f] [formerly 59212a8241 [formerly fa998e70583a79d591eb956f9ab5deabc4eadea3]]]
Former-commit-id: 59212a8241
Former-commit-id: ad9d95ef08 [formerly c7d5feb7d6]
Former-commit-id: f5d2e1cdbb
2013-02-28 16:24:21 -06:00
Benjamin Phillippe
b4fb275c29 Issue #1738: Removed unused project com.raytheon.uf.edex.ebxml
Change-Id: I87783b45692c84cf851fb5695dae7efa79308655

Former-commit-id: fd5302a619 [formerly e0033900cf] [formerly fd5302a619 [formerly e0033900cf] [formerly e01ae283f7 [formerly 323bdc5919de9f04849e325dfdeb868ccdb39603]]]
Former-commit-id: e01ae283f7
Former-commit-id: 1314c47acf [formerly 3940bf0a6d]
Former-commit-id: 32a205e880
2013-02-28 15:01:53 -06:00
Benjamin Phillippe
09ed21b306 Issue #1673: Moved data delivery specific files from minDB configuration where possible
Change-Id: I09b34e7c429b4f657e586fc64bcbbcc1ceed3585

Former-commit-id: b2da92ac85 [formerly 29e2b0fd9e] [formerly b2da92ac85 [formerly 29e2b0fd9e] [formerly d3d5886233 [formerly b279ad4cc4401c54cd0e2af8170e254cbbc0e53b]]]
Former-commit-id: d3d5886233
Former-commit-id: aaacef1396 [formerly 3802541578]
Former-commit-id: b03fecc650
2013-02-28 14:56:31 -06:00
Bryan Kowal
bc668bc828 Issue #1638 - update CAVE rpm name generation
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f

Former-commit-id: a9123a2b84 [formerly b8496877ff] [formerly a9123a2b84 [formerly b8496877ff] [formerly 5eb888fb98 [formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]]
Former-commit-id: 5eb888fb98
Former-commit-id: da0d99d22f [formerly 22acca8f3d]
Former-commit-id: 3c2210c80d
2013-02-28 14:43:53 -06:00
Bryan Kowal
300e29bd30 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: c099bc0df8 [formerly 30f59c4bcc] [formerly c099bc0df8 [formerly 30f59c4bcc] [formerly 4f30dbb2b8 [formerly e2c597978c6559a4ef1d5eebb00328584745dae1]]]
Former-commit-id: 4f30dbb2b8
Former-commit-id: ecda5fe131 [formerly 6a298318c5]
Former-commit-id: 7354f94d74
2013-02-28 10:02:40 -06:00
Max Schenkelberg
3dcfc90510 Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: 1769edc026 [formerly ec40d261e5] [formerly 1769edc026 [formerly ec40d261e5] [formerly 547c593dec [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]
Former-commit-id: 547c593dec
Former-commit-id: fc58e7431a [formerly 13a4056335]
Former-commit-id: 0c8f3d2449
2013-02-27 16:19:58 -06:00
Max Schenkelberg
727602f011 Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79

Former-commit-id: c8a5f1a007 [formerly 0f1112fb3e] [formerly c8a5f1a007 [formerly 0f1112fb3e] [formerly 38bba3705f [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]]
Former-commit-id: 38bba3705f
Former-commit-id: 41706c42f2 [formerly 6ebc058df4]
Former-commit-id: 22a18ffe01
2013-02-27 12:26:32 -06:00
Max Schenkelberg
1073393fbb 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: 2611980ca4 [formerly 4ed4ef8d71] [formerly 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]
Former-commit-id: e0ba97d547
Former-commit-id: 5617dfaa67 [formerly 6b1426dd34]
Former-commit-id: 453ac44050
2013-02-27 11:50:38 -06:00
Richard Peter
4b22cf71f4 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: b354ebb862 [formerly 6c766ddd85] [formerly b354ebb862 [formerly 6c766ddd85] [formerly 84e1b2f999 [formerly d89e15dc9528bfbc67f67cc1d8a2989e7390131d]]]
Former-commit-id: 84e1b2f999
Former-commit-id: 0f1c3dd256 [formerly 9fa37933e6]
Former-commit-id: eff7670694
2013-02-27 11:43:18 -06:00
Jonathan Sanchez
e350bcfc12 Issue #1556 Added and exported jep from tests project
Change-Id: Ied6c3e85ead2152364ed50e69493aa454a1c5092

Former-commit-id: fcc59d2334 [formerly 0d7bcdc42a] [formerly fcc59d2334 [formerly 0d7bcdc42a] [formerly 16968223f2 [formerly 43a1786260e487f810489d0da3cb75dc0ce03d0a]]]
Former-commit-id: 16968223f2
Former-commit-id: 45f84bc698 [formerly 5ba52f21bd]
Former-commit-id: 002f468939
2013-02-27 09:21:56 -06:00
Ron Anderson
48abd41c6e Issue #1708 Fix redundant excution of evaluateQuery.
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a

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

Former-commit-id: d43afc8c67 [formerly bfe3c684df] [formerly d43afc8c67 [formerly bfe3c684df] [formerly f37999b1eb [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: 541557e0b0 [formerly 77fbbb6a61]
Former-commit-id: 92abcad349
2013-02-26 18:44:51 -06:00
Nate Jensen
0ac9146923 Merge "Issue #1642: Fix QPID Deadlock scenario - Address peer review comments" into development
Former-commit-id: a020438c99 [formerly 58957d30e5] [formerly a020438c99 [formerly 58957d30e5] [formerly 24c94ef55b [formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]]
Former-commit-id: 24c94ef55b
Former-commit-id: 652ac25d12 [formerly b6fc51a18c]
Former-commit-id: 841ddd8509
2013-02-26 18:00:50 -06:00
Richard Peter
294914b403 Issue #1642: Fix QPID Deadlock scenario
- Address peer review comments

Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462

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

Former-commit-id: 8038b840d8 [formerly 7852f88352] [formerly 8038b840d8 [formerly 7852f88352] [formerly 88a9b953b6 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]
Former-commit-id: 88a9b953b6
Former-commit-id: 94300e0c1d [formerly cc0254ba03]
Former-commit-id: 2d6df74b67
2013-02-26 15:06:04 -06:00
Lee Venable
1dff036c6a Merge "Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down" into development
Former-commit-id: a4b41e0309 [formerly 9cf3ca07b7] [formerly a4b41e0309 [formerly 9cf3ca07b7] [formerly 46ff81108a [formerly 26fa358838588643c003287d8125e58949c3648f]]]
Former-commit-id: 46ff81108a
Former-commit-id: 4212af7e8a [formerly cb7fd87715]
Former-commit-id: 7b9ed39534
2013-02-26 14:11:35 -06:00
Mike Duff
a62b8b824e Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down
Change-Id: I92016564da48f7f736bebf58fdc0afca5cc1d9ff

Former-commit-id: fdd5e903c6 [formerly b48e70fff4] [formerly fdd5e903c6 [formerly b48e70fff4] [formerly c77602652e [formerly 1d9c456b697a79f6093550a26cb3d2d4f972548d]]]
Former-commit-id: c77602652e
Former-commit-id: 882c46dd85 [formerly 3071eb8456]
Former-commit-id: bb240a10db
2013-02-26 14:03:55 -06:00
Nate Jensen
360b33b854 Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
Former-commit-id: 15c4c4dfa0 [formerly b062299796] [formerly 15c4c4dfa0 [formerly b062299796] [formerly 36d4eff2c6 [formerly 03591924b4efdc13f1cc01182d39e280309cf381]]]
Former-commit-id: 36d4eff2c6
Former-commit-id: b173d34ba9 [formerly 5c33098315]
Former-commit-id: c06d4abcee
2013-02-26 13:53:40 -06:00
Nate Jensen
66e2da8c31 Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development
Former-commit-id: f5ebeb1330 [formerly 1e50b3a0e8] [formerly f5ebeb1330 [formerly 1e50b3a0e8] [formerly 4e60fa682d [formerly 698d1d88b5c67498046dcec558361797a01b07f5]]]
Former-commit-id: 4e60fa682d
Former-commit-id: 2b81ce6028 [formerly e1660e51f8]
Former-commit-id: eced16c428
2013-02-26 13:46:30 -06:00
Dustin Johnson
7b73dbc256 Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development
Former-commit-id: 074fb0aa64 [formerly 47cb278c01] [formerly 074fb0aa64 [formerly 47cb278c01] [formerly d31392d740 [formerly bf86849d284696553ed4cbc3f347afe2f791968d]]]
Former-commit-id: d31392d740
Former-commit-id: 8e4a990d1a [formerly a7d4b23597]
Former-commit-id: abf85b6b0e
2013-02-26 13:41:46 -06:00
Dustin Johnson
8502d29497 Merge "Issue #1643 Add NCF bandwidth manager router" into development
Former-commit-id: 50b412b34e [formerly 42402c5d73] [formerly 50b412b34e [formerly 42402c5d73] [formerly fb235e3f43 [formerly e2bb08df9a9aa2ac143e0f7fc82b911f72b4b87c]]]
Former-commit-id: fb235e3f43
Former-commit-id: 4153bdd79e [formerly a648519673]
Former-commit-id: 50e749e38e
2013-02-26 13:41:36 -06:00
Dustin Johnson
7bc8125917 Merge "Issue #1588 - Fix match any/all in data browser dialog" into development
Former-commit-id: 3dd36d29cf [formerly fb38cceecd] [formerly 3dd36d29cf [formerly fb38cceecd] [formerly 76738dbf7d [formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]]]
Former-commit-id: 76738dbf7d
Former-commit-id: bb5f6cc568 [formerly b77ebdc924]
Former-commit-id: 77f811d090
2013-02-26 13:37:14 -06:00
Matt Nash
2841c495af Issue #1668 add gsd pattern to allow for their plugins to be deployed
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6

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

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

Former-commit-id: 604a7c82b2 [formerly 598eb88a04] [formerly 604a7c82b2 [formerly 598eb88a04] [formerly c6975aa379 [formerly 9cb2114c239e6782961e8127fe85b10a7ee38f06]]]
Former-commit-id: c6975aa379
Former-commit-id: 898d7500aa [formerly ab1dc2272b]
Former-commit-id: 21bd89a9fd
2013-02-26 12:07:36 -06:00
Dustin Johnson
fa87f70100 Issue #1643 Add NCF bandwidth manager router
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8

Former-commit-id: ebf02481f0 [formerly d58d28c636] [formerly ebf02481f0 [formerly d58d28c636] [formerly 722e41b8b0 [formerly 2b52368c81272df18f3af1334057295d11bb4b52]]]
Former-commit-id: 722e41b8b0
Former-commit-id: 219e882fc5 [formerly cf86c92fad]
Former-commit-id: b62631b9d1
2013-02-26 11:32:03 -06:00
Steve Harris
1e41b4a44a Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 7ed1eacb6b [formerly 9bcabe2c5d] [formerly 7ed1eacb6b [formerly 9bcabe2c5d] [formerly 098b1e1579 [formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]]
Former-commit-id: 098b1e1579
Former-commit-id: 41e1594be7 [formerly 57440abebb]
Former-commit-id: 3df38c0fc6
2013-02-25 20:41:26 -06:00
Richard Peter
5618a65540 Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development
Former-commit-id: 2553955249 [formerly be9370576a] [formerly 2553955249 [formerly be9370576a] [formerly 1669945cdb [formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]]]
Former-commit-id: 1669945cdb
Former-commit-id: 56771955b4 [formerly aa5f3c80a0]
Former-commit-id: d1917a79a2
2013-02-25 17:47:14 -06:00
Richard Peter
4fbbfc52c9 Merge "Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests." into development
Former-commit-id: af33dd1743 [formerly b98bdb3d81] [formerly af33dd1743 [formerly b98bdb3d81] [formerly 3b718bea52 [formerly bedfb6a21680961421b42bcbcec470e41bb9523d]]]
Former-commit-id: 3b718bea52
Former-commit-id: 25909b2ee1 [formerly c21a1e9f61]
Former-commit-id: 731710f355
2013-02-25 17:46:26 -06:00
Lee Venable
de7c07dcab Merge "Issue #1625 Updated addOrRemoveCounty method." into development
Former-commit-id: e54eb4ab55 [formerly e024e4e087] [formerly e54eb4ab55 [formerly e024e4e087] [formerly 7f769af427 [formerly cda14b7c5e6563a9165fa734f35766816bccccf1]]]
Former-commit-id: 7f769af427
Former-commit-id: 444a1f5d47 [formerly 0125935a7f]
Former-commit-id: 8af64a568d
2013-02-25 17:25:56 -06:00
Jonathan Sanchez
f0a64fa33f Issue #1625 Updated addOrRemoveCounty method.
Former-commit-id: f59a08963c [formerly cd6dd3c178] [formerly f59a08963c [formerly cd6dd3c178] [formerly 8c2c7c97f7 [formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]]
Former-commit-id: 8c2c7c97f7
Former-commit-id: c861c71ae6 [formerly d4f4832d1a]
Former-commit-id: b275cdf701
2013-02-25 17:15:09 -06:00
Ben Steffensmeier
677412cf10 Issue #1659 Stop derived parameters from sending empty requests for cached times
Former-commit-id: ff232b87b4 [formerly 71652af086] [formerly ff232b87b4 [formerly 71652af086] [formerly 9edeadc966 [formerly 9605118022d378eb35c38d784729410d160d46df]]]
Former-commit-id: 9edeadc966
Former-commit-id: 9ec0008743 [formerly d6c59cb85a]
Former-commit-id: de75bbf5a7
2013-02-25 17:08:12 -06:00
Ben Steffensmeier
c324ba1b1a Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests.
Former-commit-id: f56b305581 [formerly fd2450c0df] [formerly f56b305581 [formerly fd2450c0df] [formerly 2fa5fb488e [formerly 4826ccdd4db42342f913cfc9e9fef6bc276dcea9]]]
Former-commit-id: 2fa5fb488e
Former-commit-id: 5e1b9383a5 [formerly e1e7a12ca2]
Former-commit-id: bb8554031f
2013-02-25 16:58:25 -06:00
Nate Jensen
6e50b1f914 Merge "Issue #1659 Cache station in StationUtils" into development
Former-commit-id: c7d01eb0c5 [formerly bbbdc17c06] [formerly c7d01eb0c5 [formerly bbbdc17c06] [formerly 66e1411de1 [formerly 70f064bed284629fe521ac8d3596cb8ac798c0c7]]]
Former-commit-id: 66e1411de1
Former-commit-id: 7201499124 [formerly 135006ff0c]
Former-commit-id: 2e3f3f66b3
2013-02-25 16:56:55 -06:00
Ben Steffensmeier
932db84314 Issue #1659 Cache station in StationUtils
Former-commit-id: 0ff907499c [formerly 842437870e] [formerly 0ff907499c [formerly 842437870e] [formerly 39bf907df7 [formerly 5bd8303893ad59a23571c0564984b21da9ffe785]]]
Former-commit-id: 39bf907df7
Former-commit-id: 8ebeb61cea [formerly 5be0eab696]
Former-commit-id: 02f1f6a065
2013-02-25 16:25:55 -06:00
Steve Harris
108abd5e69 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: cd99e680bb [formerly b50e384a0f] [formerly cd99e680bb [formerly b50e384a0f] [formerly e8135b9c14 [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]
Former-commit-id: e8135b9c14
Former-commit-id: 901cbbf56d [formerly 2398ef1e85]
Former-commit-id: 1d8b6e0256
2013-02-25 16:05:22 -06:00
Steve Harris
9db68d0585 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 0a4564eb97 [formerly 67f090638f] [formerly 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: e46625f8f2 [formerly 0051276ad1]
Former-commit-id: 140ae3191c
2013-02-25 15:58:48 -06:00
Steve Harris
225af35fbe 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: 07167ec04f [formerly cf951785c8] [formerly 07167ec04f [formerly cf951785c8] [formerly db761c0f19 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]]
Former-commit-id: db761c0f19
Former-commit-id: 988430b44d [formerly 62e15dacdb]
Former-commit-id: f14049cf3f
2013-02-25 15:54:24 -06:00
Mike Duff
7fc320844f Issue #1588 - Fix match any/all in data browser dialog
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49

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

Former-commit-id: 4d160993fb [formerly b05073fbe3] [formerly 4d160993fb [formerly b05073fbe3] [formerly 0d2262c0bf [formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]]
Former-commit-id: 0d2262c0bf
Former-commit-id: f8c920c6cd [formerly 36a887416f]
Former-commit-id: ebe04d4919
2013-02-25 11:30:13 -06:00
Dustin Johnson
36b5228641 Merge "Issue #1620 - Fix set clean issue with job loader." into development
Former-commit-id: 79718b6a9c [formerly 83a915210d] [formerly 79718b6a9c [formerly 83a915210d] [formerly eff20112d2 [formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]]
Former-commit-id: eff20112d2
Former-commit-id: b702146272 [formerly 1255b87e2e]
Former-commit-id: c67c766b34
2013-02-25 09:43:19 -06:00
Nate Jensen
55a721ecbe Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development
Former-commit-id: 5d7edbc0c1 [formerly b514792bbc] [formerly 5d7edbc0c1 [formerly b514792bbc] [formerly 5d828d4d62 [formerly 1fec56c55d81b35df45c2266fc234747df3791df]]]
Former-commit-id: 5d828d4d62
Former-commit-id: 3a66566610 [formerly cb37bab362]
Former-commit-id: df183bb4da
2013-02-25 09:31:55 -06:00