Commit graph

1361 commits

Author SHA1 Message Date
Lee Venable
e9b45314e2 Merge "Issue #1533 Update the calculated dataset size after loading subset xml" into 13.2.1_delivery
Former-commit-id: 3f8f1a6996 [formerly d5a0674873] [formerly 98f25434a9] [formerly 3f8f1a6996 [formerly d5a0674873] [formerly 98f25434a9] [formerly 21059af185 [formerly 98f25434a9 [formerly 4043ba3c71a85148bbd262fd5cd371c290b5bfd8]]]]
Former-commit-id: 21059af185
Former-commit-id: 0c39a73eac [formerly 30ab7d00ff] [formerly aee921e6178c46187280f47148d9731cfc8c75cc [formerly 18b96d33c6]]
Former-commit-id: 8f140851684d96d6ba71c2aae9ce3997c7dfc6ec [formerly 66f7449b9c]
Former-commit-id: 68d5562118
2013-01-29 10:00:37 -06:00
Lee Venable
c2bd53bced Merge "Issue #1528 Fix subscription priorities to be the same from domain object to GUI Fix incorrect use of enum ordinal value mappings to priorities. Fix broken bandwidth priority scheduling." into 13.2.1_delivery
Former-commit-id: b35b20a245 [formerly ef51b388d7] [formerly 06900ccbb7] [formerly b35b20a245 [formerly ef51b388d7] [formerly 06900ccbb7] [formerly f98e5b35e1 [formerly 06900ccbb7 [formerly 19229d6f4fc871d462e8460c02bfb69975e7dada]]]]
Former-commit-id: f98e5b35e1
Former-commit-id: b865087c22 [formerly df5bcf64de] [formerly 4ec38d9e476c5f723089251bd22d992fcc9b56df [formerly fb942ec7c2]]
Former-commit-id: d53b80bbdb765a3dcbba5aebfe9260768778d065 [formerly b2cd64020d]
Former-commit-id: 39a081b349
2013-01-29 09:59:59 -06:00
Lee Venable
afeb942d45 Merge "Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes)." into development
Former-commit-id: fd325027a8 [formerly 73e44d87fa] [formerly 1c61671766] [formerly fd325027a8 [formerly 73e44d87fa] [formerly 1c61671766] [formerly 078cc84047 [formerly 1c61671766 [formerly 9e32ad8949af4f1e1a4d163056d510c2572f0aec]]]]
Former-commit-id: 078cc84047
Former-commit-id: a4a40b2fa9 [formerly 65fc68e586] [formerly 42c4d71b42c286fb8b9898e7dbbd82f66a2e8380 [formerly 0ee108f806]]
Former-commit-id: 043540be9558d0f052f5de12adda84cf183f1c3e [formerly 6b415ceab0]
Former-commit-id: ee66eb1671
2013-01-29 09:19:56 -06:00
Ron Anderson
16701b61e5 Issue #1535 Fix GFE saving last block of grids twice
Change-Id: I3411e27c96b5f0dd79c24e7ba75361582cb6652c

