Commit graph

883 commits

Author SHA1 Message Date
Steve Harris
11421048fb 12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: bbc20f4a68 [formerly 22dac5c82e] [formerly 077ced354e] [formerly fd5e214e72 [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]
Former-commit-id: fd5e214e72
Former-commit-id: bdf8cbe13f96fe312d8ad014285d113e04c8d85a [formerly ba25027ea5]
Former-commit-id: 9f3bd0d4ec
2012-09-12 13:10:36 -05:00
Max Schenkelberg
c8d7d72fcb Issue #626 Changed satellite distribution file to only match on expected WMO headers TIC, TIG, and TIT
Change-Id: I2e6e538870c605675d8070d79786398adbf7dbcb

Former-commit-id: 863ecb1ad6 [formerly e1b01588d1] [formerly eabc8d684b] [formerly cc37173be9 [formerly eabc8d684b [formerly 42b8711fa44c85aee40070683729727192b62891]]]
Former-commit-id: cc37173be9
Former-commit-id: 95fa4b0a40ddfb9e179dc5f25ed544f2ae347f2c [formerly ec9b3c56fb]
Former-commit-id: 69ba6f1ce1
2012-09-12 09:22:25 -05:00
Nate Jensen
43c2ee4358 Merge "Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed." into development
Former-commit-id: 761795bbae [formerly 3c240d3269] [formerly 89fb0a5bee] [formerly bb68c93607 [formerly 89fb0a5bee [formerly 9b20aae000c7d4ac25dada94390eb3e8d70a6cc9]]]
Former-commit-id: bb68c93607
Former-commit-id: 7b464ea25fc9ce3602bc4d975dce3f84fbefe8f3 [formerly 50c95b06f9]
Former-commit-id: 4f457a34b9
2012-09-12 09:18:24 -05:00
Roger Ferrel
5070a3b22c Issue #875 Now does faster refresh and properly handle nofification of other CAVEs of changes.
Amend: Changes from code review

Change-Id: I556174de78c98730cabcd194b657db55328cf551

Former-commit-id: fa4d4e0ff8 [formerly 5b320fe49d] [formerly 6df929a87d] [formerly be8e334da3 [formerly 6df929a87d [formerly ae352e695a198b4f675249d1ef22118305d2f682]]]
Former-commit-id: be8e334da3
Former-commit-id: 509780471409fb7e4558715d54c4c9137c2dfc08 [formerly 8b4e7346a6]
Former-commit-id: e8675be231
2012-09-12 09:00:33 -05:00
Richard Peter
f1d458e450 Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
Former-commit-id: 5baaa6593f [formerly c8443cf85c] [formerly 701960a246] [formerly 60b21393fc [formerly 701960a246 [formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]]
Former-commit-id: 60b21393fc
Former-commit-id: 1caef7b52e6ad68e0ead7729ecc24930c9ffc1dc [formerly b5d3a41fb1]
Former-commit-id: 9d1413ff28
2012-09-12 08:27:11 -05:00
Steve Harris
1ce86f79cb Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: eff949899d [formerly d39a318583] [formerly d6e8f85db22a4436acfe2dbb5a4301161b57787d [formerly 503cddcc5e]] [formerly adf25aa707 [formerly 503cddcc5e [formerly 6d859accd185300997d14e7daf17f3c3257c348d]]]
Former-commit-id: adf25aa707
Former-commit-id: ce66c34bbdf3a8a1520465c247af5fbfd7bd9f07 [formerly 865fd2f475]
Former-commit-id: 31c1998d08
2012-09-11 17:06:26 -05:00
Steve Harris
047003d8c0 Merge branch 'ss_builds' (12.10.1-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
	cave/com.raytheon.uf.viz.kml.export.feature/build.properties
	cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
	cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
	cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment

Former-commit-id: 2f57e328fe [formerly f94db138cd] [formerly 64d4e2bded] [formerly 012c526816 [formerly 64d4e2bded [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]]
Former-commit-id: 012c526816
Former-commit-id: bf5ba423a5556426548660494a7905779f996b28 [formerly 41c82361f7]
Former-commit-id: b14d30591b
2012-09-11 16:57:03 -05:00
Max Schenkelberg
1e81c703f1 Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d

Former-commit-id: 5e94274b98 [formerly a6cc869ada] [formerly 7294025e26] [formerly 2f8f1ce9b2 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: 879019359ad23ac206937c8d749c606eda7eac91 [formerly c26d21d908]
Former-commit-id: 52e812ec0e
2012-09-11 16:27:41 -05:00
Steve Harris
64699fa90b 12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2] [formerly 21f430062b] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd]
Former-commit-id: f376a4b4db
2012-09-11 16:00:38 -05:00
Steve Harris
406bde9fd0 12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d] [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]
Former-commit-id: a66f3f4b60
Former-commit-id: f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d]
Former-commit-id: ec74f638e5
2012-09-11 15:50:57 -05:00
Max Schenkelberg
197e66e51f Issue #1138 Added null check to base ProtectedFile object since will be null when called recursively first time when constructing the base object. Organized static functions together from member functions.
Change-Id: I5dbef82932c9dc8623061361fad64fd0e8706546

Former-commit-id: b5a198a27d [formerly ab120dfec6] [formerly fffe220e05] [formerly c4398c09a4 [formerly fffe220e05 [formerly edbff1f2b607d53e8247155a5526a7c21e40ac71]]]
Former-commit-id: c4398c09a4
Former-commit-id: e9cbdce4b29b44a0103e0ad9a4d1f9761738853d [formerly a513b5830a]
Former-commit-id: 7d5c82ebfd
2012-09-11 14:04:14 -05:00
Nate Jensen
f4f6bca08c Issue #1096 fixed sampling order
Change-Id: Ib5fa01c281a50f792abc6a813167455c51076bed

Former-commit-id: a6252ceab2 [formerly cb9dd60490] [formerly c6b07f3672] [formerly d58af3e377 [formerly c6b07f3672 [formerly 6274438941aef5d7e5ee284488ffe0300ee3a68e]]]
Former-commit-id: d58af3e377
Former-commit-id: 5fc5d72098aba57eb9f63c4a45e92548e73e8693 [formerly 54cf5ebca4]
Former-commit-id: a899727652
2012-09-11 13:11:23 -05:00
Lee Venable
78a6ccd095 Merge "Issue #1161 changed comparator" into development
Former-commit-id: 1a5f514d00 [formerly f731ae885c] [formerly 802b43036e] [formerly a691386102 [formerly 802b43036e [formerly 2d9bf3e785e72e8bc3b3a04d186d3c76ddc1eebb]]]
Former-commit-id: a691386102
Former-commit-id: 57d821bd7ff0430e0c64e94dcdfb94505b76dd25 [formerly 9f1f054f4c]
Former-commit-id: a5dde0e55d
2012-09-11 10:02:21 -05:00
Dave Hladky
ddd93c8f13 Issue #1161 changed comparator
Change-Id: I23f6a1a8b81ab6d97da8b57f7df9adb2d86e1962

Former-commit-id: 70ccfe678a [formerly afb00feb6d] [formerly c78fb26fbf] [formerly af27b562d7 [formerly c78fb26fbf [formerly 36748378cf53d2ab7c6ba1e49be195d90e2dc385]]]
Former-commit-id: af27b562d7
Former-commit-id: 0a71ddea9802f93622bdd8b3d213d5d6a1e152d1 [formerly 1c1ffc7793]
Former-commit-id: e30f36206f
2012-09-11 09:39:43 -05:00
Lee Venable
b921d8300c Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
Former-commit-id: c1d6d8e77a [formerly 1f86d2c4ba] [formerly 056e74d3cf] [formerly 83fc018f38 [formerly 056e74d3cf [formerly 19dc13a0d5ef2b0fc41300815dd6be34d7001afd]]]
Former-commit-id: 83fc018f38
Former-commit-id: fe0be8190662c7e6d90a9853e2d5697ccd2f90f4 [formerly 1d0bdbd25c]
Former-commit-id: 782593a118
2012-09-11 09:15:47 -05:00
Nate Jensen
b859c18e1d Merge "Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view." into development
Former-commit-id: bdbaa71575 [formerly 4d91b0a15a] [formerly e61076b316] [formerly 7c1bc79df7 [formerly e61076b316 [formerly 603632fbca6e67b9e1f3cd1f4a48026bca3f1f35]]]
Former-commit-id: 7c1bc79df7
Former-commit-id: 86d8f9d6ef7dbf4b9521438792e20b0557afe5bb [formerly cc8fae1099]
Former-commit-id: 8d36456626
2012-09-11 09:06:26 -05:00
Dave Hladky
566007c438 Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
Change-Id: I23212f3281290d86621e72c88478b00d37336494

Former-commit-id: 7ea2655805 [formerly 33f222783d] [formerly 28912552fe] [formerly 6818408d40 [formerly 28912552fe [formerly 2088328c090d5a7d3f6218c42619fd3ab6d45dd9]]]
Former-commit-id: 6818408d40
Former-commit-id: 5f94e8ba51158c8fb39f7777f808e5c34c42b933 [formerly 655939bba7]
Former-commit-id: 02b00ddf47
2012-09-11 08:56:51 -05:00
Mike Duff
4a392f3a7e Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
Former-commit-id: 4180c20fbe [formerly 269d2831d9] [formerly bcafd807c5] [formerly 7825863940 [formerly bcafd807c5 [formerly 5504abfd272649dad36357ae7fdce83c75b3e3fa]]]
Former-commit-id: 7825863940
Former-commit-id: a8d4d5f0957d84bdc382ed4bc60b15cf3078cc0b [formerly db6ac1594e]
Former-commit-id: e443d5b5da
2012-09-11 08:50:55 -05:00
Jonathan Sanchez
9230cfe187 Issue #1006 fix supdirs
Former-commit-id: 6e1be0b967 [formerly d2f4487543] [formerly 09bdc765e5] [formerly 44d21bfe36 [formerly 09bdc765e5 [formerly 09109d26f68e527f843013883dc7f3082f01dd7a]]]
Former-commit-id: 44d21bfe36
Former-commit-id: 75b68cce3258bf1f21ee4af293ccac45fc294059 [formerly b048808367]
Former-commit-id: f66eebab84
2012-09-10 17:39:36 -05:00
Lee Venable
94a11a269b Merge "Issue #1159 No longer wrap text pasted to empty text field." into development
Former-commit-id: 97a9c87490 [formerly 8f95f21e6a] [formerly b22bd12fad] [formerly 903c220ecb [formerly b22bd12fad [formerly bacccfd683e71eab49c69d815aafbef2e395e863]]]
Former-commit-id: 903c220ecb
Former-commit-id: 88289ac2565a1212c88972cd22af916ab8d4a31f [formerly f1a836d0bb]
Former-commit-id: 9d55815fcf
2012-09-10 15:13:47 -05:00
Roger Ferrel
15e9098529 Issue #1159 No longer wrap text pasted to empty text field.
Change-Id: I03cc61a4d6d158344c0dbdbbed8be7edeb9cc42d

Former-commit-id: 915ded00c4 [formerly fd1be035c3] [formerly ef9634dd96] [formerly e55c9ca0bd [formerly ef9634dd96 [formerly 0b418dc248fd3c2107f2d6c045c8da51f13f1faa]]]
Former-commit-id: e55c9ca0bd
Former-commit-id: 61d473c04e628e251b126bfe9027d6acb028b5ac [formerly aa036adf6d]
Former-commit-id: 37cffe02b0
2012-09-10 13:25:29 -05:00
Max Schenkelberg
827ef7301b Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536

Former-commit-id: f7abe9ee39 [formerly 6d78afd423] [formerly 80439b309b] [formerly 84658dd03a [formerly 80439b309b [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]]
Former-commit-id: 84658dd03a
Former-commit-id: f9f8eef104b9eb8e02ca5321a8ca3396d4878105 [formerly 20f5d966db]
Former-commit-id: d2d74fac20
2012-09-10 10:45:37 -05:00
Brad Gonzales
39b0c07947 Issue #1156 sort by ts_rank in the TimeSeriesDataManager ingestfilter query.
Former-commit-id: 87def306af [formerly 85961a3d6d] [formerly f2b97d3170] [formerly 1b028a6d54 [formerly f2b97d3170 [formerly ecbe261f768452fc30a6641d25f5303565d18cbb]]]
Former-commit-id: 1b028a6d54
Former-commit-id: 74336a520ae88be3f8fbe7ecc497a8bb4f6942fd [formerly b7c9603d02]
Former-commit-id: edaaac843d
2012-09-10 09:24:28 -05:00
Roger Ferrel
6a6f27bd44 Issue #1145 Modifications to AlarmDisplayWindow and CurrentAlarmQueue to handle accumualte like AWIPS 1.
Change-Id: Ib5a17f309a2c0ee832028ae1cc8677641e9a0377

Former-commit-id: 2a34cf0ac2 [formerly 3de56714fb] [formerly ce5430a625] [formerly caff5053cb [formerly ce5430a625 [formerly 8506d363eff80306d0413e942c52d90b977ea887]]]
Former-commit-id: caff5053cb
Former-commit-id: 168a71f817820a049f75d0c76d54e15faab80e00 [formerly b287d102a7]
Former-commit-id: 8926d7a65b
2012-09-10 08:28:58 -05:00
David Gillingham
75daa050de Issue #1150: Fix regression caused by previous text product generation changes by ensuring all
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: fc39f37437 [formerly cff73c9e1d] [formerly f192c8d115] [formerly 83681d1ff6 [formerly f192c8d115 [formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]]]
Former-commit-id: 83681d1ff6
Former-commit-id: 92c5f6a8e1768a660e1ac985fa2926880692a6db [formerly 9d13d3244d]
Former-commit-id: 64bf7f0613
2012-09-07 12:29:36 -05:00
Bryan Kowal
0b7709663c Issue #1134 - edex will now use the same jep library that CAVE does
Former-commit-id: f3a273027c [formerly 3c63f21cfc] [formerly ec89c440fe] [formerly 04b574f56e [formerly ec89c440fe [formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]]
Former-commit-id: 04b574f56e
Former-commit-id: 64429dfda116bd48a4b498f09ed3888f7a1ee784 [formerly 84f7083b81]
Former-commit-id: 8a04029498
2012-09-07 10:28:51 -05:00
Lee Venable
709cc7b734 Merge "Issue #1144 Fixed sizing of Local Effects Area dropdown." into development
Former-commit-id: ad24a257a5 [formerly 8615be95bf] [formerly 30e28997d2] [formerly 7e32db36fb [formerly 30e28997d2 [formerly 822993b3728f939e7e57ca9cd1c6fa7b0737ea25]]]
Former-commit-id: 7e32db36fb
Former-commit-id: 79492dc54c5589beeda21b8d2a2005a26fb467f9 [formerly 2c6dd57186]
Former-commit-id: 05cf3939d9
2012-09-07 07:35:15 -05:00
Ron Anderson
064d7a2afc Issue #1144 Fixed sizing of Local Effects Area dropdown.
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5

Former-commit-id: 88ba04e791 [formerly 8ca431ab8b] [formerly ee7985bd57] [formerly 16260530e9 [formerly ee7985bd57 [formerly 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5]]]
Former-commit-id: 16260530e9
Former-commit-id: 22524cf34987f12d7db2178a5437262655f63666 [formerly 309196b6e1]
Former-commit-id: e0e3e4a044
2012-09-06 17:44:00 -05:00
Greg Armendariz
2a1d21e17f Merge "Issue #1090 - pattern corrections" into development
Former-commit-id: 572a83adb7 [formerly 3cc51587c6] [formerly 8201f5346f] [formerly 58b74d05e5 [formerly 8201f5346f [formerly 9dc5230757d9a09f718fdf1f802e698ac6dd21d2]]]
Former-commit-id: 58b74d05e5
Former-commit-id: 2f2f315c07c4f62a2d12dcf52754cec6dcca7ef5 [formerly 338f0ebd91]
Former-commit-id: e1851f370a
2012-09-06 13:50:36 -05:00
Steve Harris
e1fc93dfa6 Issue #1141 - Adding JavaAPIforKml license file
Former-commit-id: bff568429e [formerly 262473a662] [formerly 7d7f20b388] [formerly 259bb4dfed [formerly 7d7f20b388 [formerly d84394c2f8f62406fee0e039ba0aa283bbbd857e]]]
Former-commit-id: 259bb4dfed
Former-commit-id: b5f2c0d43419e070c4bba708a58e58d3d8d0517c [formerly b9317a53c7]
Former-commit-id: 727899cc20
2012-09-06 11:09:24 -05:00
James Korman
77a4167bbe Issue #1090 - pattern corrections
Former-commit-id: 5b2c527640 [formerly 78c7ce88ac] [formerly be350dd763] [formerly eb17151f74 [formerly be350dd763 [formerly 7849341873013b71b6fe5f01ae3fe274bfc7e8a7]]]
Former-commit-id: eb17151f74
Former-commit-id: 93eba3c470d03a96ea25c31692b39898165ffeb5 [formerly f36d089fd5]
Former-commit-id: 85191cde31
2012-09-06 09:20:03 -05:00
Bryan Kowal
c17cb133e0 Issue #1141 - Merging KML into the Common Baseline
Former-commit-id: 2f7fae43cc [formerly 8d444b35d3] [formerly fe380d3611cca8dccc4fef4777604580885f84c5 [formerly 3180ae0c57]] [formerly 7b45633097 [formerly 3180ae0c57 [formerly c3f584fdc5f53ecd62afe41c481aaa96cf532009]]]
Former-commit-id: 7b45633097
Former-commit-id: 0b9e06862a6cbda27a651857f407897e0b354900 [formerly b63d426e0f]
Former-commit-id: 23c607980a
2012-09-05 18:39:08 -05:00
Bryan Kowal
a10099b0a4 Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)
Former-commit-id: 8444e742df [formerly 35aff16e89] [formerly 137b27d3ff] [formerly 3e1556a981 [formerly 137b27d3ff [formerly 9a0cd58382909965a6c44cf05fec28eb69835a26]]]
Former-commit-id: 3e1556a981
Former-commit-id: be92c88a0768d80b1afd3036de3111dbf50f3e10 [formerly a34225c4c9]
Former-commit-id: 7ec6eb66ab
2012-09-05 14:44:36 -05:00
Max Schenkelberg
e7b2f69ff3 Issue #29 Changed how TileLevel calculate pixel density to make densities more consistent between granules on display. Changed TileSetRenderable level change threshold to smaller value so displays look less pixelated with new pixel density calculation. Fixed FileTreeView from throwing errors if two definitions with same name defined which came to light from NPP build
Change-Id: I66b556b74e1a856dace5447c4b9f090d026c493c

Former-commit-id: e06d1dabef [formerly a14d5d4c86] [formerly c183a0e614] [formerly 28d6308444 [formerly c183a0e614 [formerly a4dd750d4bbdaae4a548c9a296436cc783d2d71a]]]
Former-commit-id: 28d6308444
Former-commit-id: b4ace038bdcc2b915892986d414af1d5d5480636 [formerly 87bcbdb4cc]
Former-commit-id: 45d6b7bcb5
2012-09-05 11:51:38 -05:00
Ben Steffensmeier
49524b9109 Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8

Former-commit-id: 513bd44ba0 [formerly dc6f5805ef] [formerly 4272f4c885] [formerly c618ee9057 [formerly 4272f4c885 [formerly 5da7b54e1bff66ed46400bc624b9d881d0b967ce]]]
Former-commit-id: c618ee9057
Former-commit-id: 1e8fa5942894142a7af4316bb2f69d7081706dc3 [formerly e0a4fe2c43]
Former-commit-id: 66e9b24e51
2012-09-04 13:41:10 -05:00
Steve Harris
20e088a957 Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 319927240c [formerly 0e046d847a] [formerly bba4eb12d0] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4]
Former-commit-id: f224e3e8ad
2012-09-04 12:11:03 -05:00
Steve Harris
9f4fa7bf83 12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]
Former-commit-id: e720b8ed31
2012-09-04 12:07:27 -05:00
Steve Harris
15fa63819d 12.9.1-12 baseline
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a] [formerly 948766c387] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]
Former-commit-id: 150bc967a5
Former-commit-id: 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e]
Former-commit-id: 782941ccc1
2012-09-04 11:47:38 -05:00
Steve Harris
ff1a0c911d Merge branch 'development' into Enhanced_points
Former-commit-id: feccb1205d [formerly fa7c31206b] [formerly 5feac55dbd] [formerly 32cf7fd764 [formerly 5feac55dbd [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]]
Former-commit-id: 32cf7fd764
Former-commit-id: 9a3bf8cf46dc47950600c368d21537bbdc91f65e [formerly 592ab923bb]
Former-commit-id: 5a8e58eda5
2012-08-30 15:43:06 -05:00
Steve Harris
a3a1864f56 Merge branch 'ss_builds' (12.9.1-11) into development
Conflicts:
	rpms/build/i386/build.sh

Former-commit-id: 9ff4f369a4 [formerly f52c8b374d] [formerly 3a9d4961e2] [formerly 34cbde4124 [formerly 3a9d4961e2 [formerly 73ab8bdcc39291fbe36b5bcffe53d9106cc00238]]]
Former-commit-id: 34cbde4124
Former-commit-id: b24c67b6e98e964ff9cd901ee9da994905e8a1b9 [formerly 3230e0b246]
Former-commit-id: ffe253196a
2012-08-30 14:40:34 -05:00
Steve Harris
503b7bf15c 12.9.1-11 baseline
Former-commit-id: a2bb1dabe0 [formerly d07c18918d] [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]
Former-commit-id: fc405efab7
Former-commit-id: aa38e16cc24dec9189539c27650c276ab78f3c78 [formerly a14374fcd4]
Former-commit-id: dc5ec3d16d
2012-08-30 14:36:12 -05:00
Steve Harris
c704490769 12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae] [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a]
Former-commit-id: f43a5af47f
2012-08-30 14:28:27 -05:00
Max Schenkelberg
e2e9969448 Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4

