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
Mike Duff
e20b1d8538
Issue #1523 - Finalize registry and data delivery stats
...
Former-commit-id: 4186b10583
[formerly cbfd355219
] [formerly 9c033e6484
] [formerly 4186b10583
[formerly cbfd355219
] [formerly 9c033e6484
] [formerly 561e83454f
[formerly 9c033e6484
[formerly d691b22ff903b2231e2a04747a8b4f93174ec4e3]]]]
Former-commit-id: 561e83454f
Former-commit-id: 4ab0eecfa0
[formerly 7e421afc03
] [formerly f8db6cdbac08b1f47e17566c905c303288aef176 [formerly 29939914a2
]]
Former-commit-id: 791bd487a82d7c311992391dac0aea88f3c72fe4 [formerly c000ee3cd9
]
Former-commit-id: ff6de982ca
2013-01-23 14:40:23 -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
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
Ron Anderson
3059eb3540
Issue #1504 Fix merge error
...
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6
Former-commit-id: a73d824233
[formerly c165cd4e3b
] [formerly b5fd4e6226
] [formerly a73d824233
[formerly c165cd4e3b
] [formerly b5fd4e6226
] [formerly cac86a904d
[formerly b5fd4e6226
[formerly 71aca907a76084392402160005bbeb157cfddfc4]]]]
Former-commit-id: cac86a904d
Former-commit-id: 896cea5586
[formerly cfeab572a2
] [formerly f86057cf80982d74b3fed381444651b47020a449 [formerly 68af35c524
]]
Former-commit-id: 83401cfccdf7434bcd234a7a809651412419e39a [formerly af348cb53a
]
Former-commit-id: 33bd709957
2013-01-22 18:22:19 -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
Ron Anderson
a6b9f085d7
Merge "Issue #1504 Fix merge error" into 13.2.1_delivery
...
Former-commit-id: d2a7bb20e6
[formerly abb36c3114
] [formerly a1d7a1cbc9
] [formerly d2a7bb20e6
[formerly abb36c3114
] [formerly a1d7a1cbc9
] [formerly b7abb8d4e4
[formerly a1d7a1cbc9
[formerly 3a231135b5686e0c26e7d43d74d742b29ce88b1b]]]]
Former-commit-id: b7abb8d4e4
Former-commit-id: a660c63e37
[formerly e9855ab55a
] [formerly 796f7b8150dc43e27e559e8c5cea3a5559df55b4 [formerly 8fb70d5ddc
]]
Former-commit-id: 09cabfac4c08475e6e690428241e47f4dcc50761 [formerly 05de6bdf6b
]
Former-commit-id: 38e4a75c49
2013-01-22 17:50:40 -06:00
Ron Anderson
4076898ff9
Issue #1504 Fix merge error
...
Change-Id: I058b1d1c57f506c3047480f0b85ac9dd439d7fd6
Former-commit-id: 5e5d27a9a7
[formerly 5c6af0d0a1
] [formerly c83667e9b5
] [formerly 5e5d27a9a7
[formerly 5c6af0d0a1
] [formerly c83667e9b5
] [formerly 2f4badad98
[formerly c83667e9b5
[formerly f0e56aa95e2f06c04cd02f7c429736a6ba88feb5]]]]
Former-commit-id: 2f4badad98
Former-commit-id: 02ddcfecf9
[formerly cb3e710d4c
] [formerly 813ef0be1d506471a55ae9362d82d11f346967aa [formerly 8e15531e08
]]
Former-commit-id: 228ae3c61b17392845a86458ba90cb7f51d2ad84 [formerly 6b2815a40c
]
Former-commit-id: cb3ccc4533
2013-01-22 16:54:04 -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
Dustin Johnson
e065d180ce
Merge "Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets." into 13.2.1_delivery
...
Former-commit-id: be213b454c
[formerly 04398e0aa4
] [formerly c1f03f7d81
] [formerly be213b454c
[formerly 04398e0aa4
] [formerly c1f03f7d81
] [formerly 350becc94f
[formerly c1f03f7d81
[formerly 2b3039f0f55655d484867701b4f28bfae12aece9]]]]
Former-commit-id: 350becc94f
Former-commit-id: d1c07e450f
[formerly 8aed30442e
] [formerly 03554cc48e06593184d75efb46c5490922947ac0 [formerly aa85e0c3ca
]]
Former-commit-id: e307c8be393898fdb0bdf78621d2e7c285a458ab [formerly 51a9a32485
]
Former-commit-id: ce68428901
2013-01-21 12:23:08 -06:00
Nate Jensen
4049a63abe
Merge "Issue #1446 add getLatCoords and getLonCoords to python data access framework" into development
...
Former-commit-id: 8d00d8109d
[formerly 0edf7d7c9f
] [formerly e0896d8b5d
] [formerly 8d00d8109d
[formerly 0edf7d7c9f
] [formerly e0896d8b5d
] [formerly ec1d35251c
[formerly e0896d8b5d
[formerly 06dfa2bba6f7d061b43783e9029b164ad208b6fe]]]]
Former-commit-id: ec1d35251c
Former-commit-id: a798f260da
[formerly 8f93ca0ed3
] [formerly eb0202cfcffd6a76f5d52dfe0b7e43b6f2e8578e [formerly 2a07d5c89f
]]
Former-commit-id: 816050d6e960bbbd3d5ae8748d61637a7b0b7249 [formerly 927f7e853b
]
Former-commit-id: 2a66e94209
2013-01-21 11:55:34 -06:00
Matt Nash
f8fec7da1f
Issue #1446 add getLatCoords and getLonCoords to python data access framework
...
Change-Id: I292a9b424cadf3033a861d8a0703b2f02946cd4e
Former-commit-id: 74377755f3
[formerly 34ca95f039
] [formerly af22cf8929
] [formerly 74377755f3
[formerly 34ca95f039
] [formerly af22cf8929
] [formerly b84af90fc2
[formerly af22cf8929
[formerly 30ffd1412f3b193ce1fe2560f2ecf29027e7f619]]]]
Former-commit-id: b84af90fc2
Former-commit-id: 155f7ccda6
[formerly 0652c0840d
] [formerly 85044aef318d3050f9f9e21a27fdc9129dcf75b0 [formerly 177d02d01b
]]
Former-commit-id: 363b226d8e7009fe005ab3beda16b80cfcfd4569 [formerly 2e6ba707e9
]
Former-commit-id: 28f809e4a7
2013-01-21 11:51:18 -06:00
Dustin Johnson
86367b5706
Merge "Issue #1513 Updated the way level lookups are created" into 13.2.1_delivery
...
Former-commit-id: 0918edc715
[formerly 5e15e3cdee
] [formerly 2c7c1d84ca
] [formerly 0918edc715
[formerly 5e15e3cdee
] [formerly 2c7c1d84ca
] [formerly 08c547c87b
[formerly 2c7c1d84ca
[formerly 28fb20a90b19d8d4b524f7ec2cf383b89d6eeaa2]]]]
Former-commit-id: 08c547c87b
Former-commit-id: 4b5ba259b1
[formerly 6678ed95c0
] [formerly b51d9becf38fce521041d943230d87150a7f39b9 [formerly 9207221493
]]
Former-commit-id: 9cb04e18c61e603580e5ef8f904b7ec80b242d0e [formerly c425cdce53
]
Former-commit-id: 5629da04f7
2013-01-21 11:46:56 -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
Dave Hladky
e134c593fa
Issue #1513 Updated the way level lookups are created
...
Change-Id: Ie1120707af608910a88c407ca8af8cf19b964555
Former-commit-id: da08fa1186
[formerly d0ff35051e
] [formerly 53ceda6a62
] [formerly da08fa1186
[formerly d0ff35051e
] [formerly 53ceda6a62
] [formerly cf1c674c2e
[formerly 53ceda6a62
[formerly a6b74b9bd1781ca61e364e24f61bb647602fcce6]]]]
Former-commit-id: cf1c674c2e
Former-commit-id: a2c43995ce
[formerly 82cd0a1b58
] [formerly 712cab376e7c48e00ea7d133e645e49a15eb434a [formerly e497d39d75
]]
Former-commit-id: 4ae833ddc07c41e9de121fa586bd4493adad2cdd [formerly 037353dda2
]
Former-commit-id: 220296333b
2013-01-21 11:19:00 -06:00
Nate Jensen
dee084f8b0
Issue #1509 garbage collect after each procedure run
...
Change-Id: I7792d8bc186d6cef0fea38eccb657af040746fd7
Former-commit-id: c625919a82
[formerly c5d725bc7e
] [formerly bd9123fb3a
] [formerly c625919a82
[formerly c5d725bc7e
] [formerly bd9123fb3a
] [formerly add161ae2f
[formerly bd9123fb3a
[formerly fa239d3e7413c7441ba4440f0fe10f9e373de3df]]]]
Former-commit-id: add161ae2f
Former-commit-id: 7dd236b118
[formerly 414004fabf
] [formerly 1fd87eebbb9f0f27ae7182f186b0c4c4f5b439bd [formerly 633af5e497
]]
Former-commit-id: 1b8a19a6cba949ac6e7d079110ecac30dc39303e [formerly 1a1eb9bf3b
]
Former-commit-id: 152a94adf4
2013-01-21 09:26:43 -06:00
Dave Hladky
36a791a66a
Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets.
...
Change-Id: I6035ad79a31f9ada9910d599d6529ca91ff03173
Former-commit-id: 280a3e30c1
[formerly 1c39b88ba4
] [formerly 786afee256
] [formerly 280a3e30c1
[formerly 1c39b88ba4
] [formerly 786afee256
] [formerly 5d8851b214
[formerly 786afee256
[formerly 07d90ad640806abd237fb13e1476adc1fb8d35c0]]]]
Former-commit-id: 5d8851b214
Former-commit-id: 5568acd736
[formerly bd7e8a6968
] [formerly 78c44449d6cffe22547976dbefb3b1a95a8fc2cb [formerly c45822f09b
]]
Former-commit-id: ed49e9f8d1d4a49107a636ede8c2bf4423227018 [formerly 409508d3e2
]
Former-commit-id: 4f536836cb
2013-01-21 08:29:29 -06:00
Richard Peter
b27ae2fcc6
Merge "Issue #1495 add ensemble selection tab to subset dialog Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15" into 13.2.1_delivery
...
Former-commit-id: 8c8a94d567
[formerly ac3b484474
] [formerly 76f9e42fd3
] [formerly 8c8a94d567
[formerly ac3b484474
] [formerly 76f9e42fd3
] [formerly 9feb73c161
[formerly 76f9e42fd3
[formerly 4eb1e71df46c7ceaa5bf523c02821228da42460e]]]]
Former-commit-id: 9feb73c161
Former-commit-id: 1e35efe888
[formerly d421b7208a
] [formerly ef6aa2471937a8b955d7b017530ab4995d6df2b3 [formerly 5acc5996d3
]]
Former-commit-id: dd8dccd6404d102b70842b175a43df8d8f8f89ae [formerly 06d25c6c95
]
Former-commit-id: 006dbb78cf
2013-01-18 15:43:16 -06:00
Ben Steffensmeier
4da28cee8d
Issue #1495 add ensemble selection tab to subset dialog
...
Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15
Former-commit-id: e708ba4f52
[formerly d06ef00715
] [formerly f0d1c1a737
] [formerly e708ba4f52
[formerly d06ef00715
] [formerly f0d1c1a737
] [formerly 14f3c3b3bf
[formerly f0d1c1a737
[formerly e884c8e79f05af8fb3252fa7a492d232ba090715]]]]
Former-commit-id: 14f3c3b3bf
Former-commit-id: 42fe324c9b
[formerly 0ec9848c96
] [formerly cd7bc6e539b5a2ef5c098ae0769f18f2a9472b85 [formerly a28d09edbf
]]
Former-commit-id: d45ed58fd3a7d3667b48c133ee1de0fdf14d1b6c [formerly 88dd263c34
]
Former-commit-id: c659ffb227
2013-01-18 15:42:08 -06:00
Richard Peter
54cef5995f
Merge "Issue #1495 enable ensemble subset requests in opendap. Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a" into 13.2.1_delivery
...
Former-commit-id: e3bd3302be
[formerly 7cc497c663
] [formerly 9f9020db61
] [formerly e3bd3302be
[formerly 7cc497c663
] [formerly 9f9020db61
] [formerly bf18ba9214
[formerly 9f9020db61
[formerly b940fe556d1421d3709ff6c798ee0a39ae09af10]]]]
Former-commit-id: bf18ba9214
Former-commit-id: 2d80fdb830
[formerly 0f208693ec
] [formerly 3b16030b9f1b267dee1b7eb29f2c46c200bd7d6f [formerly 2e5883c56e
]]
Former-commit-id: d2337ba61566384ceb4bcc390e63293ec569caba [formerly 0e6209822e
]
Former-commit-id: f891a71692
2013-01-18 15:35:56 -06:00
Ben Steffensmeier
5054efd439
Issue #1495 enable ensemble subset requests in opendap.
...
Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a
Former-commit-id: 2eaa5373a9
[formerly 928cb3b00f
] [formerly eb821d7580
] [formerly 2eaa5373a9
[formerly 928cb3b00f
] [formerly eb821d7580
] [formerly 94ba8511cb
[formerly eb821d7580
[formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]]]
Former-commit-id: 94ba8511cb
Former-commit-id: 472fa846d2
[formerly 41a0a0e4e4
] [formerly b0014a9838aaba0f74cd6e57a56e57324e4301d1 [formerly 7e3b6d12f6
]]
Former-commit-id: ea89fb19c068c670786e80d08dc112157fc53d90 [formerly 0232b77e85
]
Former-commit-id: cc33f33872
2013-01-18 14:58:10 -06:00
Greg Armendariz
47c892b21e
Merge "Issue #1508 : Improve capture to grab screen shots and multiple jstacks to track thread state over time" into 13.2.1_delivery
...
Former-commit-id: 5c7bb26fb6
[formerly edda76ad75
] [formerly 9d06f6ed6d
] [formerly 5c7bb26fb6
[formerly edda76ad75
] [formerly 9d06f6ed6d
] [formerly f7b046fa0d
[formerly 9d06f6ed6d
[formerly 0356abb43bea7c9bcf7fcfc9c43d46a2fa611389]]]]
Former-commit-id: f7b046fa0d
Former-commit-id: 8a1911c392
[formerly 817162c467
] [formerly ef490f989490503c10b7a1b4bb863400d1550c3c [formerly dda78c073a
]]
Former-commit-id: ebe9684f513a4be12b9e1ed01cbd91bd22751104 [formerly 26c8921b73
]
Former-commit-id: db31d16e61
2013-01-18 14:30:12 -06:00
Richard Peter
bddabfaaaf
Issue #1508 : Improve capture to grab screen shots and multiple jstacks to track thread state over time
...
Change-Id: I2d41e348d1cd4187887ec47c18f3b6d768ced8fd
Former-commit-id: 8269ba554b
[formerly b83e46a345
] [formerly a1c58ab36d
] [formerly 8269ba554b
[formerly b83e46a345
] [formerly a1c58ab36d
] [formerly af105bfe0f
[formerly a1c58ab36d
[formerly 8c232b02fbdd268f19e65676d68311b47469fcf3]]]]
Former-commit-id: af105bfe0f
Former-commit-id: b2b2184700
[formerly ee9adb9764
] [formerly 9404b257800521c9839b383dd2bea508dde12c1b [formerly f5c8534098
]]
Former-commit-id: 6c81dcf9d1bf482a730c7d7092e2180df7bacee0 [formerly 4ebbe408a8
]
Former-commit-id: a08e7f9fae
2013-01-18 13:55:56 -06:00
Bryan Kowal
9d54be13f0
Issue #1490 - updated edex-environment
...
- actually include the modified files in the commit this time
- each edex environment will now receive its own instance of pypies
- a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment
- the location of the pypies configuration file is no longer hard-coded; specified as an environment variable
- made the pypies tcp logging port configurable
- add source headers
- the configuration will now update the ServerRoot
Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d
Former-commit-id: 3a0114558b
[formerly 792c03d5f4
] [formerly b4964c0a19
] [formerly 3a0114558b
[formerly 792c03d5f4
] [formerly b4964c0a19
] [formerly 9e33969536
[formerly b4964c0a19
[formerly c96d7532679555f3ccf8a0d7bc07866e63ac177f]]]]
Former-commit-id: 9e33969536
Former-commit-id: a9c31457b8
[formerly bc757e5bc1
] [formerly 912fb037ce61d59d861a7468a62b5455d51ea0aa [formerly b47d484e70
]]
Former-commit-id: 6761c929373e609a39f863ab492cf3ace10a97b7 [formerly 75d8250852
]
Former-commit-id: 7ae14fdb20
2013-01-18 12:44:37 -06:00
Ben Steffensmeier
27af1f6334
Issue #1502 fix grid sampling unit null pointer.
...
Former-commit-id: 8aaef6b256
[formerly f814fd22a3
] [formerly b6fb3706bb
] [formerly 8aaef6b256
[formerly f814fd22a3
] [formerly b6fb3706bb
] [formerly 5a07b36fa4
[formerly b6fb3706bb
[formerly db0a4825b8360afaada2a8f8363108464e61f474]]]]
Former-commit-id: 5a07b36fa4
Former-commit-id: 0eee2239c9
[formerly 0b672c9c8c
] [formerly c58121817c1977071b465ef1296f92eda4eaa708 [formerly 57ef4597e8
]]
Former-commit-id: 9436368c1c6f1cac5154513c84513bbb52b24b2a [formerly 77d8f4ec1d
]
Former-commit-id: c67345f95a
2013-01-18 11:19:15 -06: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
f8888e5294
Merge branch '13.2.1_delivery' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java
Former-commit-id: bf957a3bd7
[formerly 89f3120c0c
] [formerly 2c9c6b7dde
] [formerly bf957a3bd7
[formerly 89f3120c0c
] [formerly 2c9c6b7dde
] [formerly 407d73a04f
[formerly 2c9c6b7dde
[formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]]]
Former-commit-id: 407d73a04f
Former-commit-id: f2b52084dc
[formerly 0ca985778e
] [formerly 5714abfd35536ab502243bd9ff20068b0fa7b7ac [formerly bbb637faf3
]]
Former-commit-id: 56287c40efa8ad1381c1a6f8efbc143f960cefd1 [formerly 45760d8bef
]
Former-commit-id: 61a9f644d9
2013-01-18 10:52:29 -06:00
Mike Duff
02bc6a55eb
Issue #1386 - Change menu text to read Save Graph Image.
...
Former-commit-id: 991f3cfe7b
[formerly 754fbf637e
] [formerly 5b6ec484c0
] [formerly 991f3cfe7b
[formerly 754fbf637e
] [formerly 5b6ec484c0
] [formerly 592b2d9088
[formerly 5b6ec484c0
[formerly c8e849b1636d9429215a36ba85febf805cdd4fc6]]]]
Former-commit-id: 592b2d9088
Former-commit-id: 51cc047273
[formerly b3c1a39a24
] [formerly ae69de2fa237e867ddd3d711b0f7464ebf08b9a8 [formerly d0d05f975d
]]
Former-commit-id: 87f25796bd323309d12fd0b38aa6059c7c52e8a9 [formerly 2f8c734d8e
]
Former-commit-id: 4119d2bb88
2013-01-18 09:28:43 -06:00
Nate Jensen
cb821dd354
Issue #1497 fix build
...
Former-commit-id: bd08d7a537
[formerly 13b5619297
] [formerly 6e0f0d330e
] [formerly bd08d7a537
[formerly 13b5619297
] [formerly 6e0f0d330e
] [formerly b52aa82213
[formerly 6e0f0d330e
[formerly 3b30fcffe24d19c6c694d9519d1a515843248d32]]]]
Former-commit-id: b52aa82213
Former-commit-id: 44606a58a4
[formerly cc0725f0b7
] [formerly da7e2f9e2766d8828401b92dfc04d9fa22173489 [formerly 98ec6fcc1c
]]
Former-commit-id: 21fe67a7ddd0c322ff0e217fbc6a3f7a25e888dd [formerly d269e1953b
]
Former-commit-id: c71320d922
2013-01-17 18:42:38 -06:00