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 |
|
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 |
|
Dustin Johnson
|
a9e237eaca
|
Merge "Issue #1620 - Fix set clean issue with job loader." into development
Former-commit-id: 81c261936f [formerly 79718b6a9c] [formerly 83a915210d] [formerly 81c261936f [formerly 79718b6a9c] [formerly 83a915210d] [formerly eff20112d2 [formerly 83a915210d [formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]]]
Former-commit-id: eff20112d2
Former-commit-id: 6b5fdb5672 [formerly b702146272] [formerly 77de144645b1acb61a1f55f57de766de97e3ddb8 [formerly 1255b87e2e]]
Former-commit-id: be882616305c403f60b2fde5a11baec3b0c31e33 [formerly c67c766b34]
Former-commit-id: 36b5228641
|
2013-02-25 09:43:19 -06:00 |
|
Nate Jensen
|
0ce5b4805c
|
Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development
Former-commit-id: 4f3ed0ef67 [formerly 5d7edbc0c1] [formerly b514792bbc] [formerly 4f3ed0ef67 [formerly 5d7edbc0c1] [formerly b514792bbc] [formerly 5d828d4d62 [formerly b514792bbc [formerly 1fec56c55d81b35df45c2266fc234747df3791df]]]]
Former-commit-id: 5d828d4d62
Former-commit-id: 2924ef9340 [formerly 3a66566610] [formerly d6b5c39b47f714b55716489494afc5902a140ab1 [formerly cb37bab362]]
Former-commit-id: 123aed11ae81f496fa2e8c758744d47466e2c0ed [formerly df183bb4da]
Former-commit-id: 55a721ecbe
|
2013-02-25 09:31:55 -06:00 |
|
Nate Jensen
|
8ddaaa2495
|
Merge "Issue #1628 lower Xmx on windows in awips.product." into development
Former-commit-id: df11a1bc40 [formerly ae20ee7665] [formerly c1becf797a] [formerly df11a1bc40 [formerly ae20ee7665] [formerly c1becf797a] [formerly 545caf22fb [formerly c1becf797a [formerly 8525b4ac1db570160253cf7bb180914967e0b647]]]]
Former-commit-id: 545caf22fb
Former-commit-id: 32f74cfe32 [formerly 530d3bfa00] [formerly d31418ec7c77062c9087ed4434fdf6776b2c9630 [formerly 87a745eb2f]]
Former-commit-id: fdec8fafefc3833803048c7d34a1397551444bb2 [formerly ff80c774e3]
Former-commit-id: c0679fd504
|
2013-02-25 09:31:20 -06:00 |
|
Mike Duff
|
d1fec7bb15
|
Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55
Former-commit-id: 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 81649d346a [formerly 8bddd467b1 [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]]
Former-commit-id: 81649d346a
Former-commit-id: 5439b30b6a [formerly 01ef273417] [formerly 3908739d5516b0d12bdcb9c95d991ddec48a13d9 [formerly b1a549a99f]]
Former-commit-id: 0b55db4b6b45148de1eef1eb4f0dbf9090315261 [formerly a92492ed07]
Former-commit-id: 383f5c075e
|
2013-02-25 09:29:16 -06:00 |
|
Steve Harris
|
02f04a926e
|
13.3.1-3 baseline
Former-commit-id: 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]]
Former-commit-id: 8a64f142e5
Former-commit-id: 30efc4c86a [formerly 05eb25f124] [formerly ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3]]
Former-commit-id: 1fe55774d4f2229cf3fdf3a4a342eab88f5b63cd [formerly 1ba778753f]
Former-commit-id: 9da8db0212
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
dbaeb28c82
|
13.3.1-2 baseline
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]]
Former-commit-id: 3d115ed3be
Former-commit-id: f2428e968a [formerly 370ed98038] [formerly 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]]
Former-commit-id: 6be2b60d013b857004e97817b3188f6eb4ae78f5 [formerly 2a2a9e03b7]
Former-commit-id: a43233f8c2
|
2013-02-25 10:18:36 -05:00 |
|
Mike Duff
|
d19843fcd8
|
Issue #1620 - Fix set clean issue with job loader.
Change-Id: I1cf1e109ae3964ef95ebb9a2582622c31e271028
Former-commit-id: 6753072acf [formerly bfc1e66dfb] [formerly af8b97cd3c] [formerly 6753072acf [formerly bfc1e66dfb] [formerly af8b97cd3c] [formerly 3340a9ddd8 [formerly af8b97cd3c [formerly c436049a244e3a7c0c7fb629673d8f15c46c72a8]]]]
Former-commit-id: 3340a9ddd8
Former-commit-id: 421a832657 [formerly 9e177f44cd] [formerly 55cd27a63897002d693beca349d622a730a08c37 [formerly c904dc42ef]]
Former-commit-id: ea10be127643ee154d52ebbfce708af56fd21913 [formerly c99aaf6302]
Former-commit-id: 3c6b26bb58
|
2013-02-24 19:13:57 -06:00 |
|
Roger Ferrel
|
319c1902fb
|
Issue #1442 Fix null pointer exception in DecisonTree's searchTree
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef
Former-commit-id: 4337d23872 [formerly 07a103c3bb] [formerly 152715160e] [formerly 4337d23872 [formerly 07a103c3bb] [formerly 152715160e] [formerly 09b5996dac [formerly 152715160e [formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]]]
Former-commit-id: 09b5996dac
Former-commit-id: 82804ac8bb [formerly 186c71e5ac] [formerly 3f8334cdb8bbe5133624435d74cf48b95e4f2493 [formerly fd95a99596]]
Former-commit-id: 94eb5529969b798e9bdde821c35a3872cd3f3ef6 [formerly b73720e881]
Former-commit-id: 85b2b5a12e
|
2013-02-22 12:49:53 -06:00 |
|
Ben Steffensmeier
|
da06d4860d
|
Issue #1617 fixed vb sounding point selection for points which contain the word Point
Former-commit-id: 581c8ffcd5 [formerly be95659d4a] [formerly 1d8ad288b4] [formerly 581c8ffcd5 [formerly be95659d4a] [formerly 1d8ad288b4] [formerly 5701309bcb [formerly 1d8ad288b4 [formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]]]
Former-commit-id: 5701309bcb
Former-commit-id: 3dd76fdb04 [formerly 2892e64677] [formerly fded4c4c5e2d488ca4c56730b284454ede5f92c1 [formerly 7c0f1bf788]]
Former-commit-id: 4ac4da0e3a41ac7f07b242a496793956ec07fffc [formerly 4dad2798e8]
Former-commit-id: ba61a21c10
|
2013-02-21 16:28:41 -06:00 |
|
Steve Harris
|
34d0f59592
|
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: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684 [formerly 4f155a183a] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c]
Former-commit-id: b5d9e75b95
|
2013-02-21 15:41:39 -06:00 |
|
Ben Steffensmeier
|
a62b22afdf
|
Issue #1628 lower Xmx on windows in awips.product.
Former-commit-id: cb45175375 [formerly 86f30a647d] [formerly 62eaf8e947] [formerly cb45175375 [formerly 86f30a647d] [formerly 62eaf8e947] [formerly 0bb2c03a83 [formerly 62eaf8e947 [formerly 39d24c906c0aae925b9c472569c1d9e99dbd6021]]]]
Former-commit-id: 0bb2c03a83
Former-commit-id: 45bde9d742 [formerly dd2d3da9bb] [formerly 8b8fa33b6ea614af1b029854cb81e6b6be529d48 [formerly 4209a3cfb1]]
Former-commit-id: 7cc2d67e1b60a9cebbaf143d937f976502ca23c9 [formerly b8ecbb9387]
Former-commit-id: 6db4b146f6
|
2013-02-21 14:30:41 -06:00 |
|
Nate Jensen
|
a29dcc879f
|
Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
Former-commit-id: a8e81097fc [formerly 033b9e3852] [formerly a9c4e54287] [formerly a8e81097fc [formerly 033b9e3852] [formerly a9c4e54287] [formerly 73f53bd513 [formerly a9c4e54287 [formerly 25ecfc3e6199294275abc8547c482388c55be724]]]]
Former-commit-id: 73f53bd513
Former-commit-id: e19664ab18 [formerly 6f9d3f55e5] [formerly 82a8e0c1fe20524fc0676db0dbd1c0079f46a300 [formerly d7a57d2b34]]
Former-commit-id: 280cd5c23fc512c656015c651483ee802f2f1629 [formerly 767596401f]
Former-commit-id: 98e5133a1c
|
2013-02-21 11:41:52 -06:00 |
|
Ron Anderson
|
77bc04b6e3
|
Merge "Issue #1506 fix for GFE evaluateRefSet() for non-queries" into development
Former-commit-id: 1661ad92f7 [formerly e6ec21bd53] [formerly 03c48b2f7a] [formerly 1661ad92f7 [formerly e6ec21bd53] [formerly 03c48b2f7a] [formerly 297c132c49 [formerly 03c48b2f7a [formerly 4397b9cad2c75e5d4fa3a1933394fadc8460153a]]]]
Former-commit-id: 297c132c49
Former-commit-id: bcc9d63d9c [formerly e61af5611a] [formerly 53f8f259a85445c95a55275d90e6cf60b6620316 [formerly ff2370221a]]
Former-commit-id: 2f22e908caa09e64a917202c56e130e760b37a25 [formerly 1ce8dad54c]
Former-commit-id: 071b8ec83d
|
2013-02-21 09:10:07 -06:00 |
|
Matt Nash
|
be1f1cafe2
|
Issue #1506 fix for GFE evaluateRefSet() for non-queries
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7
Former-commit-id: 0531052a2e [formerly 6f9621adb2] [formerly 2001d916ac] [formerly 0531052a2e [formerly 6f9621adb2] [formerly 2001d916ac] [formerly 492df9c238 [formerly 2001d916ac [formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]]]
Former-commit-id: 492df9c238
Former-commit-id: eec2ea4c29 [formerly 84f3da4828] [formerly 210f7f89643e818406eeea19775de2c66f16305d [formerly 5d6a7a6140]]
Former-commit-id: afee424508fdddde05cd4cae61c337e640cc007a [formerly 441c6646ef]
Former-commit-id: 0b9fcbbffe
|
2013-02-21 09:01:33 -06:00 |
|
Steve Harris
|
067dfcb980
|
13.3.1-1 baseline
Former-commit-id: 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 96c7269df0 [formerly 0569ff413d] [formerly c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19]]
Former-commit-id: a43ccc92cdffebafcecdfdadcfc25825beb32b12 [formerly 654f15be5c]
Former-commit-id: 07e4e4c8fb
|
2013-02-21 09:36:59 -05:00 |
|
Lee Venable
|
e968e3f841
|
Merge "Issue #1609 update style rules for msl-P contours" into development
Former-commit-id: e83cd69075 [formerly b82961dda2] [formerly 46aa0595d8] [formerly e83cd69075 [formerly b82961dda2] [formerly 46aa0595d8] [formerly 7d2452e0ef [formerly 46aa0595d8 [formerly cb89924d5a8a751bd96fdfa3e2ccbed74c3ba815]]]]
Former-commit-id: 7d2452e0ef
Former-commit-id: 1f81a1c057 [formerly 997cebb2df] [formerly bc9255bcfe995e0997dcec117989f12c5ada3a41 [formerly fbaf19e184]]
Former-commit-id: f11e923129482c8553ea619f30de556166d05407 [formerly 146afe1980]
Former-commit-id: f28520d007
|
2013-02-20 18:03:30 -06:00 |
|
Ben Steffensmeier
|
666d742d4b
|
Issue #1609 update style rules for msl-P contours
Former-commit-id: bf9f3344d1 [formerly 6bf304ab80] [formerly e7f73db73c] [formerly bf9f3344d1 [formerly 6bf304ab80] [formerly e7f73db73c] [formerly f029f74a4f [formerly e7f73db73c [formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]]]
Former-commit-id: f029f74a4f
Former-commit-id: 070d80adf5 [formerly 894c7e7e62] [formerly f250772b236ea3b33c3494e51227e59db759d9a3 [formerly 5b9e13aa3d]]
Former-commit-id: ed9d727925cc8953906081c442b4a6718dc5a1b4 [formerly c46775f84a]
Former-commit-id: efe423c8be
|
2013-02-20 17:27:16 -06:00 |
|
Steve Harris
|
fac2d20002
|
13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
|
2013-02-20 16:19:40 -06:00 |
|
Dave Hladky
|
94b8025274
|
Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526
Former-commit-id: fdfbf59dba [formerly e7993c968d] [formerly 7b36b055f1] [formerly fdfbf59dba [formerly e7993c968d] [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 7b36b055f1 [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]]]
Former-commit-id: 41f2ea7efe
Former-commit-id: f439b63316 [formerly 261d00c544] [formerly 1169eb8cd11a2b8565eaf5607902f6898450127b [formerly b1c8f153e0]]
Former-commit-id: bcadc59b9fd827ba70895359ecdc846ddaa9d826 [formerly cd74938355]
Former-commit-id: 87cfb35394
|
2013-02-20 16:13:08 -06:00 |
|
Mike Duff
|
6fdc35e852
|
Issue #1589 - Fix saving of custom subset areas in spatial subset tab
Change-Id: I4143de4c3ab78a6da4de407d9035e70e264fe95a
Former-commit-id: 9dfaee98a1 [formerly 4c47ee820d] [formerly 1511490c55] [formerly 9dfaee98a1 [formerly 4c47ee820d] [formerly 1511490c55] [formerly f845137930 [formerly 1511490c55 [formerly 09e0a2450e8e1c860ae3e8d6354320cc0b2b6d88]]]]
Former-commit-id: f845137930
Former-commit-id: 9556ed337a [formerly de3d5aec9a] [formerly c5cf862b37d59c7a0d7c772771e98991dc35ae40 [formerly 7fcd553333]]
Former-commit-id: 13034b2ff2275b83988386f06439a4f5b55be274 [formerly c3d920d204]
Former-commit-id: bdd93bbc5c
|
2013-02-20 14:57:58 -06:00 |
|
Nate Jensen
|
8369415114
|
Issue #1639 Replaced monitor's ConcurrentHashMaps with data structures, removed references to FFMPCacheRecord
Change-Id: I24cbcbfe1b3cc5309a78469da9ba021f6953b0eb
Former-commit-id: 376a966852 [formerly e0884ed550] [formerly c2d4f8e164] [formerly 376a966852 [formerly e0884ed550] [formerly c2d4f8e164] [formerly e6e2d8905c [formerly c2d4f8e164 [formerly 4582146fd6f0ea348c7f4d01fdb68f6473439761]]]]
Former-commit-id: e6e2d8905c
Former-commit-id: 04a141d30f [formerly f5a1165062] [formerly 7a4a9a6467cfdc2321c93cb906bc1f8119346908 [formerly a7b74e1f79]]
Former-commit-id: 02a86aa61d381a3eb1fd574569d758e80b888682 [formerly d5dceaaf93]
Former-commit-id: 4e60106ebc
|
2013-02-20 13:48:26 -06:00 |
|
Ron Anderson
|
0b173f616b
|
Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
Former-commit-id: 9c2caa95a0 [formerly 70050ac749] [formerly f1ad632c3f] [formerly 9c2caa95a0 [formerly 70050ac749] [formerly f1ad632c3f] [formerly 884d9ff787 [formerly f1ad632c3f [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]]]
Former-commit-id: 884d9ff787
Former-commit-id: c0364ee665 [formerly 744391e3f6] [formerly 0135351e11c5776ecfe36b40d5d95a0c1101bb82 [formerly 2c8d14406b]]
Former-commit-id: 1338a5bc6e6053c9351096c4a9796a28b268cf42 [formerly fa5872a35d]
Former-commit-id: b6cd0dfcf8
|
2013-02-19 18:46:16 -06:00 |
|
Steve Harris
|
b7446ac966
|
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]]
Former-commit-id: d123c044c3
Former-commit-id: bca88ba9c7 [formerly 81f1fb83a0] [formerly d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]]
Former-commit-id: cb9ccc383baf32e35d0325fdfa001bdd7a62b969 [formerly 5a33182da5]
Former-commit-id: 77a66598fe
|
2013-02-19 12:22:00 -06:00 |
|
Roger Ferrel
|
ab0cd11f05
|
Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time.
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869
Former-commit-id: 28b0f753fc [formerly a2e61d32a1] [formerly 1b693994a5] [formerly 28b0f753fc [formerly a2e61d32a1] [formerly 1b693994a5] [formerly 1d51a10f4b [formerly 1b693994a5 [formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 317076ce71 [formerly 94eb5757b5] [formerly 1c5d3ed74cec47761bf7aea165a116a3c8bbdfbb [formerly 211a39c333]]
Former-commit-id: 880690b23901c9260b2426b9fd30de2f3246ada2 [formerly 47c549c5e8]
Former-commit-id: 2ad4fdd716
|
2013-02-18 12:15:39 -06:00 |
|
Richard Peter
|
f68b77486c
|
Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development
Former-commit-id: 05f5f4daf3 [formerly 3c126b0ab1] [formerly 355e6d2c67] [formerly 05f5f4daf3 [formerly 3c126b0ab1] [formerly 355e6d2c67] [formerly 4fb1cb27dc [formerly 355e6d2c67 [formerly a07a434ad71986aa4b474dd88e266035e347efa4]]]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 9c0ff50ba0 [formerly 4f3d9ab931] [formerly 434b4343506bf7b287825895ce602614fe47b40d [formerly 8991c1c86d]]
Former-commit-id: 97a2343cd226d8cc1142caa36a35e45f736cc748 [formerly 17dfe3e7fa]
Former-commit-id: 1015d581cb
|
2013-02-18 09:35:53 -06:00 |
|
Steve Harris
|
af2af79901
|
Merge branch 'master_13.2.1' (13.2.1-8) into omaha_13.2.1
Former-commit-id: 8a9c021b70 [formerly 15d6e6ad3b] [formerly ae66ccc3ee] [formerly 8a9c021b70 [formerly 15d6e6ad3b] [formerly ae66ccc3ee] [formerly acaef77d90 [formerly ae66ccc3ee [formerly 5e40606e95d506d213de3916f0f5d3a4eee7884a]]]]
Former-commit-id: acaef77d90
Former-commit-id: e6f3a88bd9 [formerly 2c7ff9b631] [formerly 2db0d95e2593fe2ab6b520361f1d9c77362404b7 [formerly 8da2277243]]
Former-commit-id: b821c113c7b37010e8bf0ceba0e3fe3e9235f7ad [formerly ef8c4d6598]
Former-commit-id: 801cddca64
|
2013-02-18 09:14:13 -06:00 |
|
Steve Harris
|
0b53108cbe
|
13.2.1-8 baseline
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]]
Former-commit-id: 053156f02e
Former-commit-id: db02d32440 [formerly 8cffb55371] [formerly 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]]
Former-commit-id: db6d42ff3ca25509616d69de95cc4fe49742d3a6 [formerly edac913af7]
Former-commit-id: 32ad300b47
|
2013-02-18 09:09:41 -06:00 |
|
Ron Anderson
|
0905d89d82
|
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: 7d09df8468 [formerly cf0fc8d921] [formerly e70cfc5825] [formerly 7d09df8468 [formerly cf0fc8d921] [formerly e70cfc5825] [formerly a6d87cdd7e [formerly e70cfc5825 [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]]]
Former-commit-id: a6d87cdd7e
Former-commit-id: d09967b88e [formerly 292614bc25] [formerly a76fdb7843d8fd407d0de1a07b1a83103ec4b3cb [formerly 999ac02aea]]
Former-commit-id: 4c0f9ed64af1f60856fe2c18a9e55d7ba0c70cc5 [formerly 873a7075ae]
Former-commit-id: 0ef1805569
|
2013-02-18 08:31:50 -06:00 |
|
Steve Harris
|
77dbde9e45
|
13.2.1-8 baseline
Former-commit-id: 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 535a9402a7 [formerly 27d88edcb9 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]]]
Former-commit-id: 535a9402a7
Former-commit-id: 825a99770d [formerly 58bafc0068] [formerly 0a9388f77add45c1702ce16113b0c20068e2d223 [formerly a68ce64f45]]
Former-commit-id: 0d9c5ea952e6d4f898bb127acdeb6807009e309c [formerly 7b6e374314]
Former-commit-id: 933e9f3f75
|
2013-02-18 09:23:06 -05:00 |
|
Mike Duff
|
833e5aaf24
|
Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c
Former-commit-id: 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 0b044dba9c [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 6628aea419 [formerly 3e59308771] [formerly 269babb3d811c862c91f7c6f2b44a05605b7552e [formerly 079ec4b6dd]]
Former-commit-id: ee93310e9d4290c2cb2fd40f2f7c40a19a16c41c [formerly 72f6e95a67]
Former-commit-id: 2aee18ea9d
|
2013-02-18 08:16:57 -06:00 |
|
Richard Peter
|
5a421161ec
|
Merge "Issue #1506 move away from using QueryScript on the UI thread, except where absolutely necessary we can run a synchronous operation" into development
Former-commit-id: c8d46448bf [formerly 5bf0e0e999] [formerly 51533ccab2] [formerly c8d46448bf [formerly 5bf0e0e999] [formerly 51533ccab2] [formerly 70f270ff16 [formerly 51533ccab2 [formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]]]
Former-commit-id: 70f270ff16
Former-commit-id: 67a541c54a [formerly 1b112227a8] [formerly 5a84f9cf95566309fac283f2dc58dcbbe30280d4 [formerly 2299503559]]
Former-commit-id: 731b14d859308293a63f393368a707557b046072 [formerly 73501955ff]
Former-commit-id: 3b53668cbe
|
2013-02-15 16:40:04 -06:00 |
|
Richard Peter
|
3ba74383cd
|
Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
Former-commit-id: 69897b3aa2 [formerly b3e2ca7b30] [formerly a40ae4d8b2] [formerly 69897b3aa2 [formerly b3e2ca7b30] [formerly a40ae4d8b2] [formerly a6fa92923f [formerly a40ae4d8b2 [formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]]]
Former-commit-id: a6fa92923f
Former-commit-id: 720f324789 [formerly 774ea0ede6] [formerly 8f5d31cba589ac5b371ec575b4cd127eeae8019e [formerly 5936f671ce]]
Former-commit-id: 01c4bd0a41aa710880dcc6ad9ca340bc657994fc [formerly b5706ca6cf]
Former-commit-id: 107393f436
|
2013-02-15 16:33:00 -06:00 |
|
Ron Anderson
|
31b32ef36e
|
Issue #1629 fix error storing preferences in GIS Viewer
Change-Id: Id677dd9206c16f8c95b022e31fcac7acc6b07eb6
Former-commit-id: 4b871f33cc [formerly d4a915b48d] [formerly 689c32a9c3] [formerly 4b871f33cc [formerly d4a915b48d] [formerly 689c32a9c3] [formerly 354d8b0366 [formerly 689c32a9c3 [formerly 7d73fd3f0f2d8ebbbf75d5928b06202f5f7cd42a]]]]
Former-commit-id: 354d8b0366
Former-commit-id: 9fa2a2b3f0 [formerly ca6ca60f22] [formerly 936c2dfeb6b936ee28f4a3df3ab76ed70aa003e9 [formerly 4334fab2f9]]
Former-commit-id: b5e0c6c5035d61de08aea647426f2c73337dcbd9 [formerly 50be79358b]
Former-commit-id: e524bec079
|
2013-02-15 13:44:52 -06:00 |
|
David Gillingham
|
7a0a1dd692
|
Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing
UIControllers to be constructed at startup, not on demand.
Change-Id: Ifb492171ac4720e36f68da082c38d31c1de08132
Former-commit-id: 65b1aeb7f3 [formerly 9fae6695e2] [formerly 871364d630] [formerly 65b1aeb7f3 [formerly 9fae6695e2] [formerly 871364d630] [formerly da091b723d [formerly 871364d630 [formerly 463af46e64ed667efbc840d85f9babf3449780cc]]]]
Former-commit-id: da091b723d
Former-commit-id: 67c98b866c [formerly cc05bdae4e] [formerly 2d27bf86785994cdfd9f88f8093afe2f1d435b78 [formerly 244bc9b270]]
Former-commit-id: e5d229d182b312a0ea98f46be0d02c162ae2927f [formerly 345288aa13]
Former-commit-id: f21dbe9026
|
2013-02-15 12:50:48 -06:00 |
|
Jonathan Sanchez
|
4b328b176b
|
Issue #1624 Temporary fix for NullPointerException.
Former-commit-id: b07504916f [formerly 18dd00e488] [formerly f507d23fed] [formerly b07504916f [formerly 18dd00e488] [formerly f507d23fed] [formerly fea6b44036 [formerly f507d23fed [formerly f95a402347ae45ad133206bfea796b240decf0a6]]]]
Former-commit-id: fea6b44036
Former-commit-id: b4a051cf83 [formerly 763280dd53] [formerly 81c45a8e55f371727b4db8a17400440ba254b82d [formerly 1486022395]]
Former-commit-id: d780039d073d423891dd82a2fec80143fea07b85 [formerly f948e7b5b6]
Former-commit-id: 3f13abe62a
|
2013-02-15 12:31:21 -06:00 |
|
Lee Venable
|
aef9a5f0f3
|
Merge "Issue #1607 Added time variables for CORs." into development
Former-commit-id: 7d85071ae2 [formerly 628d0d9840] [formerly d94233499a] [formerly 7d85071ae2 [formerly 628d0d9840] [formerly d94233499a] [formerly 91e016aa34 [formerly d94233499a [formerly 7a6200d4bfe21feb6e29603dd638876f50a66162]]]]
Former-commit-id: 91e016aa34
Former-commit-id: b241812a72 [formerly 5ec5918e45] [formerly 071a283e723cacbd51481fa4c13e68fbca37df1d [formerly 38bbca4895]]
Former-commit-id: 696e9e4654013a5bc540cf047ca346b110f34cfc [formerly 8b3c710869]
Former-commit-id: 3e7f56375b
|
2013-02-15 12:08:15 -06:00 |
|
Nate Jensen
|
879a900b70
|
Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development
Former-commit-id: 8722cf18fa [formerly 1b1e468e1f] [formerly f748815e22] [formerly 8722cf18fa [formerly 1b1e468e1f] [formerly f748815e22] [formerly f79f7db348 [formerly f748815e22 [formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]]]
Former-commit-id: f79f7db348
Former-commit-id: 218d26f676 [formerly d6ba283efc] [formerly 46c56447c7896eda732cfe5904eeba4f40dbdfdd [formerly a60cf277bc]]
Former-commit-id: 7e273a1af1c051cdb183b6e89e8ce66cc2aff3ba [formerly 1501b0f1e3]
Former-commit-id: 7bcb70160d
|
2013-02-15 11:56:11 -06:00 |
|
Ben Steffensmeier
|
2e69059ebf
|
Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798
Former-commit-id: d35b79d537 [formerly e771076275] [formerly 1393f3e3cf] [formerly d35b79d537 [formerly e771076275] [formerly 1393f3e3cf] [formerly 0933a5f596 [formerly 1393f3e3cf [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]]]
Former-commit-id: 0933a5f596
Former-commit-id: a0f06eff69 [formerly 91bbdc3337] [formerly 133a0064f1bda2cc9d635ce7bed097b681dd8dd1 [formerly f0f3c71d50]]
Former-commit-id: 7663061c777f8924db2896bd3ceb46d59c111226 [formerly f868f66f76]
Former-commit-id: e6fc131343
|
2013-02-15 11:39:56 -06:00 |
|
Ron Anderson
|
2028f94bb8
|
Issue #1629 Attempt to fix error saving preferences in GIS Viewer
Change-Id: I982637de1cc898d9887849a8276a3693b9579d5b
Former-commit-id: 528ce62800 [formerly 3033238f1b] [formerly d574da6155] [formerly 528ce62800 [formerly 3033238f1b] [formerly d574da6155] [formerly b76653a885 [formerly d574da6155 [formerly f0d1aa59c4971ed523e4f26b440134a417aec5d0]]]]
Former-commit-id: b76653a885
Former-commit-id: ffa635c5c3 [formerly 632bd48a45] [formerly 085730a171749caf4793b166e229b9102825e3a8 [formerly df84bf7f86]]
Former-commit-id: efe48d640426e2f69827aeacbd71a44c99dfe221 [formerly 95fd1b2d64]
Former-commit-id: 46f006d12a
|
2013-02-15 11:13:43 -06:00 |
|
Jonathan Sanchez
|
dd1a0d1096
|
Issue #1607 Added time variables for CORs.
Former-commit-id: 092014d433 [formerly 38802d3df8] [formerly 6d968dc09d] [formerly 092014d433 [formerly 38802d3df8] [formerly 6d968dc09d] [formerly 3025639923 [formerly 6d968dc09d [formerly 311f633ba47efcf3b13f77867e1fa32a584f3232]]]]
Former-commit-id: 3025639923
Former-commit-id: f47b82e1ae [formerly 352d3dea5a] [formerly 82add2e0659e51786287108a10a857ffcdbfc0c4 [formerly bb797eeb74]]
Former-commit-id: 42efe0c54e982a8f2f118871e2f1ee9e69586064 [formerly e7a2a2f99c]
Former-commit-id: f6244fb198
|
2013-02-15 09:59:12 -06:00 |
|
Ron Anderson
|
46248d1c10
|
Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: 9156b9ffe8 [formerly dc7c9edb87] [formerly a2a89fb4e7] [formerly 9156b9ffe8 [formerly dc7c9edb87] [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: 12f2ac0171 [formerly d69d628450] [formerly 05e20f4050e6fac5a3d4a69d2e1baa354ff73eaf [formerly e952a4f179]]
Former-commit-id: af2b3c67dc766d6b95ad299a4853ebd80437f7e4 [formerly 45627edcc7]
Former-commit-id: 80df624bb3
|
2013-02-15 09:03:41 -06:00 |
|
Dustin Johnson
|
5f7a161077
|
Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41
Former-commit-id: c638eca350 [formerly 4be6c12ac6] [formerly 714ea1c8d8] [formerly c638eca350 [formerly 4be6c12ac6] [formerly 714ea1c8d8] [formerly 6e2f69939f [formerly 714ea1c8d8 [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]]]
Former-commit-id: 6e2f69939f
Former-commit-id: 72cb5b436b [formerly d0ecd69456] [formerly 11d3a956bd7f1cc9a0583c0a5584b6470fe49630 [formerly 1ef440f8ee]]
Former-commit-id: 7cc6a0aaad6eada373e1fab36c85062f70d96699 [formerly f14bedec28]
Former-commit-id: 12d4b055f6
|
2013-02-15 08:13:11 -06:00 |
|
Nate Jensen
|
8b589c3e08
|
Merge "Issue #1627 Sped up FFMp load by removing un-needed DB calls." into development
Former-commit-id: 7b50014701 [formerly be680f2523] [formerly 7cf29fbf39] [formerly 7b50014701 [formerly be680f2523] [formerly 7cf29fbf39] [formerly 6d8b8dd774 [formerly 7cf29fbf39 [formerly c83110e509d662da0a4b1975bc1044fb7ffadb9e]]]]
Former-commit-id: 6d8b8dd774
Former-commit-id: 2ea8bed072 [formerly ebb3394719] [formerly 36514f8fcd747455dbc8fbd4296f690655aa80f6 [formerly 0ce3009528]]
Former-commit-id: 5e0f6f6b7da0e95582a1fbcc76513a74d676f803 [formerly b9e978a6e2]
Former-commit-id: c2f53b312f
|
2013-02-14 16:39:23 -06:00 |
|
Ben Steffensmeier
|
0713bb380c
|
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: bd6e0f8462 [formerly 1940a92596] [formerly aa4c7526ff] [formerly bd6e0f8462 [formerly 1940a92596] [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly aa4c7526ff [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: 4140260659 [formerly 086f6aabe9] [formerly badd785e8aa7a433093d24b4c4bf0d45450daf4a [formerly 455aa4628f]]
Former-commit-id: 03ba4f1d1c1eb50df898c9573eb2b7f62eaa5359 [formerly 49b700da85]
Former-commit-id: c300faa186
|
2013-02-14 15:34:25 -06:00 |
|
Dave Hladky
|
ecfe551b6d
|
Issue #1627 Sped up FFMp load by removing un-needed DB calls.
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956
Former-commit-id: 51e0b648c2 [formerly 83fe9ca104] [formerly 8247da158f] [formerly 51e0b648c2 [formerly 83fe9ca104] [formerly 8247da158f] [formerly a8f6635a6f [formerly 8247da158f [formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]]]
Former-commit-id: a8f6635a6f
Former-commit-id: 7dd7e3c60a [formerly 7f6381ec5c] [formerly 43df1692452b561e0563a12fb2d7b4e6d7f53414 [formerly 4cd9b2e8b2]]
Former-commit-id: e0d49c1f1534ab2b49b2d790d4536f6686d09b03 [formerly 7b723067a4]
Former-commit-id: 8810b8e486
|
2013-02-14 15:12:29 -06:00 |
|
Nate Jensen
|
d1a3b6e935
|
Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
Former-commit-id: ed195ae9e4 [formerly 5526ee7e8d] [formerly 1144f08e59] [formerly ed195ae9e4 [formerly 5526ee7e8d] [formerly 1144f08e59] [formerly a3e0bf09ab [formerly 1144f08e59 [formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]]]
Former-commit-id: a3e0bf09ab
Former-commit-id: 3724151397 [formerly b4aea0385c] [formerly b34b2a8b576d4d26a79a47c3f0f154dd8bdc4ee2 [formerly 3f5b8b56ef]]
Former-commit-id: 91f25cfaf95919e31517e76aa9628851f20000cc [formerly 2422d17df3]
Former-commit-id: 498c622823
|
2013-02-14 15:05:14 -06:00 |
|