Former-commit-id: d0160a4aa9 [formerly 81531873e0] [formerly 13865fc3fd3e7a29ef34b445e9f98c2789cdb34f [formerly 00de2922e1]] [formerly 0de737ad64 [formerly 00de2922e1 [formerly b9568b79f531250c859b77296115da32b628318d]]]
Former-commit-id: 0de737ad64
Former-commit-id: 9a6b2c20c8248d78d8c7b88d4e7f58d9f1001bcb [formerly b75fad8e30]
Former-commit-id: ef8ed151a9
2012-08-29 18:17:30 -05:00
Nate Jensen
e313a785b0 Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
Former-commit-id: a6afe463af [formerly 4c73903629] [formerly 96393309eb] [formerly b47baedad4 [formerly 96393309eb [formerly c06f87cd60290f34b0c9b1ac955f0b72f9de5c5b]]]
Former-commit-id: b47baedad4
Former-commit-id: 692922c7e7a4bbe072430e65deae743517f3f114 [formerly e6661037f5]
Former-commit-id: 45134743b6
2012-08-29 16:09:50 -05:00
Max Schenkelberg
50a53cf8b6 Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9

Former-commit-id: e03e761b28 [formerly 04c3a1c678] [formerly f8aef2b067] [formerly 81f78fa819 [formerly f8aef2b067 [formerly 3ff192dfb09a0e4512287d45df864375e3900ca1]]]
Former-commit-id: 81f78fa819
Former-commit-id: c78f2cc0795ac993cd9b82670d6a70aae5a945ff [formerly 99c8b1a968]
Former-commit-id: e593c9d56e
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
80ffe1feff Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
Former-commit-id: 669d1023a8 [formerly e3bb8c80c9] [formerly 1f587e39f4] [formerly 37d2411b26 [formerly 1f587e39f4 [formerly e3c5526f9b12ae38c12094e7ebf9f9d6823f3257]]]
Former-commit-id: 37d2411b26
Former-commit-id: a91944b28e23d60c494612c968dc56c1620456c7 [formerly 36dd387007]
Former-commit-id: 68235d0744
2012-08-29 14:24:21 -05:00
Matt Nash
d35027f45e Issue #1101 fix gfe keybindings for frame change in collaboration
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a