Former-commit-id: c070b55324 [formerly ed7784818a] [formerly aa2c0ffb60] [formerly c070b55324 [formerly ed7784818a] [formerly aa2c0ffb60] [formerly 5738910b71 [formerly aa2c0ffb60 [formerly 16eedd6d46196d08d02abc674c81ed95c403457c]]]]
Former-commit-id: 5738910b71
Former-commit-id: 5ffbbdd699 [formerly 670f23e1c2] [formerly 9ad86a93f01dfa8394e229e86a96b7f7e7dcd020 [formerly d61a24410a]]
Former-commit-id: 3ca45302a5e7a88786f8aa84decbcced74f9eb02 [formerly 3d1159c81f]
Former-commit-id: 96acf099c8
2013-01-28 19:23:23 -06:00
Richard Peter
aa305777de Merge "Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed" into development
Former-commit-id: de8c595a0e [formerly 59ef7758f1] [formerly 6eb11703e4] [formerly de8c595a0e [formerly 59ef7758f1] [formerly 6eb11703e4] [formerly 2946e97294 [formerly 6eb11703e4 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]]
Former-commit-id: 2946e97294
Former-commit-id: 0ae1b55321 [formerly 7c9b9b0237] [formerly 111af45a80d6a0af8bd6a302b734f70ab8d8f912 [formerly 878cbe1695]]
Former-commit-id: c079a8a182f031460dd573dd9af4bb06ff087f91 [formerly 4f61e88c6f]
Former-commit-id: 7a41e41ca9
2013-01-28 15:27:23 -06:00
Max Schenkelberg
b4e72e5b25 Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon.
Change-Id: I74312305d80762e55f64a5ca70fc454063f2f01d

Former-commit-id: 681a2a6ec4 [formerly 796522b6d0] [formerly 95ccc76272] [formerly 681a2a6ec4 [formerly 796522b6d0] [formerly 95ccc76272] [formerly 1dbeeb84fb [formerly 95ccc76272 [formerly 493ac37a227259db4c1ea01afa3bd7a9b77095f7]]]]
Former-commit-id: 1dbeeb84fb
Former-commit-id: 18411217a1 [formerly 0019b43582] [formerly 659fd21b93254587addaccc93ad503a195b98bd4 [formerly 99c8a97f8c]]
Former-commit-id: cbb28c2c55879145141750dd3a2669fabefcf761 [formerly cfcffa3b2e]
Former-commit-id: 21d7fb592c
2013-01-28 14:30:53 -06:00
Dustin Johnson
7ed193a850 Issue #1533 Update the calculated dataset size after loading subset xml
Change-Id: I9fd94485bed113c68663484fb19daadcbe962a8d

Former-commit-id: dd4fc414aa [formerly 7dae10b701] [formerly 2c068589aa] [formerly dd4fc414aa [formerly 7dae10b701] [formerly 2c068589aa] [formerly 9f7e9692c2 [formerly 2c068589aa [formerly 747395cffd90554eea099c05affe75487ec304a3]]]]
Former-commit-id: 9f7e9692c2
Former-commit-id: 1c51e474c5 [formerly 8a2ac02862] [formerly 00f7b4c48c234063529b5a901bb23fe92e7c6885 [formerly 0fe2711273]]
Former-commit-id: d91091a6131b854624d4817ca6e4df86dafa559b [formerly ee324a8a28]
Former-commit-id: 4afc6cf363
2013-01-28 12:47:45 -06:00
Roger Ferrel
afe50ac914 Issue #1516 Changes to get point information into the proper DataSelection mapping (Planes).
Change-Id: Icce03032714b09c67bbb4ec23a426ad1dcdd244b

Former-commit-id: 37bdfa5868 [formerly 3bc828f839] [formerly 5a23770931] [formerly 37bdfa5868 [formerly 3bc828f839] [formerly 5a23770931] [formerly dd41c60e3f [formerly 5a23770931 [formerly fcf6a52f2b172c2450f3f417e4256c04f5eefbcd]]]]
Former-commit-id: dd41c60e3f
Former-commit-id: 5951b04a4f [formerly d4667e3909] [formerly 27165535226953b58522aeb5bae5425c31f9b2fa [formerly e6ff72765a]]
Former-commit-id: 1b66ee7d7d223607fa4b64a5ed56661b5ff5d880 [formerly 6a870cbd8d]
Former-commit-id: 9fc3f7151f
2013-01-28 08:39:36 -06:00
Bryan Kowal
a7b254b60f Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: 71866bc98e [formerly 1f7f5932dd] [formerly 2046255ef0] [formerly 71866bc98e [formerly 1f7f5932dd] [formerly 2046255ef0] [formerly 7e7b47d934 [formerly 2046255ef0 [formerly b65827ab53309433a66c3c5146bdfb6c41eec2f8]]]]
Former-commit-id: 7e7b47d934
Former-commit-id: 9476e45881 [formerly 0695fbbc8c] [formerly e666bdb02a0ffd5583e5c764ffe9c1384f870cba [formerly fc6feb2329]]
Former-commit-id: 3ef9594937130f311e556060b37975752c43c1c4 [formerly 3e9d683a7f]
Former-commit-id: 01ba5e0b5c
2013-01-25 16:19:54 -06:00
Steve Harris
8988ae04c2 Merge "Issue #1522 - disable Spring during installs and uninstalls" into development
Former-commit-id: 98665a9caa [formerly 282acc3b41] [formerly ffb536cd46] [formerly 98665a9caa [formerly 282acc3b41] [formerly ffb536cd46] [formerly e8e8106d42 [formerly ffb536cd46 [formerly de2829de069a3f3280b25fd8a8b7b831377aaebc]]]]
Former-commit-id: e8e8106d42
Former-commit-id: ed42a5c55e [formerly fe4b27913c] [formerly 044d35fb735acb469bfe8681ef7f37367cf2ac62 [formerly bac3f97ab6]]
Former-commit-id: 494c6bbd8e1a96c74b0631358776c560f4d385aa [formerly fe2ddb8fde]
Former-commit-id: 687b789b6b
2013-01-25 16:02:47 -06:00
Dustin Johnson
4064a06a23 Issue #1528 Fix subscription priorities to be the same from domain object to GUI
Fix incorrect use of enum ordinal value mappings to priorities.
Fix broken bandwidth priority scheduling.

Change-Id: Ic9e220966c20e95fcc3f81f0c647ffcdb2fcbca5

Former-commit-id: f8d6fb35b4 [formerly 50bfcd3fbf] [formerly 41c0ff85ff] [formerly f8d6fb35b4 [formerly 50bfcd3fbf] [formerly 41c0ff85ff] [formerly f88a5c1b95 [formerly 41c0ff85ff [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]]]
Former-commit-id: f88a5c1b95
Former-commit-id: dac4c429e7 [formerly 4ab288ae75] [formerly a9e048c56f0e0bcf1daa53c2f59ef7d20bb01b9b [formerly 4465094fe9]]
Former-commit-id: 053fc880d7a6ac70b3580a152303d0a3ab5154a5 [formerly b78257ab11]
Former-commit-id: 7d73d0bd64
2013-01-25 14:30:04 -06:00
Steve Harris
379a9dd95c Merge branch '13.2.1_delivery' into development
Former-commit-id: d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly 827611474f [formerly f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]]
Former-commit-id: 827611474f
Former-commit-id: 1397f8a811 [formerly a85c81289e] [formerly b9760adfb36650f58aa4202fbbd5beedb40f8529 [formerly 25fecb8b4f]]
Former-commit-id: f2d8f7cd1be3a2bba4584db2da805b450fce002a [formerly 895b25bac4]
Former-commit-id: a7d7847b06
2013-01-25 10:54:51 -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
Lee Venable
11b68b58cc Merge "Issue #1523 - Fix problem with legend keys." into 13.2.1_delivery
Former-commit-id: 695f441e3f [formerly 0767f1a50b] [formerly 9756c431fd] [formerly 695f441e3f [formerly 0767f1a50b] [formerly 9756c431fd] [formerly e4142b63c9 [formerly 9756c431fd [formerly 2dcf981656f547cc07f8124eadc32ca0204b4b46]]]]
Former-commit-id: e4142b63c9
Former-commit-id: e2f088c003 [formerly 4bf28dd204] [formerly 3db7896ccb9207afe3cea12b611de87c2bb0fbeb [formerly 063ffa26eb]]
Former-commit-id: 5135eb50e84a401433131b96424fedf34d2d06a3 [formerly 18f8246019]
Former-commit-id: 4a9d05e1f0
2013-01-24 16:52:17 -06:00
Nate Jensen
20549bfc31 Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed
Change-Id: I9156f9b29f3e57a668791da28b692420a27dfa96

Former-commit-id: add78bd445 [formerly c7172e87a3] [formerly 705bfb0755] [formerly add78bd445 [formerly c7172e87a3] [formerly 705bfb0755] [formerly 2dc3abb847 [formerly 705bfb0755 [formerly 505fa329c6700063aec6b62e4fef623b539ad801]]]]
Former-commit-id: 2dc3abb847
Former-commit-id: 9fb144f73e [formerly 04a397866a] [formerly 7e4143b4d4e1d3ad304dded5581543897cc27dd0 [formerly fa27552c9b]]
Former-commit-id: fab84284a623721ba923b4339c1fe692ec1f2c99 [formerly 8726a77052]
Former-commit-id: ddf1360954
2013-01-24 16:41:02 -06:00
Bryan Kowal
98ab0506ce Issue #1522 - disable Spring during installs and uninstalls
Former-commit-id: b4945796a3 [formerly ab7f75ad73] [formerly 09735415c5] [formerly b4945796a3 [formerly ab7f75ad73] [formerly 09735415c5] [formerly 117028c632 [formerly 09735415c5 [formerly 293dd0c762884f285e455d94708b6e9fcc82023f]]]]
Former-commit-id: 117028c632
Former-commit-id: 7214b65ccf [formerly 473368e0c8] [formerly 042aa3503e2052385e138273b071ed7d19fad917 [formerly a90266a49f]]
Former-commit-id: f3f8581e4b203c81cdb09bf4705d1671bc146bc7 [formerly 1154a1187e]
Former-commit-id: 9c8071e3a1
2013-01-24 15:50:09 -06:00
Steve Harris
19f386e56a Merge "Issue #1496 Changes to move what may be long queries off the UI thread. Changed based on comments in patch set 2." into development
Former-commit-id: d8882d38ef [formerly 88734ab106] [formerly ca23ba06e5] [formerly d8882d38ef [formerly 88734ab106] [formerly ca23ba06e5] [formerly 267d860cd1 [formerly ca23ba06e5 [formerly 64f9216a13fbad67733c5babde8a8f507bbe399f]]]]
Former-commit-id: 267d860cd1
Former-commit-id: 7b1dbd3c56 [formerly bd1393541a] [formerly 88968d3e3fb4d249efd67cec63084edac1ce39bb [formerly 9b3713763d]]
Former-commit-id: 3eb7fc866b9a49a2ecd259d1e6589cc96dd10f2b [formerly ec2aaf2005]
Former-commit-id: db11a51d8c
2013-01-24 15:02:36 -06:00
Mike Duff
27a9b15eea Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

Former-commit-id: ed32adc993 [formerly 478ec72102] [formerly ba5014b162] [formerly ed32adc993 [formerly 478ec72102] [formerly ba5014b162] [formerly c06ed9f9dc [formerly ba5014b162 [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]]]
Former-commit-id: c06ed9f9dc
Former-commit-id: a09e8c5570 [formerly 05e9b88566] [formerly 1b1ac20cfdbaa8e552b23d4725c85806c869b494 [formerly fbf92a6d06]]
Former-commit-id: ef3455ec3540faf3e7ca24232e1af94de307fd18 [formerly f9b7cae879]
Former-commit-id: 0752ecb4f1
2013-01-24 12:39:12 -06:00
Mike Duff
a681ae43de Issue #1357 - fix for data plotting in the x direction.
Former-commit-id: 4d17e05653 [formerly d4d80b0206] [formerly da22ae4a5f] [formerly 4d17e05653 [formerly d4d80b0206] [formerly da22ae4a5f] [formerly b283362a2f [formerly da22ae4a5f [formerly 862ca86596fb59ce5c0b6cbcce320303f6cda3b3]]]]
Former-commit-id: b283362a2f
Former-commit-id: 309bb57f14 [formerly 4e30dc629a] [formerly 4adca58722a1673adcbc0170eae7beb1f06a40ae [formerly da2c03f0ae]]
Former-commit-id: e2fb3722933e3b727f67b1d42b4c83d243a74923 [formerly eb6789534e]
Former-commit-id: 2b936f62dc
2013-01-24 11:37:23 -06:00
Max Schenkelberg
f6a854755a Issue #1474 Fixed MetarPrecipResourceData and LightningResourceData so updates do not required requery. Made an AutoUpdater per plugin so they process independently of each other.
Amend: Only register product alerts in thin client if JMS is not disabled

Change-Id: Ic46daf57ef3ede3aad2a2f067e9764f85f7df9a2

Former-commit-id: 73fbdc6da3 [formerly a8dc166a1f] [formerly 9655d64069] [formerly 73fbdc6da3 [formerly a8dc166a1f] [formerly 9655d64069] [formerly b6a29c38a5 [formerly 9655d64069 [formerly 115dc26748e0779b4c67cc74fe08c5bf17542632]]]]
Former-commit-id: b6a29c38a5
Former-commit-id: c709c91154 [formerly ecce9be8ce] [formerly 52f3bdc976aa7b28a5a0097fdc6d4d6c63530fb5 [formerly 11c8dd6fff]]
Former-commit-id: 75e5474b19b240758634d24dabc0961fd75c2813 [formerly 12318158c2]
Former-commit-id: 8bfa47f929
2013-01-23 16:50:17 -06:00
Ron Anderson
949b2a86ab Merge "Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads." into development
Former-commit-id: 0f79427f2a [formerly d8878cfd97] [formerly 237b728039] [formerly 0f79427f2a [formerly d8878cfd97] [formerly 237b728039] [formerly ed1e096a11 [formerly 237b728039 [formerly 1f809b6b94e9a0d3d96542bea9781cbc6397572d]]]]
Former-commit-id: ed1e096a11
Former-commit-id: 21d235ccf3 [formerly dd437f3df4] [formerly 5c5fc269cf44177b7d1f6983e2f3b2b305109bfc [formerly ee4c0568bf]]
Former-commit-id: 020457a33d56f3a505d3da3a6e6b16d6dec81f04 [formerly 86c52667ae]
Former-commit-id: f24c9b9456
2013-01-23 16:46:42 -06:00
Ron Anderson
1a2e4d477f Issue #1524 Fix discrete color bar.
Former-commit-id: 001770beb7 [formerly 3d838584ed] [formerly 718f1da85b] [formerly 001770beb7 [formerly 3d838584ed] [formerly 718f1da85b] [formerly 358c8bdf07 [formerly 718f1da85b [formerly 7edd57ef71e8a22aa25870477844ba063da0b9d3]]]]
Former-commit-id: 358c8bdf07
Former-commit-id: 250fd1d223 [formerly 6f7fa3e4e5] [formerly d49ec924e070578e004c1ea1c0c50d561de56ceb [formerly 3ccfdbc4bb]]
Former-commit-id: 19981c45dbc5b6d1e94c052f0ca8f7899de755b7 [formerly 01f80e2ff2]
Former-commit-id: 259871dfd8
2013-01-23 16:37:56 -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
Mike Duff
0dabecaa48 Issue #1523 - Fix for count
Former-commit-id: d4b36b98f7 [formerly adbabb6765] [formerly 229a0c77fa] [formerly d4b36b98f7 [formerly adbabb6765] [formerly 229a0c77fa] [formerly 3c20aab166 [formerly 229a0c77fa [formerly 35fbd9ce448a17d761bd4f745fd2f1339d82537b]]]]
Former-commit-id: 3c20aab166
Former-commit-id: 9c8e53e0d4 [formerly 028fe6cea9] [formerly f8373eb1bbc61919c49e5d861d7a5ce2c29b0d77 [formerly cb268b76e4]]
Former-commit-id: 5c47d87113bb3712bdaf77184a9566230257cc5f [formerly 646282d82f]
Former-commit-id: 3fa52f2d43
2013-01-23 15:15:08 -06:00
Mike Duff
a49d3917f1 Issue #1386 - Remove Save Stats Graph Menu Item.
Former-commit-id: 008014c61d [formerly c52ed8a476] [formerly 8c2789a1a7] [formerly 008014c61d [formerly c52ed8a476] [formerly 8c2789a1a7] [formerly dc46923886 [formerly 8c2789a1a7 [formerly a201a22bb4271c94b1fda7f4eaa1f1b74b9d1859]]]]
Former-commit-id: dc46923886
Former-commit-id: dfbaec400e [formerly a7dfd070fd] [formerly d03b741e0705a2829aae7d11b7012e5dde6b0336 [formerly 2b4ec75a2c]]
Former-commit-id: 100beef690480a42e7e517e79d77cdc2a9dc1d20 [formerly 28658f155b]
Former-commit-id: 006f964dbe
2013-01-23 15:02:36 -06:00
Roger Ferrel
04e20890ea Issue #1496 Changes to move what may be long queries off the UI thread.
Changed based on comments in patch set 2.

Change-Id: I867f716aac39562f9b8bfaddf187bc80cb5a71ce

Former-commit-id: 7dad868adf [formerly 3abb6f1026] [formerly ff09ee32ab] [formerly 7dad868adf [formerly 3abb6f1026] [formerly ff09ee32ab] [formerly 470abe2495 [formerly ff09ee32ab [formerly e54cc8fa001f3c6584bc40a74f461d7021ef77bb]]]]
Former-commit-id: 470abe2495
Former-commit-id: 9d57e63501 [formerly 3daf0c7b37] [formerly 74c0f2f92451f0a414ebfbb04887d41f50debf92 [formerly 58e3bbbe97]]
Former-commit-id: 7604f050d118297b35ef8a8d6731fe102bc5cfe5 [formerly e0c01d6c04]
Former-commit-id: 067198ca1f
2013-01-23 14:08:46 -06:00
Ben Steffensmeier
e448ec38f4 Issue #1521 create grid data access factory and refactor satellite to share common functionality.
Change-Id: I54de0b41b60ccd058124eb79e6f032cb2ea9a3cf

Former-commit-id: 4c552e9078 [formerly bd32a947c7] [formerly a19b51cf2e] [formerly 4c552e9078 [formerly bd32a947c7] [formerly a19b51cf2e] [formerly 3032dc2189 [formerly a19b51cf2e [formerly 2133adac87eaa53977c26700ef656c304e81ee1b]]]]
Former-commit-id: 3032dc2189
Former-commit-id: 46d0780052 [formerly e59bb3c914] [formerly e8a187a94b2904c946afa1581a0b3a5ec4094308 [formerly 2e907f4a0e]]
Former-commit-id: d7a2f467400dc618241d654534b0a4b09966dc1f [formerly fc7b0393c5]
Former-commit-id: 20a08fcc2c
2013-01-23 11:39:52 -06:00
Mike Duff
5cf904ba6f Issue #1357 - Remaining stats items implemented.
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: d54b3a3519 [formerly 712862d96f] [formerly ffca969560] [formerly d54b3a3519 [formerly 712862d96f] [formerly ffca969560] [formerly 1bc6e7c2e4 [formerly ffca969560 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]]]
Former-commit-id: 1bc6e7c2e4
Former-commit-id: aa26a4d5d2 [formerly dfcce57a0a] [formerly 1dd22669a9d4462243dd018526062181eb8a7d09 [formerly 4cd7deb608]]
Former-commit-id: 9fd21a8ac89c2efd5bc6d198d4f4290003357cb3 [formerly ac9f95d1d0]
Former-commit-id: df41fe4395
2013-01-23 11:17:36 -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
David Gillingham
b03363cfc4 Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads.
Change-Id: I1c3c46dde051802fb79b7ead6fb63d766d1d00a6

Former-commit-id: a8bc4575bc [formerly eab83c0f63] [formerly bf6230441f] [formerly a8bc4575bc [formerly eab83c0f63] [formerly bf6230441f] [formerly 88e518725e [formerly bf6230441f [formerly 9cd87997f7ae7b51608ac56fcdf4d282339526aa]]]]
Former-commit-id: 88e518725e
Former-commit-id: b96532e8ba [formerly faedefb85d] [formerly 9daae29bca1ae2c2c15295eb3aeae98bbeae7fa5 [formerly a1fd2bd32f]]
Former-commit-id: 502a3d2e982cabefa0c8afd0ea5107730be09c23 [formerly 5e6d400e79]
Former-commit-id: a4db386f6e
2013-01-23 10:09:39 -06:00
Mike Duff
aa3c0782ff Issue #1520 - Change delete notifications to hide.
Remove accelerators

Change-Id: I2954c1324cbdf1bc4e5577925dbcd10e5faa6156

Former-commit-id: bf9354054d [formerly bbc998d372] [formerly ddcd0f8222] [formerly bf9354054d [formerly bbc998d372] [formerly ddcd0f8222] [formerly 8efd37da79 [formerly ddcd0f8222 [formerly 0378ff80cc3592379ec3d49efc895adafa05109a]]]]
Former-commit-id: 8efd37da79
Former-commit-id: d2f8846060 [formerly 14bfeb0732] [formerly 026641ddcd51a6b5f16ed20fe1e5055ed89bac01 [formerly 243c1e15e9]]
Former-commit-id: 0d2e39094e1feb87e3471c5f0225cf6a5b6e7f6b [formerly ad1c7c604d]
Former-commit-id: a14438b10a
2013-01-23 09:14:48 -06:00
Dustin Johnson
1e301478b9 Issue #1519 Fix max latency calculations for adhoc queries
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 0f7b01795d [formerly 504268f0f3] [formerly 6c1818d544] [formerly 0f7b01795d [formerly 504268f0f3] [formerly 6c1818d544] [formerly f730422834 [formerly 6c1818d544 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]]
Former-commit-id: f730422834
Former-commit-id: 70bce9d505 [formerly 2e09d46fea] [formerly 76d8b5641220e657d9123f65878c0ce41da1c8f6 [formerly 516ac1ab9a]]
Former-commit-id: ba860324a0a7e30cd96383cd383eb22a2db70a82 [formerly 7918b009ff]
Former-commit-id: 4cec3d4356
2013-01-23 08:06:52 -06:00
Steve Harris
b30f963db9 Merge branch '13.2.1_delivery' into development
Former-commit-id: 0a728f6550 [formerly cbffccc58e] [formerly 1718a19f2d] [formerly 0a728f6550 [formerly cbffccc58e] [formerly 1718a19f2d] [formerly 9b6cc68601 [formerly 1718a19f2d [formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]]]
Former-commit-id: 9b6cc68601
Former-commit-id: b33edc1373 [formerly 764efdb8b8] [formerly 85fb1ad709c9c553a8e608e531581ff213d0b779 [formerly c7148da94d]]
Former-commit-id: f23a16bd0977557a616aa8dd06c01d27db2c4f5b [formerly 6964c16be7]
Former-commit-id: 7063a0c8d2
2013-01-22 21:47:09 -06:00
Nate Jensen
28f3fa9148 Merge "Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized." into 13.2.1_delivery
Former-commit-id: a2b66980dd [formerly ca7ecbb38a] [formerly 2059b9a962] [formerly a2b66980dd [formerly ca7ecbb38a] [formerly 2059b9a962] [formerly 6e89f547e5 [formerly 2059b9a962 [formerly 302d33f6a13017905c5668fb12d710ecb29c4298]]]]
Former-commit-id: 6e89f547e5
Former-commit-id: 998bbc254d [formerly 0ede688235] [formerly ee1703ba3eeb2bcd70c9bcd684bd2ba428f46711 [formerly ab30ace9ce]]
Former-commit-id: a9a641a7111433362c3df6fd61569058c3952e47 [formerly 9494e5b520]
Former-commit-id: d61e8b9cdb
2013-01-22 18:05:00 -06:00
Steve Harris
4ed4f88644 Merge branch '13.2.1_delivery' into development
Former-commit-id: f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly 1af055a04b [formerly 11b9bfc187 [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]]
Former-commit-id: 1af055a04b
Former-commit-id: 7d6a1a7e3a [formerly 8b578c10dc] [formerly cdda32a5afb54d36ca6dc56ab5842aa9a04bf651 [formerly 29b9077291]]
Former-commit-id: f741fd6472c315f672ab76f7a397d383205c6f95 [formerly b03d5ce450]
Former-commit-id: c60051d5df
2013-01-22 16:45:48 -06:00
Lee Venable
fae811f020 Merge "Issue #1484 - Fix for half timestep changes for 3 hours or less duration. Peer Review comments." into 13.2.1_delivery
Former-commit-id: f5ac31bcde [formerly aecd00423a] [formerly 619349b140] [formerly f5ac31bcde [formerly aecd00423a] [formerly 619349b140] [formerly b945ce9e6e [formerly 619349b140 [formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]]]
Former-commit-id: b945ce9e6e
Former-commit-id: 96dcd20dc6 [formerly bc10a17c9f] [formerly bc549afb6b1466a867632b29624f84bc92b91365 [formerly 511a7d9753]]
Former-commit-id: 05b41b8c1713e389184b369d7596dc8376607363 [formerly 1dd4ad4b00]
Former-commit-id: fdd9368038
2013-01-22 16:26:48 -06:00
Ron Anderson
eeae7aa9ce Issue #1518 Fixed unloading of D2D model parameters from Grid Manager and related issues with HashMaps with Parms as keys in GFELegendResource.
Change-Id: I483bbe92210ceb3015632d6a25d97ac35d7021a6

Former-commit-id: ec31e7e2b5 [formerly 9a432a1153] [formerly ce3d102cf9] [formerly ec31e7e2b5 [formerly 9a432a1153] [formerly ce3d102cf9] [formerly 3682a0e7f4 [formerly ce3d102cf9 [formerly 4f7a660ae3fba41240e032220b6599e652ae6750]]]]
Former-commit-id: 3682a0e7f4
Former-commit-id: eb41c05f54 [formerly 1062e54d2f] [formerly 6a1f7a195cac8a4aa1dc0ea06b509c23bb7d1264 [formerly 953f86348e]]
Former-commit-id: abb64f565a3863c0d0978b024482a211c0dd49c0 [formerly 48099589c0]
Former-commit-id: d0d1b62ab7
2013-01-22 16:12:16 -06:00
Mike Duff
d9b0dcc7a4 Issue #1484 - Fix for half timestep changes for 3 hours or less duration.
Peer Review comments.

Change-Id: Ia96c8857094ad14cf0db89b7642dfd46f333ec47

Former-commit-id: 01126a7f47 [formerly e5e7bc1047] [formerly fc4a6264f6] [formerly 01126a7f47 [formerly e5e7bc1047] [formerly fc4a6264f6] [formerly 96e2192585 [formerly fc4a6264f6 [formerly f7d8b074bc95b61e6d6e8dbe47442e944092618f]]]]
Former-commit-id: 96e2192585
Former-commit-id: 1a20fb912f [formerly 0ffc71147e] [formerly 625bda49088a61c6686cec5dab572c2f285226bf [formerly d62088cb0c]]
Former-commit-id: e9e982ac5ff0b4bbc29b23591f939f87ea59efa6 [formerly 8f388537eb]
Former-commit-id: 3f25b13a11
2013-01-22 14:57:23 -06:00
Ron Anderson
e528aaab4c Issue #1504 GFE: Model data not always appearing automatically without CAVE restart
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58

Former-commit-id: 6f980bd582 [formerly 74cb9aeb53] [formerly 62671efc2a] [formerly 6f980bd582 [formerly 74cb9aeb53] [formerly 62671efc2a] [formerly 20b0761048 [formerly 62671efc2a [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]]]
Former-commit-id: 20b0761048
Former-commit-id: c74a5b5be3 [formerly 8e575db69c] [formerly f07e79b0f531baa1e312a1c9871c441ba527ac16 [formerly 44807ba0d5]]
Former-commit-id: 98d55e81fb58419062f53ea5506a70c8a9c2a3fb [formerly cb23960f0e]
Former-commit-id: 64d4baf536
2013-01-22 14:47:37 -06:00
Ben Steffensmeier
3da37240b6 Issue #1495 update Product Browser to load all ensemble members
Former-commit-id: b5667ba11a [formerly cea067868c] [formerly 3c62be59c8] [formerly b5667ba11a [formerly cea067868c] [formerly 3c62be59c8] [formerly 1569f5af5d [formerly 3c62be59c8 [formerly 2c3ced7beb526f534083ff7b292b7523c76534a9]]]]
Former-commit-id: 1569f5af5d
Former-commit-id: 4b89940e78 [formerly ad1ca2feb5] [formerly 41d7f8ab0a267426604fd59eefcc34d75a3e0eec [formerly 1057580201]]
Former-commit-id: c9bb94fc06a16d7460a87e5f91659c16dfa72521 [formerly 18296e08da]
Former-commit-id: c770b2bd32
2013-01-22 12:12:18 -06:00
Dustin Johnson
07a111ae12 Merge "Issue #1501 Route notification requests to datadelivery." into 13.2.1_delivery
Former-commit-id: 72e879bf21 [formerly 77923b1cef] [formerly 84b6f0217f] [formerly 72e879bf21 [formerly 77923b1cef] [formerly 84b6f0217f] [formerly 26e72198b7 [formerly 84b6f0217f [formerly 9fb35681ebe6d17679cd26cc86a53aeb357bcd3b]]]]
Former-commit-id: 26e72198b7
Former-commit-id: 50594d1ec6 [formerly a83bc7ce7f] [formerly 1f1c2f5834aad3f5f0f83e3177bebbea9886bf1c [formerly 821572355e]]
Former-commit-id: 00ca8dcb2d426e97c0922f515c1dc3a7cf1b6882 [formerly c3cfb16075]
Former-commit-id: 87a442717b
2013-01-22 11:47:03 -06:00
Dustin Johnson
a2ca5bd06f Issue #1441 Create new datadelivery services plugin
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 40ef4c5947 [formerly 3ec05a5a9c] [formerly 557de162b0] [formerly 40ef4c5947 [formerly 3ec05a5a9c] [formerly 557de162b0] [formerly 15c2c55ff9 [formerly 557de162b0 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 02604beac9 [formerly 756080321e] [formerly 6bc759f6c2019b3fef1eb1a080cf002dc07697ce [formerly a3c99f86bb]]
Former-commit-id: 07f8633fb9fb320b16573c6dc1052a735e4bf124 [formerly 2168713505]
Former-commit-id: 7da688f138
2013-01-22 11:45:18 -06:00
Bryan Kowal
8fb4e9e6df Fix the merge.
Former-commit-id: a3e78692dd [formerly 0858dfdfe4] [formerly fd7c132266] [formerly a3e78692dd [formerly 0858dfdfe4] [formerly fd7c132266] [formerly a66024e35b [formerly fd7c132266 [formerly 9f9da21517569f703c9e732016350b64ef14b98a]]]]
Former-commit-id: a66024e35b
Former-commit-id: 5202834703 [formerly 1e2a4b7801] [formerly 0f800038e8624a65589c41798356403705132ee7 [formerly 358132c3c4]]
Former-commit-id: ce4c1277606967c3425dfbe33f05603f79f9eca2 [formerly 61349238a4]
Former-commit-id: 91e8aa2419
2013-01-22 10:48:04 -06:00
Dustin Johnson
5d019565d3 Issue #1501 Route notification requests to datadelivery.
Change-Id: Icde52bafb67e199caeb74ed0078c879ab514836b

Former-commit-id: ba9842e917 [formerly cda7f4d592] [formerly d956891360] [formerly ba9842e917 [formerly cda7f4d592] [formerly d956891360] [formerly 500f6050be [formerly d956891360 [formerly 9550a861fab635a8f61c485152e27ec90ebb9cb2]]]]
Former-commit-id: 500f6050be
Former-commit-id: 21826510ed [formerly a372963fb7] [formerly 06f20d275630b0a6b9a1ab15997d421385b85c06 [formerly b4bb2ee454]]
Former-commit-id: eeeb6fbd96d5049a17756403de1c0fa56d96d379 [formerly 2ab171b9ef]
Former-commit-id: cb174e731d
2013-01-22 10:19:09 -06:00
Steve Harris
965abb3f7f Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java

Former-commit-id: 2dac848e47 [formerly 340d2009f7] [formerly df9ac3685e] [formerly 2dac848e47 [formerly 340d2009f7] [formerly df9ac3685e] [formerly 3a772f41cf [formerly df9ac3685e [formerly a0bcc2276fb95097cfc10869f0aa1ee48189fc3a]]]]
Former-commit-id: 3a772f41cf
Former-commit-id: 05ab9613af [formerly 5b516ebb6f] [formerly ed7a2a2a47d2cbf073e1eafe635d1f605f03dbb6 [formerly 111d5afb3a]]
Former-commit-id: a9ae3ac17a7001b5d6ec36ad1097708b6ce2b469 [formerly 922d0493fb]
Former-commit-id: cae136ee16
2013-01-22 09:40:50 -06:00
Dustin Johnson
84e3ee1121 Issue #1501 Include subscription on activation/deactivation notification, remove race condition of table update.
Change-Id: Ic3f8ff634136a9830cba42befc7f41c2554698aa

Former-commit-id: 491a095bed [formerly 94a0cd5733] [formerly 0281da10cc] [formerly 491a095bed [formerly 94a0cd5733] [formerly 0281da10cc] [formerly 2eda48aa0d [formerly 0281da10cc [formerly dd07cad3e6b2471fc4371471918078498f05d01e]]]]
Former-commit-id: 2eda48aa0d
Former-commit-id: a619d03fe6 [formerly 58b3edd7df] [formerly 20226976bd8a1e9a6ac9b33833ffabcfa02b20ab [formerly c7189052e8]]
Former-commit-id: 973629109034264aa45f81c56e13fe6617ca4d43 [formerly 2df1cb5d53]
Former-commit-id: 6314e94764
2013-01-21 21:24:48 -06:00
Max Schenkelberg
09f301958d Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized.
Change-Id: Ib37e5be2163d750ac24827c2868162b06c290390

Former-commit-id: 1944f4f81d [formerly 8058260830] [formerly 5c51083f35] [formerly 1944f4f81d [formerly 8058260830] [formerly 5c51083f35] [formerly 6fd6b2e42d [formerly 5c51083f35 [formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]]]
Former-commit-id: 6fd6b2e42d
Former-commit-id: 004f5213e1 [formerly 3d459dd57c] [formerly 79bd5d81a31d638d24e6343dd5e7a7bedd4ae7c3 [formerly 2c05f3c179]]
Former-commit-id: 67f0be97b9bd51c009176c4f3dc90364eecc1921 [formerly 75135bf8f6]
Former-commit-id: babef87edb
2013-01-21 14:58:16 -06:00
Nate Jensen
a7ec1dbff7 Merge "Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it." into development
Former-commit-id: a5b388edd8 [formerly d725a23922] [formerly 36fc48eb53] [formerly a5b388edd8 [formerly d725a23922] [formerly 36fc48eb53] [formerly d45d793d36 [formerly 36fc48eb53 [formerly 73d470a83799446554b4dd86eb20638c0d5fc48f]]]]
Former-commit-id: d45d793d36
Former-commit-id: 5a1eb095e1 [formerly e0452a81c7] [formerly 672b2cf65e22e27ddf1106dc9cc5000694c6e8f6 [formerly e969a8c438]]
Former-commit-id: 861f150c36d57141bcab8c68c14c1ee3b2fcfd74 [formerly 6400ecbe98]
Former-commit-id: 977cf22051
2013-01-21 11:42:37 -06:00