Commit graph

81 commits

Author SHA1 Message Date
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
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
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
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
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
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
Roger Ferrel
375bf4d951 Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away.
Change-Id: I7716af97c3a94f2243be1b219ed9f91c7b67c0d8

Former-commit-id: 67ea75b00c [formerly bfb9f9f156] [formerly 2b509cf7de] [formerly 67ea75b00c [formerly bfb9f9f156] [formerly 2b509cf7de] [formerly e26689a487 [formerly 2b509cf7de [formerly 9ac5a199108a1e1d106a79e67cd6209bd46134cb]]]]
Former-commit-id: e26689a487
Former-commit-id: c9cf643894 [formerly 951e5b237d] [formerly 683835359834ffdf46d9f8b203a98db8326d8f6d [formerly e7bae3c272]]
Former-commit-id: 39d07fea5f37b461ba6c4a084242bc05247a68c0 [formerly b47d03b1bc]
Former-commit-id: 8e376de359
2013-02-13 16:45:52 -06:00
Steve Harris
b43935a991 13.2.1-6 baseline
Former-commit-id: 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 5027d2365b [formerly bbe92e6824] [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d [formerly 30d38334cc]]
Former-commit-id: 0cd3f4b5889bda9de32b546358edf3d8210d3ad8 [formerly 0c128dd8f0]
Former-commit-id: dc55ef579a
2013-02-07 16:00:39 -06:00
Steve Harris
e91c865ccd Merge branch '13.2.1_delivery' into development
Former-commit-id: 953bec4467 [formerly da43a7a8ca] [formerly 4bc8e9ab5c] [formerly 953bec4467 [formerly da43a7a8ca] [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 4bc8e9ab5c [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]]
Former-commit-id: 5ee47e098d
Former-commit-id: 3ee627253f [formerly b119d66cda] [formerly 0d3c30007ccec08e7c869bfdb97fef5b71783b3b [formerly 3ad515e28f]]
Former-commit-id: 57f644770a496fa44b6b32dc022210ab2e19666c [formerly d73efe8e86]
Former-commit-id: a11c8dff6d
2013-02-06 11:12:01 -06:00
Steve Harris
2ccf38754d Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 44a4287812 [formerly 14f23d4227] [formerly a16ac7819c] [formerly 44a4287812 [formerly 14f23d4227] [formerly a16ac7819c] [formerly 6c6b53679b [formerly a16ac7819c [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]]
Former-commit-id: 6c6b53679b
Former-commit-id: 63b36d8670 [formerly 48a0ffda4d] [formerly 5a2f1703799bcf7b130380bb73001e518a88ee6d [formerly 28ddc9bad8]]
Former-commit-id: 6f45b04bcc29948b273c8b6c0ae71fe396db790a [formerly f028c16f79]
Former-commit-id: f997ecea38
2013-02-06 11:08:53 -06:00
Steve Harris
6cef082440 13.2.1-5 baseline
Former-commit-id: 7e1236c17c [formerly a6b3cde1ff] [formerly 232734091d] [formerly 7e1236c17c [formerly a6b3cde1ff] [formerly 232734091d] [formerly 146fcc6da8 [formerly 232734091d [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 5d64cfc298 [formerly 7497a15e22] [formerly 49d71a590915a63b8746aa7ff8b66241cdada3aa [formerly 1c602ec3a7]]
Former-commit-id: 1b1ed3d8dd018c07b00ccdca9330d598dd62ac67 [formerly bb0759d5ad]
Former-commit-id: f36867a520
2013-02-06 11:02:32 -06:00
David Gillingham
1865f716e4 Issue #1559: Fix port error in SmartScript.getGridCellSwath().
Change-Id: If435423a8277f852b3ceb0a7299332ece800696f

Former-commit-id: 6899606e1f [formerly 6f6534649a] [formerly 292bd811a0] [formerly 6899606e1f [formerly 6f6534649a] [formerly 292bd811a0] [formerly 49a4e1c39d [formerly 292bd811a0 [formerly 2e2be1d031a93f0fe13c17788eabff34ab428caa]]]]
Former-commit-id: 49a4e1c39d
Former-commit-id: b534934cef [formerly 3a13421305] [formerly 8ff0ac87efc91f6bc060b2b80e8b99244951754e [formerly 62f30014f0]]
Former-commit-id: c606519ad3c717cadf781cc61b4af46c8de5f8e7 [formerly d8eb0b96dd]
Former-commit-id: 54e5481d09
2013-01-31 12:00:38 -06:00
Steve Harris
bafb9234f2 13.2.1-4 baseline
Former-commit-id: ed224fde88 [formerly ae2859d5a2] [formerly 8f2e7d4437] [formerly ed224fde88 [formerly ae2859d5a2] [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly 8f2e7d4437 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: d6b48ca411 [formerly 3f25b862c8] [formerly 10a61c775941bb43691425e06f2cf4ac1116da55 [formerly 2998f750f4]]
Former-commit-id: 145f6b5c4d69d5e7db5b971374ee6cd59cc6e57e [formerly 0a4ef8c084]
Former-commit-id: 5ae95b956b
2013-01-31 11:40:31 -06:00
Steve Harris
a8d7e2a51a Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]]
Former-commit-id: ec56acde81
Former-commit-id: 41b14f0fa2 [formerly 73d9455c65] [formerly 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]]
Former-commit-id: 96b2d429acce04d3a7b895e5c4de0e318433555e [formerly a74d58ce6f]
Former-commit-id: 2107a54161
2013-01-31 10:19:14 -06:00
Steve Harris
3165545bb6 Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]]
Former-commit-id: 6040272573
Former-commit-id: c9bc690eca [formerly 75f6e61e6f] [formerly 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f]]
Former-commit-id: 97adf3dc9cd6eed17f75fee6569131485caea1a3 [formerly ba97151132]
Former-commit-id: 99bc358644
2013-01-29 15:57:21 -06:00
Steve Harris
d552dc5ffb 13.2.1-3 baseline
Former-commit-id: b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: 03989493ae [formerly daca1c3e73] [formerly aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be]]
Former-commit-id: 4abc68d3bc26a4259383e44830f853678146e7ed [formerly dbaf4a3e39]
Former-commit-id: 9ab34b7aeb
2013-01-29 15:52:43 -06:00
Steve Harris
5d7a0ba9af 13.2.1-2 baseline
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 0f4fcd0ba8 [formerly 251a9c0195] [formerly 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]]
Former-commit-id: a3e63c2bb7b23736c07cc90370ea39a5d96fd1a5 [formerly 27706b8dcb]
Former-commit-id: eafa141b90
2013-01-25 09:07:12 -06:00
Ben Steffensmeier
ae9f2caa73 Issue #1479 fix mod families
Former-commit-id: dec6cf6e9d [formerly 735add55ba] [formerly 13fd813660] [formerly dec6cf6e9d [formerly 735add55ba] [formerly 13fd813660] [formerly a7989d4638 [formerly 13fd813660 [formerly 76b5a4fcf313e2a028662a1e07871fff2e328d48]]]]
Former-commit-id: a7989d4638
Former-commit-id: d06eb6312e [formerly 3dfe43caac] [formerly 17cbebf191acc2d92271b74e20f9bb5df587b7a1 [formerly fbd614258f]]
Former-commit-id: ddd0166886969a5e01fb56ad440b559e700f192c [formerly d5e0e015b3]
Former-commit-id: 2c863705f7
2013-01-23 15:47:30 -06:00
Steve Harris
264b5bb073 13.2.1-3 baseline
Former-commit-id: 7d2e979c51 [formerly a5a0da5c02] [formerly 7435527b25] [formerly 7d2e979c51 [formerly a5a0da5c02] [formerly 7435527b25] [formerly 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: d069467e81 [formerly 9d248cff7a] [formerly 32e4736725f3f6d880854f4dba7503e4939e28b7 [formerly cc0fdef15c]]
Former-commit-id: 1062fcca38400bed252816a16308c04554196b61 [formerly 082e66584a]
Former-commit-id: ab562e22a4
2013-01-23 11:24:17 -05:00
Steve Harris
b92dfd1b62 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
2013-01-23 11:18:44 -05:00
Steve Harris
2c834d0f58 13.2.1-1 baseline
Former-commit-id: 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 1d1791b3b4 [formerly 8ed6a53113] [formerly b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf]]
Former-commit-id: c7cd6e75591b001d138f41ea10b2ed691477e255 [formerly 9146e727f9]
Former-commit-id: 08bf724a6c
2013-01-23 11:13:03 -05:00
Ben Steffensmeier
aeeae8dde3 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 3802dad955 [formerly a9654f859a] [formerly f0af056d97] [formerly 3802dad955 [formerly a9654f859a] [formerly f0af056d97] [formerly ec199ad7d1 [formerly f0af056d97 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]]]
Former-commit-id: ec199ad7d1
Former-commit-id: d270c16979 [formerly 50d1561165] [formerly 08da3e13f0dfa4e1eab04881e0b72815afc9b88a [formerly 3bfba5b771]]
Former-commit-id: 378f6595a0ecbd00464d01161dfb30503bf9e8c4 [formerly ca6ab4a945]
Former-commit-id: 8d6d821ac0
2013-01-18 10:59:43 -06:00
Steve Harris
f3e43ecb33 13.1.2-10 baseline
Former-commit-id: 5b617e763b [formerly 683193255d] [formerly 68dde17de2] [formerly 5b617e763b [formerly 683193255d] [formerly 68dde17de2] [formerly 86ea0b666e [formerly 68dde17de2 [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]]]
Former-commit-id: 86ea0b666e
Former-commit-id: b4a3933e87 [formerly 39f9dc931a] [formerly 9f07f7e014b3a205684780ddaf335bdd9b824c4d [formerly d148beb4ca]]
Former-commit-id: 18d303aa6094230a2a8aa0f0954b1705a38382d5 [formerly 5c488932d9]
Former-commit-id: 18b7633b70
2013-01-18 10:37:25 -05:00
Steve Harris
9c1503705f 13.1.2-9 baseline
Former-commit-id: a78d3ab456 [formerly 6fd587d08d] [formerly 0878a7ea57] [formerly a78d3ab456 [formerly 6fd587d08d] [formerly 0878a7ea57] [formerly ddc6aec013 [formerly 0878a7ea57 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]]]
Former-commit-id: ddc6aec013
Former-commit-id: 71267d323e [formerly 5b752c12c4] [formerly a5350d4f640abae2d8766048e2614c8856764e55 [formerly 5e0a9a8fd2]]
Former-commit-id: 10033ea9a32de8b75ea1faebccacd5e638ad55e1 [formerly 3f93a9eb2e]
Former-commit-id: b9cd443717
2013-01-18 10:29:52 -05:00
David Gillingham
8664cd3ab3 Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it.
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc

Former-commit-id: de3e72065e [formerly 9e3999a427] [formerly c6e64d83a2] [formerly de3e72065e [formerly 9e3999a427] [formerly c6e64d83a2] [formerly d16760c73e [formerly c6e64d83a2 [formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]]]
Former-commit-id: d16760c73e
Former-commit-id: c8ec47e58f [formerly 09836dacca] [formerly b5a1c4056953f024797af353d21b532b9cabd412 [formerly a40383de3b]]
Former-commit-id: fd6f5c616a65425a268536b21b546c4412387a41 [formerly 74bd042c3f]
Former-commit-id: 9266b39ced
2013-01-17 17:42:05 -06:00
Ben Steffensmeier
e59e84ef7f Issue #1479 fix mod families
Former-commit-id: a68b6beda9 [formerly da98f8e176] [formerly 244f55e1f9] [formerly a68b6beda9 [formerly da98f8e176] [formerly 244f55e1f9] [formerly 65b11cf54c [formerly 244f55e1f9 [formerly 4678cbf7764cae77683d357f0ac1bf6ff95bc63e]]]]
Former-commit-id: 65b11cf54c
Former-commit-id: f7a19b733a [formerly 0fe033c64c] [formerly 1d879053b88db0e9661b78b6561242b31172f199 [formerly 0d8a901d07]]
Former-commit-id: 6810068e8b576f11bd64f330c4c1ed128fbb3e5d [formerly 82bb31a603]
Former-commit-id: 1b6523f7fa
2013-01-16 10:56:21 -06:00
Lee Venable
717642416f Merge "Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates." into development
Former-commit-id: 1578950906 [formerly a3c5aded12] [formerly 32692a6def] [formerly 1578950906 [formerly a3c5aded12] [formerly 32692a6def] [formerly f63da5aba6 [formerly 32692a6def [formerly 517b6e6652b75801928cbb8f2f6899916e8dd988]]]]
Former-commit-id: f63da5aba6
Former-commit-id: e5e1841b7e [formerly c4291fcb2a] [formerly 2d8f8827471d802ee24a1d297aac5aed42839e14 [formerly 5a733e465d]]
Former-commit-id: c63b057f5dee3a652c87b56e1ae096143f3c4b3f [formerly b8c01b939b]
Former-commit-id: ed28295ec1
2013-01-15 14:47:49 -06:00
Richard Peter
0a55bcfd67 Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]]
Former-commit-id: 1dbb34523b
Former-commit-id: d880361e06 [formerly 79ef100838] [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]]
Former-commit-id: ef42f50f6a062518b4a0d8effc537eaf4c7292a1 [formerly cd2014bf8d]
Former-commit-id: e838f2db25
2013-01-14 18:07:17 -06:00
Ben Steffensmeier
405ec460f7 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 1926965b6b [formerly da79be73a2] [formerly f49e77f7df] [formerly 1926965b6b [formerly da79be73a2] [formerly f49e77f7df] [formerly 2e10a8408b [formerly f49e77f7df [formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]]]
Former-commit-id: 2e10a8408b
Former-commit-id: 2ebe93dc12 [formerly 3d63fa24a1] [formerly 2adb2b2db42f9a0a161c689d6a3b7ec66791bb64 [formerly 0a0d230091]]
Former-commit-id: b77bd47a9b61a62d7e87a9111d90036d52bba942 [formerly fcc71cc31d]
Former-commit-id: 88ac5805b6
2013-01-14 17:44:46 -06:00
Steve Harris
e5f32a2bbe 13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5 [formerly e34695538d] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275]
Former-commit-id: b4556ea28f
2013-01-14 18:42:21 -05:00
Richard Peter
031bae3bfd Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]]
Former-commit-id: b8e42dabc0
Former-commit-id: 9da3b7e2dd [formerly fa6247baf7] [formerly bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]]
Former-commit-id: 353348b43765265bcb9885b4db6864c6e23d0b07 [formerly 096134d917]
Former-commit-id: ef2dc06b69
2013-01-14 17:38:38 -06:00
Steve Harris
005d9ccae2 13.1.2-7 baseline
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]]
Former-commit-id: 42189b5f88
Former-commit-id: 4c8e604619 [formerly f1256f2a9e] [formerly 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]]
Former-commit-id: bc0b5a7bf290d46a49a6251bcf649c05a7b9d563 [formerly 775a338b90]
Former-commit-id: 1ef10eaf2c
2013-01-11 16:12:09 -05:00
Richard Peter
7d529beed2 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e]
Former-commit-id: 398b47967d
2013-01-09 17:55:05 -06:00
Steve Harris
3e63f280a2 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
179755f156 Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]]
Former-commit-id: f6988eefff
Former-commit-id: 377804398b [formerly f02c1ef71d] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]]
Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4]
Former-commit-id: b0a60923c4
2012-12-11 08:45:53 -06:00
Steve Harris
cedbde75e3 12.12.1-12 baseline
Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 79b0e973ef [formerly 69ab975fab] [formerly 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]]
Former-commit-id: 54c80ccffc60d6ee8a544b475ed12355b32a2f26 [formerly 190378beeb]
Former-commit-id: f8a9ae24cb
2012-12-06 09:18:28 -06:00
Steve Harris
5f22640e99 12.12.1-8 baseline
Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]]
Former-commit-id: 5093a7c442
Former-commit-id: a45a7fe1bf [formerly ff4131c2ee] [formerly 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]]
Former-commit-id: d1f389a14d75a14807b83f7528cff619dda45f17 [formerly ec2cdc1593]
Former-commit-id: 0b22b3c014
2012-12-06 09:02:51 -06:00
Max Schenkelberg
0a1a51c6ef Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation
Amend: Fixed time matcher index error when no data is available in GFE