Former-commit-id: 04ce96d74e [formerly ba698ae69a] [formerly 018f590c70] [formerly ada6ecf5f3 [formerly 018f590c70 [formerly 2c766c16bf8fdbc801097acfe8f8fdfd00e53367]]]
Former-commit-id: ada6ecf5f3
Former-commit-id: 5dd2067f359bb03dbe5cae64c69ba82ef563a1de [formerly 1242054a50]
Former-commit-id: cac1c2bb2e
2012-08-27 12:16:38 -05:00
Steve Harris
e34edddfbf Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 948b22090c [formerly 2e6842016b] [formerly 3ee334378c] [formerly 076dccf42d [formerly 3ee334378c [formerly 534486bf918d5384d062d7501f0f1c4a0b4f0172]]]
Former-commit-id: 076dccf42d
Former-commit-id: 42707840fa34fe9d73bfe6f6f6f9b5aa442077ff [formerly a93487ab96]
Former-commit-id: 65b91e1506
2012-08-27 11:32:45 -05:00
Steve Harris
fd6e8d5b63 Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 772c4359da [formerly 51eb89eb2a] [formerly 91e39617cb] [formerly a71dac6cad [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: 1be860f8d952be20f92f7830faeba102244c82ba [formerly 87a602dfee]
Former-commit-id: dbcb28ce77
2012-08-27 09:53:55 -05:00
Nate Jensen
575e5e3806 Merge "Issue #1096 fix memory leaks in CcfpResource" into development
Former-commit-id: 07ac473e55 [formerly eac562204d] [formerly 94b7f40d1d] [formerly 168bee4bd7 [formerly 94b7f40d1d [formerly 0f98c3bfbf041cd46311517f2819ca2d81b1cd34]]]
Former-commit-id: 168bee4bd7
Former-commit-id: 07a4a5366adf89ce540c10602b6747832bcc42e0 [formerly a2f594e354]
Former-commit-id: 977664c699
2012-08-27 09:21:50 -05:00