Commit graph

1392 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Nate Jensen
c0679fd504 Merge "Issue #1628 lower Xmx on windows in awips.product." into development
Former-commit-id: ae20ee7665 [formerly c1becf797a] [formerly ae20ee7665 [formerly c1becf797a] [formerly 545caf22fb [formerly 8525b4ac1db570160253cf7bb180914967e0b647]]]
Former-commit-id: 545caf22fb
Former-commit-id: 530d3bfa00 [formerly 87a745eb2f]
Former-commit-id: ff80c774e3
2013-02-25 09:31:20 -06:00
Mike Duff
383f5c075e Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 8a8e8f7a73 [formerly 8bddd467b1] [formerly 8a8e8f7a73 [formerly 8bddd467b1] [formerly 81649d346a [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]
Former-commit-id: 81649d346a
Former-commit-id: 01ef273417 [formerly b1a549a99f]
Former-commit-id: a92492ed07
2013-02-25 09:29:16 -06:00
Steve Harris
9da8db0212 13.3.1-3 baseline
Former-commit-id: a55f438dd8 [formerly 6572452887] [formerly a55f438dd8 [formerly 6572452887] [formerly 8a64f142e5 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]
Former-commit-id: 8a64f142e5
Former-commit-id: 05eb25f124 [formerly 8d741715e3]
Former-commit-id: 1ba778753f
2013-02-25 10:24:53 -05:00
Steve Harris
a43233f8c2 13.3.1-2 baseline
Former-commit-id: 3e60b23072 [formerly df6d6f598e] [formerly 3e60b23072 [formerly df6d6f598e] [formerly 3d115ed3be [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]
Former-commit-id: 3d115ed3be
Former-commit-id: 370ed98038 [formerly e8a51dc780]
Former-commit-id: 2a2a9e03b7
2013-02-25 10:18:36 -05:00
Mike Duff
3c6b26bb58 Issue #1620 - Fix set clean issue with job loader.
Change-Id: I1cf1e109ae3964ef95ebb9a2582622c31e271028

Former-commit-id: bfc1e66dfb [formerly af8b97cd3c] [formerly bfc1e66dfb [formerly af8b97cd3c] [formerly 3340a9ddd8 [formerly c436049a244e3a7c0c7fb629673d8f15c46c72a8]]]
Former-commit-id: 3340a9ddd8
Former-commit-id: 9e177f44cd [formerly c904dc42ef]
Former-commit-id: c99aaf6302
2013-02-24 19:13:57 -06:00
Roger Ferrel
85b2b5a12e Issue #1442 Fix null pointer exception in DecisonTree's searchTree
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef

Former-commit-id: 07a103c3bb [formerly 152715160e] [formerly 07a103c3bb [formerly 152715160e] [formerly 09b5996dac [formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]]
Former-commit-id: 09b5996dac
Former-commit-id: 186c71e5ac [formerly fd95a99596]
Former-commit-id: b73720e881
2013-02-22 12:49:53 -06:00
Ben Steffensmeier
ba61a21c10 Issue #1617 fixed vb sounding point selection for points which contain the word Point
Former-commit-id: be95659d4a [formerly 1d8ad288b4] [formerly be95659d4a [formerly 1d8ad288b4] [formerly 5701309bcb [formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]]
Former-commit-id: 5701309bcb
Former-commit-id: 2892e64677 [formerly 7c0f1bf788]
Former-commit-id: 4dad2798e8
2013-02-21 16:28:41 -06:00
Steve Harris
b5d9e75b95 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1]
Former-commit-id: f3c3191a1c
2013-02-21 15:41:39 -06:00
Ben Steffensmeier
6db4b146f6 Issue #1628 lower Xmx on windows in awips.product.
Former-commit-id: 86f30a647d [formerly 62eaf8e947] [formerly 86f30a647d [formerly 62eaf8e947] [formerly 0bb2c03a83 [formerly 39d24c906c0aae925b9c472569c1d9e99dbd6021]]]
Former-commit-id: 0bb2c03a83
Former-commit-id: dd2d3da9bb [formerly 4209a3cfb1]
Former-commit-id: b8ecbb9387
2013-02-21 14:30:41 -06:00
Nate Jensen
98e5133a1c Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
Former-commit-id: 033b9e3852 [formerly a9c4e54287] [formerly 033b9e3852 [formerly a9c4e54287] [formerly 73f53bd513 [formerly 25ecfc3e6199294275abc8547c482388c55be724]]]
Former-commit-id: 73f53bd513
Former-commit-id: 6f9d3f55e5 [formerly d7a57d2b34]
Former-commit-id: 767596401f
2013-02-21 11:41:52 -06:00
Ron Anderson
071b8ec83d Merge "Issue #1506 fix for GFE evaluateRefSet() for non-queries" into development
Former-commit-id: e6ec21bd53 [formerly 03c48b2f7a] [formerly e6ec21bd53 [formerly 03c48b2f7a] [formerly 297c132c49 [formerly 4397b9cad2c75e5d4fa3a1933394fadc8460153a]]]
Former-commit-id: 297c132c49
Former-commit-id: e61af5611a [formerly ff2370221a]
Former-commit-id: 1ce8dad54c
2013-02-21 09:10:07 -06:00
Matt Nash
0b9fcbbffe Issue #1506 fix for GFE evaluateRefSet() for non-queries
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7

Former-commit-id: 6f9621adb2 [formerly 2001d916ac] [formerly 6f9621adb2 [formerly 2001d916ac] [formerly 492df9c238 [formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]]
Former-commit-id: 492df9c238
Former-commit-id: 84f3da4828 [formerly 5d6a7a6140]
Former-commit-id: 441c6646ef
2013-02-21 09:01:33 -06:00
Steve Harris
07e4e4c8fb 13.3.1-1 baseline
Former-commit-id: 96768407a5 [formerly 0563d7ac18] [formerly 96768407a5 [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 0569ff413d [formerly 92e4c7ba19]
Former-commit-id: 654f15be5c
2013-02-21 09:36:59 -05:00
Lee Venable
f28520d007 Merge "Issue #1609 update style rules for msl-P contours" into development
Former-commit-id: b82961dda2 [formerly 46aa0595d8] [formerly b82961dda2 [formerly 46aa0595d8] [formerly 7d2452e0ef [formerly cb89924d5a8a751bd96fdfa3e2ccbed74c3ba815]]]
Former-commit-id: 7d2452e0ef
Former-commit-id: 997cebb2df [formerly fbaf19e184]
Former-commit-id: 146afe1980
2013-02-20 18:03:30 -06:00
Ben Steffensmeier
efe423c8be Issue #1609 update style rules for msl-P contours
Former-commit-id: 6bf304ab80 [formerly e7f73db73c] [formerly 6bf304ab80 [formerly e7f73db73c] [formerly f029f74a4f [formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]]
Former-commit-id: f029f74a4f
Former-commit-id: 894c7e7e62 [formerly 5b9e13aa3d]
Former-commit-id: c46775f84a
2013-02-20 17:27:16 -06:00
Steve Harris
8c828dbd75 13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4]
Former-commit-id: b3b56830b0
2013-02-20 16:19:40 -06:00
Dave Hladky
87cfb35394 Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: e7993c968d [formerly 7b36b055f1] [formerly e7993c968d [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]]
Former-commit-id: 41f2ea7efe
Former-commit-id: 261d00c544 [formerly b1c8f153e0]
Former-commit-id: cd74938355
2013-02-20 16:13:08 -06:00
Mike Duff
bdd93bbc5c Issue #1589 - Fix saving of custom subset areas in spatial subset tab
Change-Id: I4143de4c3ab78a6da4de407d9035e70e264fe95a

Former-commit-id: 4c47ee820d [formerly 1511490c55] [formerly 4c47ee820d [formerly 1511490c55] [formerly f845137930 [formerly 09e0a2450e8e1c860ae3e8d6354320cc0b2b6d88]]]
Former-commit-id: f845137930
Former-commit-id: de3d5aec9a [formerly 7fcd553333]
Former-commit-id: c3d920d204
2013-02-20 14:57:58 -06:00
Nate Jensen
4e60106ebc Issue #1639 Replaced monitor's ConcurrentHashMaps with data structures, removed references to FFMPCacheRecord
Change-Id: I24cbcbfe1b3cc5309a78469da9ba021f6953b0eb

Former-commit-id: e0884ed550 [formerly c2d4f8e164] [formerly e0884ed550 [formerly c2d4f8e164] [formerly e6e2d8905c [formerly 4582146fd6f0ea348c7f4d01fdb68f6473439761]]]
Former-commit-id: e6e2d8905c
Former-commit-id: f5a1165062 [formerly a7b74e1f79]
Former-commit-id: d5dceaaf93
2013-02-20 13:48:26 -06:00
Ron Anderson
b6cd0dfcf8 Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
Former-commit-id: 70050ac749 [formerly f1ad632c3f] [formerly 70050ac749 [formerly f1ad632c3f] [formerly 884d9ff787 [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]]
Former-commit-id: 884d9ff787
Former-commit-id: 744391e3f6 [formerly 2c8d14406b]
Former-commit-id: fa5872a35d
2013-02-19 18:46:16 -06:00
Steve Harris
77a66598fe Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: c2327ce33d [formerly ea50a5db77] [formerly c2327ce33d [formerly ea50a5db77] [formerly d123c044c3 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: 81f1fb83a0 [formerly 1c08acab38]
Former-commit-id: 5a33182da5
2013-02-19 12:22:00 -06:00
Roger Ferrel
2ad4fdd716 Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time.
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869

Former-commit-id: a2e61d32a1 [formerly 1b693994a5] [formerly a2e61d32a1 [formerly 1b693994a5] [formerly 1d51a10f4b [formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 94eb5757b5 [formerly 211a39c333]
Former-commit-id: 47c549c5e8
2013-02-18 12:15:39 -06:00
Richard Peter
1015d581cb Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development
Former-commit-id: 3c126b0ab1 [formerly 355e6d2c67] [formerly 3c126b0ab1 [formerly 355e6d2c67] [formerly 4fb1cb27dc [formerly a07a434ad71986aa4b474dd88e266035e347efa4]]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 4f3d9ab931 [formerly 8991c1c86d]
Former-commit-id: 17dfe3e7fa
2013-02-18 09:35:53 -06:00
Steve Harris
801cddca64 Merge branch 'master_13.2.1' (13.2.1-8) into omaha_13.2.1
Former-commit-id: 15d6e6ad3b [formerly ae66ccc3ee] [formerly 15d6e6ad3b [formerly ae66ccc3ee] [formerly acaef77d90 [formerly 5e40606e95d506d213de3916f0f5d3a4eee7884a]]]
Former-commit-id: acaef77d90
Former-commit-id: 2c7ff9b631 [formerly 8da2277243]
Former-commit-id: ef8c4d6598
2013-02-18 09:14:13 -06:00
Steve Harris
32ad300b47 13.2.1-8 baseline
Former-commit-id: 18da2e93d7 [formerly f81b382c04] [formerly 18da2e93d7 [formerly f81b382c04] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 8cffb55371 [formerly c6d584758f]
Former-commit-id: edac913af7
2013-02-18 09:09:41 -06:00
Ron Anderson
0ef1805569 Merge "Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing UIControllers to be constructed at startup, not on demand." into development
Former-commit-id: cf0fc8d921 [formerly e70cfc5825] [formerly cf0fc8d921 [formerly e70cfc5825] [formerly a6d87cdd7e [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]]
Former-commit-id: a6d87cdd7e
Former-commit-id: 292614bc25 [formerly 999ac02aea]
Former-commit-id: 873a7075ae
2013-02-18 08:31:50 -06:00