Change-Id: Ie222ba72cb3890d3dc32699828b45012cd1783e5

Former-commit-id: a614307c95 [formerly b744ba68e0] [formerly 624cafb066] [formerly a614307c95 [formerly b744ba68e0] [formerly 624cafb066] [formerly 1328deac56 [formerly 624cafb066 [formerly 974ef3068d48244ca622edc17045266cc34b6468]]]]
Former-commit-id: 1328deac56
Former-commit-id: c9f3a07ac0 [formerly 47c7518388] [formerly b86ec7c1b619648b5b662c8f776712e299e94036 [formerly c5536a9a84]]
Former-commit-id: 53e8d333e59bfe0fb923f0e1ef352a70cc918e0d [formerly b1c2bf1cc4]
Former-commit-id: a488900f51
2012-11-30 14:17:50 -06:00
Dustin Johnson
c6dbe1bc0c Merge branch 'ss_builds' (12.12.1-4) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 08fd67e94a [formerly 5d5dbe27e1] [formerly 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]]
Former-commit-id: bcac2231856130f2c05f39f9472f65a6c8313dca [formerly ff33643234]
Former-commit-id: 6d21c445c2
2012-11-14 14:41:57 -06:00
Steve Harris
ccb16b9b44 12.12.1-4 baseline
Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]]
Former-commit-id: 57578da521
Former-commit-id: 4300583fc2 [formerly e35a321a8c] [formerly 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]]
Former-commit-id: 83b699079d09b1ae989d5d92097f6ebe23a8c242 [formerly 493f335c0b]
Former-commit-id: 2c2bfc949d
2012-11-14 14:19:20 -06:00
Steve Harris
b5fd6ed2fd Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]]
Former-commit-id: 00f3d51546
Former-commit-id: 98670f1cc2 [formerly 21ecd53719] [formerly 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]]
Former-commit-id: 02f982c590df771367e3d55fa354bfe951bed8de [formerly 59efd9a217]
Former-commit-id: ae9d9985cd
2012-11-13 17:28:50 -06:00
Steve Harris
9e4dbe2640 12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 5365b72401 [formerly 111e7607cf] [formerly 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]]
Former-commit-id: 0a26a9f757bec6107dd0eb5024ce9aaf5d84b865 [formerly 96a4a4f3f5]
Former-commit-id: 53d74c66e7
2012-11-13 17:14:24 -06:00
Ben Steffensmeier
b57a30d18d Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]]
Former-commit-id: e8090e654b
Former-commit-id: fa599c93a8 [formerly 109ec1e778] [formerly 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3]]
Former-commit-id: 1922ebb0208920ac3ef27814907ade54d1a0244a [formerly 7761060a12]
Former-commit-id: 9f2f2591ee
2012-11-13 16:00:19 -06:00
Steve Harris
94cd5a1388 12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de]
Former-commit-id: af59663a99
2012-11-07 12:41:20 -06:00
Ben Steffensmeier
84ee3cecaa merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly 1a215cb42a [formerly 4f503d3a1e] [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 24de750932 [formerly 9b8f2bcdbd] [formerly de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8]]
Former-commit-id: c7706c1a1114c9415a5ad6c33596002a145bf919 [formerly dd5ab10b61]
Former-commit-id: 86562637f0
2012-10-25 12:22:11 -05:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00
Ben Steffensmeier
51d1c03c36 Merge branch 'ss_builds' into Unified_Grid
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly a67ce9586c [formerly de3769129c] [formerly 8b7256b1ae] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]]
Former-commit-id: 266a2f317f
Former-commit-id: 97c23508d7 [formerly fde1e73d58] [formerly aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3]]
Former-commit-id: 4391a50cd6a1b526355ffcad5b2b61ac30604784 [formerly b2fdd9283d]
Former-commit-id: 29777154bb
2012-10-12 12:45:50 -05:00
Steve Harris
75d99f4e93 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 04da0dbf50 [formerly 75901860c2] [formerly c12ee14e66] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 6e0b2c55d7 [formerly 772c60efa4] [formerly 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc]]
Former-commit-id: 8fe8231e2d1c3ba8a832320dad34957e6a59e8fe [formerly e72b6d5da6]
Former-commit-id: ff9321e3ce
2012-10-08 13:26:20 -05:00
Steven Harris
db663faca9 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
2012-09-27 15:57:45 -05:00