Dustin Johnson
0a958fb225
Merge "Issue #1543 Use XML to represent retrieval - Only include request identifier for serialized retrieval data - RetrievalAttributes are now retrieved from the database - Remove plugin data objects from class names - Add retrievalDao to retrieval task constructor" into development
...
Former-commit-id: c1e20611d5
[formerly 7392aab40c
] [formerly c1e20611d5
[formerly 7392aab40c
] [formerly de8e371471
[formerly e2b704d27ce7b4d9e2d3ac86ef5081eeb844d96c]]]
Former-commit-id: de8e371471
Former-commit-id: 73620cf82f
[formerly 0cf2c65afa
]
Former-commit-id: 1ddd1de10a
2013-02-18 13:20:53 -06:00
Dustin Johnson
191ec3b408
Issue #1543 Use XML to represent retrieval
...
- Only include request identifier for serialized retrieval data
- RetrievalAttributes are now retrieved from the database
- Remove plugin data objects from class names
- Add retrievalDao to retrieval task constructor
Amend:
Add call-through method to prepare for serialization.
Change-Id: Ic5d2243dd77e1aefd49057a0b7843329e95f0c9d
Former-commit-id: f16c1507d0
[formerly 437a168b50
] [formerly f16c1507d0
[formerly 437a168b50
] [formerly 62a84aea76
[formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]]]
Former-commit-id: 62a84aea76
Former-commit-id: 6f94c035e8
[formerly db3a9d8f19
]
Former-commit-id: f6257b20ea
2013-02-18 13:05:41 -06:00
Steve Harris
59eb93efc3
Merge branch 'master_13.2.1' into master_13.3.1
...
Former-commit-id: bbc1b6fb55
[formerly 1b631ebb9a
] [formerly bbc1b6fb55
[formerly 1b631ebb9a
] [formerly b29c0b805f
[formerly 8584d078529382aadd9f1eac527f89ea58808df1]]]
Former-commit-id: b29c0b805f
Former-commit-id: 9a90ba3d07
[formerly 15e9481838
]
Former-commit-id: 38328aed51
2013-02-18 12:39:53 -06:00
Roger Ferrel
2ad4fdd716
Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time.
...
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869
Former-commit-id: a2e61d32a1
[formerly 1b693994a5
] [formerly a2e61d32a1
[formerly 1b693994a5
] [formerly 1d51a10f4b
[formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 94eb5757b5
[formerly 211a39c333
]
Former-commit-id: 47c549c5e8
2013-02-18 12:15:39 -06:00
Ben Steffensmeier
bc3be10852
Issue #1598 Make GridParamInfoLookup filter on extension.
...
Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744
Former-commit-id: efc1335b1f
[formerly 63a725718d
] [formerly efc1335b1f
[formerly 63a725718d
] [formerly d2e17d1473
[formerly f89bef237373fd2c7f6bb5b7490ee6aa63d2040b]]]
Former-commit-id: d2e17d1473
Former-commit-id: 47090eccc1
[formerly 5ada0b2c2a
]
Former-commit-id: d472a5d48e
2013-02-18 10:36:47 -06:00
Steve Harris
e4a430b3a9
Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
...
Former-commit-id: b8720e185d
[formerly 1874b07ab4
] [formerly b8720e185d
[formerly 1874b07ab4
] [formerly 6318348e3b
[formerly c397745e9c36a88bf71d87b671f0a8c826e117ea]]]
Former-commit-id: 6318348e3b
Former-commit-id: 85fa1539ef
[formerly 4777c782e2
]
Former-commit-id: 71edff51e2
2013-02-18 09:52:22 -06:00
Richard Peter
a84328c00d
Merge "Issue #1630 updated chunk size for single dimension chunks." into development
...
Former-commit-id: 3ad71676b3
[formerly 6beaa1e8ae
] [formerly 3ad71676b3
[formerly 6beaa1e8ae
] [formerly 14c2a2b201
[formerly 010d73f684ec58affd0aeffcef64c6904f909bef]]]
Former-commit-id: 14c2a2b201
Former-commit-id: 13cb57b378
[formerly 0a47749664
]
Former-commit-id: a5e4f70474
2013-02-18 09:44:36 -06:00
Steve Harris
a488f3d978
Issue #1632 - new FOSS licenses added for Data Delivery plugins
...
Former-commit-id: 049c219f2b
[formerly 02ec634536
] [formerly 049c219f2b
[formerly 02ec634536
] [formerly b9ce5b8b35
[formerly 82d2a8bdfe9a82cce28637153c8cbb169bd1aa5a]]]
Former-commit-id: b9ce5b8b35
Former-commit-id: 7a9501de55
[formerly 3c3681420e
]
Former-commit-id: daba9ecc43
2013-02-18 09:39:31 -06:00
Richard Peter
1015d581cb
Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development
...
Former-commit-id: 3c126b0ab1
[formerly 355e6d2c67
] [formerly 3c126b0ab1
[formerly 355e6d2c67
] [formerly 4fb1cb27dc
[formerly a07a434ad71986aa4b474dd88e266035e347efa4]]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 4f3d9ab931
[formerly 8991c1c86d
]
Former-commit-id: 17dfe3e7fa
2013-02-18 09:35:53 -06:00
Brad Gonzales
79b1560c07
Issue #1630 updated chunk size for single dimension chunks.
...
Amend: check if dataType is vlen_str_type.
Change-Id: Idbd39e8bcd6c2703299277b073e14b106c897ccb
Former-commit-id: f8b4dcc541
[formerly 4c706901f8
] [formerly f8b4dcc541
[formerly 4c706901f8
] [formerly 691b9d7ca2
[formerly 25bd6d76b85b3c857958f1fc5189f9512420daea]]]
Former-commit-id: 691b9d7ca2
Former-commit-id: 1ce25acbc5
[formerly b9b660535c
]
Former-commit-id: b8147737fe
2013-02-18 09:29:21 -06:00
Steve Harris
801cddca64
Merge branch 'master_13.2.1' (13.2.1-8) into omaha_13.2.1
...
Former-commit-id: 15d6e6ad3b
[formerly ae66ccc3ee
] [formerly 15d6e6ad3b
[formerly ae66ccc3ee
] [formerly acaef77d90
[formerly 5e40606e95d506d213de3916f0f5d3a4eee7884a]]]
Former-commit-id: acaef77d90
Former-commit-id: 2c7ff9b631
[formerly 8da2277243
]
Former-commit-id: ef8c4d6598
2013-02-18 09:14:13 -06:00
Steve Harris
32ad300b47
13.2.1-8 baseline
...
Former-commit-id: 18da2e93d7
[formerly f81b382c04
] [formerly 18da2e93d7
[formerly f81b382c04
] [formerly 053156f02e
[formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 8cffb55371
[formerly c6d584758f
]
Former-commit-id: edac913af7
2013-02-18 09:09:41 -06:00
Nate Jensen
92148eca41
Merge "Issue #1614 Cache LatLonReprojection results. Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338" into development
...
Former-commit-id: eb8e87dfe2
[formerly 88b665c09a
] [formerly eb8e87dfe2
[formerly 88b665c09a
] [formerly 52a0673961
[formerly cb57fe31471693b2f3398d0c6bd97af36410d9b8]]]
Former-commit-id: 52a0673961
Former-commit-id: d39e16e532
[formerly d648e77fa5
]
Former-commit-id: f41ef80162
2013-02-18 09:07:18 -06:00
Ron Anderson
0ef1805569
Merge "Issue #1507 : Improve responsiveness of menus that list smart tools or procedures by forcing UIControllers to be constructed at startup, not on demand." into development
...
Former-commit-id: cf0fc8d921
[formerly e70cfc5825
] [formerly cf0fc8d921
[formerly e70cfc5825
] [formerly a6d87cdd7e
[formerly a1e38ed2f2da79028b04589a548b16543700f08f]]]
Former-commit-id: a6d87cdd7e
Former-commit-id: 292614bc25
[formerly 999ac02aea
]
Former-commit-id: 873a7075ae
2013-02-18 08:31:50 -06:00
Steve Harris
933e9f3f75
13.2.1-8 baseline
...
Former-commit-id: da707ff25c
[formerly 27d88edcb9
] [formerly da707ff25c
[formerly 27d88edcb9
] [formerly 535a9402a7
[formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]]
Former-commit-id: 535a9402a7
Former-commit-id: 58bafc0068
[formerly a68ce64f45
]
Former-commit-id: 7b6e374314
2013-02-18 09:23:06 -05:00
Mike Duff
2aee18ea9d
Issue #1584 - FFMP performance stats and performance logger
...
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c
Former-commit-id: 897262630c
[formerly 0b044dba9c
] [formerly 897262630c
[formerly 0b044dba9c
] [formerly 9c1e0ab639
[formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 3e59308771
[formerly 079ec4b6dd
]
Former-commit-id: 72f6e95a67
2013-02-18 08:16:57 -06:00
Richard Peter
3b53668cbe
Merge "Issue #1506 move away from using QueryScript on the UI thread, except where absolutely necessary we can run a synchronous operation" into development
...
Former-commit-id: 5bf0e0e999
[formerly 51533ccab2
] [formerly 5bf0e0e999
[formerly 51533ccab2
] [formerly 70f270ff16
[formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]]
Former-commit-id: 70f270ff16
Former-commit-id: 1b112227a8
[formerly 2299503559
]
Former-commit-id: 73501955ff
2013-02-15 16:40:04 -06:00
Richard Peter
107393f436
Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
...
Former-commit-id: b3e2ca7b30
[formerly a40ae4d8b2
] [formerly b3e2ca7b30
[formerly a40ae4d8b2
] [formerly a6fa92923f
[formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]]
Former-commit-id: a6fa92923f
Former-commit-id: 774ea0ede6
[formerly 5936f671ce
]
Former-commit-id: b5706ca6cf
2013-02-15 16:33:00 -06:00
Ben Steffensmeier
3da1ee4eca
Issue #1614 Cache LatLonReprojection results.
...
Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338
Former-commit-id: a10e7edaeb
[formerly e53416937e
] [formerly a10e7edaeb
[formerly e53416937e
] [formerly feb2e98e58
[formerly 2596b3105e377f0fb8713be502a41b4b2f470e93]]]
Former-commit-id: feb2e98e58
Former-commit-id: 5b1acfdeb3
[formerly 6b53511f9e
]
Former-commit-id: 18d64138d3
2013-02-15 14:24:22 -06:00
Brad Gonzales
b2e457022d
Issue #1615 Changed radar header names to match other header names.
...
Change-Id: I6b3be3028a1602ead03ec209e773db68bbfb665a
Former-commit-id: 1ddcd8b3a8
[formerly a9012633a1
] [formerly 1ddcd8b3a8
[formerly a9012633a1
] [formerly 961f51e91f
[formerly b7f5d565bdfb8f1289f73837ffa9a54f2659d65c]]]
Former-commit-id: 961f51e91f
Former-commit-id: 1501ed6deb
[formerly 0dda5f784e
]
Former-commit-id: 36fdf25480
2013-02-15 14:02:03 -06:00
Ron Anderson
e524bec079
Issue #1629 fix error storing preferences in GIS Viewer
...
Change-Id: Id677dd9206c16f8c95b022e31fcac7acc6b07eb6
Former-commit-id: d4a915b48d
[formerly 689c32a9c3
] [formerly d4a915b48d
[formerly 689c32a9c3
] [formerly 354d8b0366
[formerly 7d73fd3f0f2d8ebbbf75d5928b06202f5f7cd42a]]]
Former-commit-id: 354d8b0366
Former-commit-id: ca6ca60f22
[formerly 4334fab2f9
]
Former-commit-id: 50be79358b
2013-02-15 13:44:52 -06:00
David Gillingham
f21dbe9026
Issue #1507 : Improve responsiveness of menus that list smart tools or procedures by forcing
...
UIControllers to be constructed at startup, not on demand.
Change-Id: Ifb492171ac4720e36f68da082c38d31c1de08132
Former-commit-id: 9fae6695e2
[formerly 871364d630
] [formerly 9fae6695e2
[formerly 871364d630
] [formerly da091b723d
[formerly 463af46e64ed667efbc840d85f9babf3449780cc]]]
Former-commit-id: da091b723d
Former-commit-id: cc05bdae4e
[formerly 244bc9b270
]
Former-commit-id: 345288aa13
2013-02-15 12:50:48 -06:00
Jonathan Sanchez
3f13abe62a
Issue #1624 Temporary fix for NullPointerException.
...
Former-commit-id: 18dd00e488
[formerly f507d23fed
] [formerly 18dd00e488
[formerly f507d23fed
] [formerly fea6b44036
[formerly f95a402347ae45ad133206bfea796b240decf0a6]]]
Former-commit-id: fea6b44036
Former-commit-id: 763280dd53
[formerly 1486022395
]
Former-commit-id: f948e7b5b6
2013-02-15 12:31:21 -06:00
Lee Venable
3e7f56375b
Merge "Issue #1607 Added time variables for CORs." into development
...
Former-commit-id: 628d0d9840
[formerly d94233499a
] [formerly 628d0d9840
[formerly d94233499a
] [formerly 91e016aa34
[formerly 7a6200d4bfe21feb6e29603dd638876f50a66162]]]
Former-commit-id: 91e016aa34
Former-commit-id: 5ec5918e45
[formerly 38bbca4895
]
Former-commit-id: 8b3c710869
2013-02-15 12:08:15 -06:00
Nate Jensen
7bcb70160d
Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development
...
Former-commit-id: 1b1e468e1f
[formerly f748815e22
] [formerly 1b1e468e1f
[formerly f748815e22
] [formerly f79f7db348
[formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]]
Former-commit-id: f79f7db348
Former-commit-id: d6ba283efc
[formerly a60cf277bc
]
Former-commit-id: 1501b0f1e3
2013-02-15 11:56:11 -06:00
Ben Steffensmeier
e6fc131343
Issue #1614 Refactor data access framework to use single request.
...
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798
Former-commit-id: e771076275
[formerly 1393f3e3cf
] [formerly e771076275
[formerly 1393f3e3cf
] [formerly 0933a5f596
[formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]]
Former-commit-id: 0933a5f596
Former-commit-id: 91bbdc3337
[formerly f0f3c71d50
]
Former-commit-id: f868f66f76
2013-02-15 11:39:56 -06:00
Ron Anderson
46f006d12a
Issue #1629 Attempt to fix error saving preferences in GIS Viewer
...
Change-Id: I982637de1cc898d9887849a8276a3693b9579d5b
Former-commit-id: 3033238f1b
[formerly d574da6155
] [formerly 3033238f1b
[formerly d574da6155
] [formerly b76653a885
[formerly f0d1aa59c4971ed523e4f26b440134a417aec5d0]]]
Former-commit-id: b76653a885
Former-commit-id: 632bd48a45
[formerly df84bf7f86
]
Former-commit-id: 95fd1b2d64
2013-02-15 11:13:43 -06:00
Jonathan Sanchez
f6244fb198
Issue #1607 Added time variables for CORs.
...
Former-commit-id: 38802d3df8
[formerly 6d968dc09d
] [formerly 38802d3df8
[formerly 6d968dc09d
] [formerly 3025639923
[formerly 311f633ba47efcf3b13f77867e1fa32a584f3232]]]
Former-commit-id: 3025639923
Former-commit-id: 352d3dea5a
[formerly bb797eeb74
]
Former-commit-id: e7a2a2f99c
2013-02-15 09:59:12 -06:00
Ron Anderson
80df624bb3
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: dc7c9edb87
[formerly a2a89fb4e7
] [formerly dc7c9edb87
[formerly a2a89fb4e7
] [formerly 7c0a5d74bf
[formerly dc9ac54903107224633b4e18d5caa345649d8266]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: d69d628450
[formerly e952a4f179
]
Former-commit-id: 45627edcc7
2013-02-15 09:03:41 -06:00
Richard Peter
1b8a4b159d
Merge "Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging." into development
...
Former-commit-id: dcd4761b54
[formerly eb00310ef9
] [formerly dcd4761b54
[formerly eb00310ef9
] [formerly b54ec2b59e
[formerly b3c7458333b9a8d0f011614c0b4845397e074ce8]]]
Former-commit-id: b54ec2b59e
Former-commit-id: ad4110a73f
[formerly 0bab06709b
]
Former-commit-id: b82e1249bd
2013-02-15 08:44:02 -06:00
Richard Peter
424d5a62fd
Merge "Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType." into development
...
Former-commit-id: bd91d2b8be
[formerly 5a5a5ba855
] [formerly bd91d2b8be
[formerly 5a5a5ba855
] [formerly d905313941
[formerly 7071c075ee2282b6048cafdefac6d6c83a344ca0]]]
Former-commit-id: d905313941
Former-commit-id: 015b51082d
[formerly 2d8327e76f
]
Former-commit-id: 8cac928d13
2013-02-15 08:31:33 -06:00
Dustin Johnson
12d4b055f6
Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
...
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41
Former-commit-id: 4be6c12ac6
[formerly 714ea1c8d8
] [formerly 4be6c12ac6
[formerly 714ea1c8d8
] [formerly 6e2f69939f
[formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]]
Former-commit-id: 6e2f69939f
Former-commit-id: d0ecd69456
[formerly 1ef440f8ee
]
Former-commit-id: f14bedec28
2013-02-15 08:13:11 -06:00
Dustin Johnson
9213ea18f2
Merge "Issue #1595 Fix expired subscription update retrieval time scheduling" into development
...
Former-commit-id: 6ba5f0d03b
[formerly d71773dbb4
] [formerly 6ba5f0d03b
[formerly d71773dbb4
] [formerly f96d83110c
[formerly 5ec93e8102bcd837650b4ae7725dceaa8bb61bfd]]]
Former-commit-id: f96d83110c
Former-commit-id: 0156736b85
[formerly 507c83f32a
]
Former-commit-id: 4bb9f3eda7
2013-02-15 08:08:49 -06:00
Brad Gonzales
3d92be6fc1
Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType.
...
Amend: Corrected comment in convertPluginNameToDataType.sh
Change-Id: I5e0084704cef599d368165058b8008bbb2bc8e18
Former-commit-id: 6a0e9c331b
[formerly 03dd42463e
] [formerly 6a0e9c331b
[formerly 03dd42463e
] [formerly dfef89ee64
[formerly a2391d76c91d3d2b86b8e74eed1e0754091650a0]]]
Former-commit-id: dfef89ee64
Former-commit-id: 936facbe86
[formerly e495a5f663
]
Former-commit-id: 5e69b61418
2013-02-14 17:34:55 -06:00
Nate Jensen
c2f53b312f
Merge "Issue #1627 Sped up FFMp load by removing un-needed DB calls." into development
...
Former-commit-id: be680f2523
[formerly 7cf29fbf39
] [formerly be680f2523
[formerly 7cf29fbf39
] [formerly 6d8b8dd774
[formerly c83110e509d662da0a4b1975bc1044fb7ffadb9e]]]
Former-commit-id: 6d8b8dd774
Former-commit-id: ebb3394719
[formerly 0ce3009528
]
Former-commit-id: b9e978a6e2
2013-02-14 16:39:23 -06:00
Ben Steffensmeier
c300faa186
Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
...
Change-Id: I48738965df0da9052f810dfc1f312ed032693390
Former-commit-id: 1940a92596
[formerly aa4c7526ff
] [formerly 1940a92596
[formerly aa4c7526ff
] [formerly 8c0e9d3d9e
[formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: 086f6aabe9
[formerly 455aa4628f
]
Former-commit-id: 49b700da85
2013-02-14 15:34:25 -06:00
Dustin Johnson
4466e63c84
Issue #1595 Fix expired subscription update retrieval time scheduling
...
Change-Id: I225bf887d03e43295f4b18eea677bb24c032b8a7
Former-commit-id: 54dd90afdd
[formerly 656601f272
] [formerly 54dd90afdd
[formerly 656601f272
] [formerly f6a286da2d
[formerly 26dd90355f6ce2ed5c409a142622cf220754c2ab]]]
Former-commit-id: f6a286da2d
Former-commit-id: 158ce1fe5b
[formerly 776581bc55
]
Former-commit-id: 0614bd08f7
2013-02-14 15:33:06 -06:00
Dave Hladky
8810b8e486
Issue #1627 Sped up FFMp load by removing un-needed DB calls.
...
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956
Former-commit-id: 83fe9ca104
[formerly 8247da158f
] [formerly 83fe9ca104
[formerly 8247da158f
] [formerly a8f6635a6f
[formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]]
Former-commit-id: a8f6635a6f
Former-commit-id: 7f6381ec5c
[formerly 4cd9b2e8b2
]
Former-commit-id: 7b723067a4
2013-02-14 15:12:29 -06:00
Nate Jensen
498c622823
Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
...
Former-commit-id: 5526ee7e8d
[formerly 1144f08e59
] [formerly 5526ee7e8d
[formerly 1144f08e59
] [formerly a3e0bf09ab
[formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]]
Former-commit-id: a3e0bf09ab
Former-commit-id: b4aea0385c
[formerly 3f5b8b56ef
]
Former-commit-id: 2422d17df3
2013-02-14 15:05:14 -06:00
Dave Hladky
3dd2314369
Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
...
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950
Former-commit-id: 2655952304
[formerly 7b3a310f67
] [formerly 2655952304
[formerly 7b3a310f67
] [formerly 381aec5976
[formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]]
Former-commit-id: 381aec5976
Former-commit-id: a17dee033a
[formerly 5c66cbcd27
]
Former-commit-id: 7dad108a93
2013-02-14 13:58:32 -06:00
Steve Harris
09184a736d
13.2.1-7 baseline
...
Merge branch 'master_13.2.1' into master_13.3.1
Conflicts solved with 'theirs' strategy (all of 13.2.1-7)
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: a67564bea7
[formerly a53a44d42c
] [formerly a67564bea7
[formerly a53a44d42c
] [formerly d9028f55d3
[formerly 1108d28cc473cd1b6be7ec5c78e78c7b6d1ea56f]]]
Former-commit-id: d9028f55d3
Former-commit-id: c75b30c245
[formerly 5bf55de767
]
Former-commit-id: 7b923d1891
2013-02-14 13:55:35 -06:00
Steve Harris
94d338ea0c
13.1.1-10 baseline
...
Former-commit-id: baa5de2147
[formerly 06d0e6dd16
] [formerly baa5de2147
[formerly 06d0e6dd16
] [formerly 9b73b6a2a9
[formerly 1e337899d45617a8ee1998f2d2c86f2912668b67]]]
Former-commit-id: 9b73b6a2a9
Former-commit-id: a491a84615
[formerly c8c783f128
]
Former-commit-id: ba12b38550
2013-02-14 13:24:43 -06:00
Steve Harris
8b3511b32f
13.1.1-10 baseline
...
Former-commit-id: eff75cc712
[formerly 56a36af0c2
] [formerly eff75cc712
[formerly 56a36af0c2
] [formerly 986c332e69
[formerly d5639bcdf900c60d883eb975e3062ebc55803da1]]]
Former-commit-id: 986c332e69
Former-commit-id: 57ccd18d85
[formerly fa962f98a4
]
Former-commit-id: e0dc0fbfcc
2013-02-14 14:11:00 -05:00
Lee Venable
435285111b
Merge "Issue #1605 Improved finding closest area locations. " into development
...
Former-commit-id: 4383968e23
[formerly b047a0393f
] [formerly 4383968e23
[formerly b047a0393f
] [formerly 60f3f46d19
[formerly 1c778e9c7140214bed727a2eac73c0461d134341]]]
Former-commit-id: 60f3f46d19
Former-commit-id: dfef1c916a
[formerly 4952a3f595
]
Former-commit-id: 0ebc7317a2
2013-02-14 12:56:01 -06:00
Matt Nash
2939e7ea25
Issue #1506 move away from using QueryScript on the UI thread, except where
...
absolutely necessary we can run a synchronous operation
Change-Id: I4503d4e18e3f458b7df7c2d187e8880d5a3d2cc7
Former-commit-id: 75f51be7b2
[formerly bc954889eb
] [formerly 75f51be7b2
[formerly bc954889eb
] [formerly 5b136272a3
[formerly f6ef0f0ebc9002caad9a632515402b84280892fc]]]
Former-commit-id: 5b136272a3
Former-commit-id: 126537966c
[formerly d29162c654
]
Former-commit-id: c2d41ae6a2
2013-02-14 11:47:34 -06:00
Ron Anderson
7203cc6531
Merge "Issue #1515 : Better handle notifications received after disposing VCParms." into development
...
Former-commit-id: 11212b51db
[formerly e04322f7ad
] [formerly 11212b51db
[formerly e04322f7ad
] [formerly 96fee6ea56
[formerly 1f5fbc207e533be5a7dde9651dd35743a0fc3a34]]]
Former-commit-id: 96fee6ea56
Former-commit-id: 377e85913f
[formerly b5ff9b6998
]
Former-commit-id: 0fd4810cfa
2013-02-14 11:13:26 -06:00
Jonathan Sanchez
f60cb362f2
Issue #1605 Improved finding closest area locations.
...
Former-commit-id: 4555420e82
[formerly 9641b67da4
] [formerly 4555420e82
[formerly 9641b67da4
] [formerly 1722713689
[formerly b8a43d95121a1876dc8136bd5758e9452167fad2]]]
Former-commit-id: 1722713689
Former-commit-id: c1a832ef3a
[formerly 459472a793
]
Former-commit-id: 73110463b1
2013-02-14 11:12:23 -06:00
Ben Steffensmeier
2bcf3749ce
Issue #1614 allow locationNames for grid data access
...
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2
Former-commit-id: ef7addb005
[formerly ab319bd3a8
] [formerly ef7addb005
[formerly ab319bd3a8
] [formerly 9b4de367e3
[formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]]
Former-commit-id: 9b4de367e3
Former-commit-id: efaddb710c
[formerly 0995024482
]
Former-commit-id: aecc5a69e9
2013-02-14 10:07:01 -06:00
Dustin Johnson
1d80262cf9
Issue #1543 Serialize DODS response rather than plugin data objects directly
...
- Remove proxy classes for Spring transactions, use interfaces as Spring recommends.
Amend:
Peer review comments.
Set retrieval status to failed when payload is null.
Change-Id: I458b13856302c8faceeef985c1c41115644520b7
Former-commit-id: 25faaa2af0
[formerly dd8ca33fc4
] [formerly 25faaa2af0
[formerly dd8ca33fc4
] [formerly d143735ea8
[formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]]]
Former-commit-id: d143735ea8
Former-commit-id: 6f821ed8c9
[formerly 9783dc4d9f
]
Former-commit-id: 922da948eb
2013-02-14 09:49:22 -06:00
Nate Jensen
401c4cc7cb
Merge "Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away." into development
...
Former-commit-id: e3b89f87c6
[formerly 5b8504196e
] [formerly e3b89f87c6
[formerly 5b8504196e
] [formerly 25580a8adc
[formerly 4c1268c3d9c8acaad2fe334c97ee2fb8f6d5ccff]]]
Former-commit-id: 25580a8adc
Former-commit-id: 3ff7ce2248
[formerly dcb90069cf
]
Former-commit-id: 6b160d14cc
2013-02-14 09:26:14 -06:00