xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1386 commits 31 branches 40 tags 3.8 GiB
Commit graph

1386 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Steffensmeier
268f7cb64d Issue #189 fix modes for gridcoverage to include converter registration 
Former-commit-id: 1082b1b51d [formerly 1a7560b8a3] [formerly 1082b1b51d [formerly 1a7560b8a3] [formerly 6b0ed3fa50 [formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 5126024a6b [formerly 2a0769d094]
Former-commit-id: 13f8f28c2e
 2012-11-16 12:25:00 -06:00
Lee Venable
84ac6354e8 Merge "Issue #1298 Changes for non-blocking GhgAlertDlg." into development 
Former-commit-id: eb297f00fc [formerly 0540d84e4e] [formerly eb297f00fc [formerly 0540d84e4e] [formerly 40f11cfba5 [formerly e96cd422716fc6da7c0007b58fa75659c7600ad7]]]
Former-commit-id: 40f11cfba5
Former-commit-id: 247a2859ca [formerly aa4b1f4970]
Former-commit-id: 9bef16f8ab
 2012-11-15 17:43:31 -06:00
Max Schenkelberg
a94b9c173d Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking 
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: a472f5535b [formerly 655f54b098] [formerly a472f5535b [formerly 655f54b098] [formerly f540f65fd7 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]]
Former-commit-id: f540f65fd7
Former-commit-id: db2fe0b5e8 [formerly f1866b2e49]
Former-commit-id: 7ffce5cd45
 2012-11-15 16:21:42 -06:00
Roger Ferrel
f805c4cccd Issue #1298 Changes for non-blocking GhgAlertDlg. 
Change-Id: I1da7317ad69203a4160c806458fdbf99a7d9108d

Former-commit-id: b66bc0210a [formerly 800c1a6908] [formerly b66bc0210a [formerly 800c1a6908] [formerly c0554d9686 [formerly b3c640da3fad8d1ce07e348b075b9b1a0468da37]]]
Former-commit-id: c0554d9686
Former-commit-id: 0a11332193 [formerly 05f32527bd]
Former-commit-id: 342a35599b
 2012-11-15 15:51:46 -06:00
Roger Ferrel
64ae20f4a9 Issue #1298 Changes for non-blocking GhgMonitorDlg. 
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3

Former-commit-id: a29b52ca8c [formerly dc82ad820b] [formerly a29b52ca8c [formerly dc82ad820b] [formerly 109dea21e1 [formerly 782113272c208a32e6165c02404138fcaa79d523]]]
Former-commit-id: 109dea21e1
Former-commit-id: e35d7b3f15 [formerly 2206167b00]
Former-commit-id: 418dd35a9d
 2012-11-15 14:37:29 -06:00
Lee Venable
c1e08c8468 Merge "Issue #1298 Changes for non-blocking SelectionDlg." into development 
Former-commit-id: ba019bf3f6 [formerly ba95731387] [formerly ba019bf3f6 [formerly ba95731387] [formerly 2dee27fbf3 [formerly a1d258382de88af5c139e22d2efb6183261d1e3b]]]
Former-commit-id: 2dee27fbf3
Former-commit-id: a4a5c89fa8 [formerly ed64d2f97a]
Former-commit-id: a883fd2e08
 2012-11-15 13:47:46 -06:00
Benjamin Phillippe
debdd584fd Issue #1335 Fixed EHCache warnings. Changes to necessary config files 
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 44519995ee [formerly 5bf46d468d] [formerly 44519995ee [formerly 5bf46d468d] [formerly 5c31b34e12 [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]]
Former-commit-id: 5c31b34e12
Former-commit-id: 43b94988c8 [formerly 6b1b73429b]
Former-commit-id: 688e19acc1
 2012-11-15 13:35:25 -06:00
Roger Ferrel
619197cbb2 Issue #1298 Changes for non-blocking SelectionDlg. 
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b

Former-commit-id: 5f3fab4677 [formerly 00693d83bb] [formerly 5f3fab4677 [formerly 00693d83bb] [formerly 59181213a0 [formerly cd85c4e60fd3863c39a7c61ad73848207e196a05]]]
Former-commit-id: 59181213a0
Former-commit-id: d0cdc594f8 [formerly fdfcb2ebea]
Former-commit-id: e424cb4bf2
 2012-11-15 12:55:49 -06:00
Nate Jensen
cabeee008a Merge "Issue #1325 add missing sourcepath for jts" into development 
Former-commit-id: 397c71cb00 [formerly 19d74235d9] [formerly 397c71cb00 [formerly 19d74235d9] [formerly c4e1d26056 [formerly ecff6dc0484b6dc65e2c043be4a2b6a7fbb3a503]]]
Former-commit-id: c4e1d26056
Former-commit-id: 72a741c6a3 [formerly 84e98e2364]
Former-commit-id: e76a412fb4
 2012-11-15 11:02:35 -06:00
Ron Anderson
7a9826a27f Issue #1325 add missing sourcepath for jts 
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653

Former-commit-id: 0984f201b2 [formerly 94ec6eaeaf] [formerly 0984f201b2 [formerly 94ec6eaeaf] [formerly 457d55ecdf [formerly bf8dd91d2e2cb79548cc852c82446cb914e63991]]]
Former-commit-id: 457d55ecdf
Former-commit-id: 9d832ad8be [formerly 1157e5a55e]
Former-commit-id: c55588f57c
 2012-11-15 11:00:02 -06:00
Bryan Kowal
5ef1e97bdd Issue #1318 - updated ncep database rpm specification file 
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832

Former-commit-id: cbef9ad78d [formerly b60dda550c] [formerly cbef9ad78d [formerly b60dda550c] [formerly fe9dcaa216 [formerly b3f1b857e5a8efcfea0f5b8985eddd5992724d89]]]
Former-commit-id: fe9dcaa216
Former-commit-id: fe9a06b9b9 [formerly 67c3c140e3]
Former-commit-id: dbe78374bc
 2012-11-15 10:24:38 -06:00
Lee Venable
78cd4c7037 Merge "Issue #1298 Changes for non-blocking MoveWeatherElementDialog." into development 
Former-commit-id: cf2462875c [formerly 2ff812677f] [formerly cf2462875c [formerly 2ff812677f] [formerly a5a0ef2297 [formerly 722a841e5ea9a947bb3d46f5f1e231c67ec1f919]]]
Former-commit-id: a5a0ef2297
Former-commit-id: c60ac74310 [formerly 491161b0d0]
Former-commit-id: 7278399bd4
 2012-11-15 09:28:33 -06:00
Bryan Kowal
632e800a7e Issue #1318 - updated ncep database rpm specification file 
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9

Former-commit-id: 12667f6180 [formerly 99399e880e] [formerly 12667f6180 [formerly 99399e880e] [formerly 24074da383 [formerly f433daa8ffe59da91acba71ac5893d77ad810404]]]
Former-commit-id: 24074da383
Former-commit-id: 1842deff13 [formerly 3d123e08a7]
Former-commit-id: 954534e3d0
 2012-11-15 09:26:46 -06:00
Roger Ferrel
aeb27b3c88 Issue #1298 Changes for non-blocking MoveWeatherElementDialog. 
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455

Former-commit-id: fc87eccb77 [formerly a6fdc7b580] [formerly fc87eccb77 [formerly a6fdc7b580] [formerly acf1881cb7 [formerly dd80807a0469e7c677f8e0d214fcdec715c67518]]]
Former-commit-id: acf1881cb7
Former-commit-id: 8881e4d3ec [formerly d6c5839e0e]
Former-commit-id: 265adb9b1c
 2012-11-14 16:33:27 -06:00
Max Schenkelberg
eec401909b Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors. 
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: fe11e31bfb [formerly dcde9e8951] [formerly fe11e31bfb [formerly dcde9e8951] [formerly 28e61c8285 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]
Former-commit-id: 28e61c8285
Former-commit-id: 5aa26e4f13 [formerly 2e20c3e799]
Former-commit-id: 429ddc7312
 2012-11-14 16:19:37 -06:00
Nate Jensen
b1ce6f5371 Merge "Issue #1332: Update pypies createStorageRecord to not pull in parent group node" into development 
Former-commit-id: 1f11cf8ee1 [formerly 72a54e9e29] [formerly 1f11cf8ee1 [formerly 72a54e9e29] [formerly ffce7efeb2 [formerly 31989b21e8199a739d2764d226b02de056d3f8a3]]]
Former-commit-id: ffce7efeb2
Former-commit-id: 1540334a35 [formerly bfd1f088b0]
Former-commit-id: 5751eb424a
 2012-11-14 16:10:49 -06:00
Nate Jensen
3caa746f20 Merge "Issue #189 fix contour subgridding for worldwide grids" into development 
Former-commit-id: ee7daccb2c [formerly 5055164f55] [formerly ee7daccb2c [formerly 5055164f55] [formerly 340f8e1fa8 [formerly 553b56aa362b452110a7f5a4f76aec9640d13599]]]
Former-commit-id: 340f8e1fa8
Former-commit-id: 721ef4452d [formerly 6210f94be1]
Former-commit-id: 85fdcaf854
 2012-11-14 16:09:51 -06:00
Nate Jensen
46f902852f Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development 
Former-commit-id: 0398aeaa5b [formerly 49c2079963] [formerly 0398aeaa5b [formerly 49c2079963] [formerly 31637efbbc [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]]
Former-commit-id: 31637efbbc
Former-commit-id: 9158625765 [formerly 8944e220f6]
Former-commit-id: 25602f0183
 2012-11-14 16:09:00 -06:00
Lee Venable
f3cf44ffb4 Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development 
Former-commit-id: 6152ecccda [formerly 695cf85335] [formerly 6152ecccda [formerly 695cf85335] [formerly 6134e5d3f7 [formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]]]
Former-commit-id: 6134e5d3f7
Former-commit-id: d82072b975 [formerly 7ed335793f]
Former-commit-id: 3369913a84
 2012-11-14 16:06:02 -06:00
Lee Venable
8f20559063 Merge "Issue #1298 Changes for non-blocking TEWxSetValueDialog." into development 
Former-commit-id: 64d9ba9184 [formerly 8fa3d794fd] [formerly 64d9ba9184 [formerly 8fa3d794fd] [formerly edfab7e56f [formerly eceb7bed3794368ebb0cd57e466e7beaee88a19d]]]
Former-commit-id: edfab7e56f
Former-commit-id: 2f4b1d9d5f [formerly bbba9b1b29]
Former-commit-id: 9c177ca2c9
 2012-11-14 16:05:20 -06:00
Roger Ferrel
9a04b3847b Issue #1298 Changes for non-blocking DisplayAttributesDialog. 
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d

Former-commit-id: 82f9c74bef [formerly 7ca75756ae] [formerly 82f9c74bef [formerly 7ca75756ae] [formerly 212045c1a6 [formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]]]
Former-commit-id: 212045c1a6
Former-commit-id: 7f33d6ba18 [formerly d069f186e1]
Former-commit-id: 9cf45444c3
 2012-11-14 14:56:42 -06:00
Dustin Johnson
6d21c445c2 Merge branch 'ss_builds' (12.12.1-4) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: d27bce13c2 [formerly bff32bbe58] [formerly d27bce13c2 [formerly bff32bbe58] [formerly 0d1d663f41 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 5d5dbe27e1 [formerly e25b7c312b]
Former-commit-id: ff33643234
 2012-11-14 14:41:57 -06:00
Roger Ferrel
52425e6b99 Issue #1298 Changes for non-blocking TEWxSetValueDialog. 
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b

Former-commit-id: 679d967382 [formerly 7f22145bf2] [formerly 679d967382 [formerly 7f22145bf2] [formerly dd8f8a9fa7 [formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]]]
Former-commit-id: dd8f8a9fa7
Former-commit-id: 56ed69fc83 [formerly 89653eb5e1]
Former-commit-id: eb20af7237
 2012-11-14 14:20:40 -06:00
Steve Harris
2c2bfc949d 12.12.1-4 baseline 
Former-commit-id: b91b7f0fae [formerly 85130eb611] [formerly b91b7f0fae [formerly 85130eb611] [formerly 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: e35a321a8c [formerly 628ca9e5c6]
Former-commit-id: 493f335c0b
 2012-11-14 14:19:20 -06:00
Roger Ferrel
51b30ca9b5 Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog. 
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8

Former-commit-id: 62faa06ddf [formerly e267248b57] [formerly 62faa06ddf [formerly e267248b57] [formerly 2331b8e1f5 [formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]]
Former-commit-id: 2331b8e1f5
Former-commit-id: ce623db367 [formerly 3f0dc83f89]
Former-commit-id: 55b052c849
 2012-11-14 14:02:01 -06:00
Lee Venable
12e2e49950 Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development 
Former-commit-id: a6e88a6856 [formerly e755889643] [formerly a6e88a6856 [formerly e755889643] [formerly e9ae25e781 [formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]]]
Former-commit-id: e9ae25e781
Former-commit-id: 680373301f [formerly 09591687a9]
Former-commit-id: 9cbd7cdcbe
 2012-11-14 13:30:42 -06:00
Lee Venable
b6ffe0e535 Merge "Issue #1298 Changes for non-blocking WeatherElementGroupDialog. Changes from reviewer comments." into development 
Former-commit-id: cd0a4804c6 [formerly 341dc89480] [formerly cd0a4804c6 [formerly 341dc89480] [formerly 7634ea221b [formerly 3106b10a003ca5985e29c69ee0f02185c88edc12]]]
Former-commit-id: 7634ea221b
Former-commit-id: 23f4face77 [formerly 389f9c6a87]
Former-commit-id: 5e37d88424
 2012-11-14 13:29:53 -06:00
Richard Peter
cb55682595 Issue #1332: Update pypies createStorageRecord to not pull in parent group node 
Change-Id: Ieb4b45bce2f5c0eca41301eacbd7782b3c310edd

Former-commit-id: 375383a09f [formerly 73c2fa6ed3] [formerly 375383a09f [formerly 73c2fa6ed3] [formerly d2aff4118b [formerly 926250abd96f2b5e30b6a863735a10203491a257]]]
Former-commit-id: d2aff4118b
Former-commit-id: 521ebb7e86 [formerly 859d3840bb]
Former-commit-id: cd85a43b4a
 2012-11-14 12:51:53 -06:00
Ben Steffensmeier
e57c669f2e Issue #189 changes to mappings and ncep merge from code review 
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 3d126b41e1 [formerly 2c8f3f09ac] [formerly 3d126b41e1 [formerly 2c8f3f09ac] [formerly 2d864c3b09 [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]]
Former-commit-id: 2d864c3b09
Former-commit-id: 47759f025b [formerly 91254adfd6]
Former-commit-id: 84abe4fa4f
 2012-11-14 12:22:53 -06:00
Dustin Johnson
0c5a52f3b1 Issue #1322 Common baseline changes to support BandwidthManager 
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: afd9a767ea [formerly 7d9e7567bd] [formerly afd9a767ea [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: 5d410ff934 [formerly c0c60c2488]
Former-commit-id: 3129d3bd3a
 2012-11-14 12:19:10 -06:00
Roger Ferrel
51e6ed0bcb Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog. 
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072

Former-commit-id: 7f3d893c84 [formerly d16a448e05] [formerly 7f3d893c84 [formerly d16a448e05] [formerly 590eca2cba [formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]]]
Former-commit-id: 590eca2cba
Former-commit-id: 78422d9893 [formerly 950300e16d]
Former-commit-id: a39abc035b
 2012-11-14 12:04:18 -06:00
Nate Jensen
bd68bbfda3 Merge "Issue #189 modify upgrade script to work with grid resources within bestRes." into development 
Former-commit-id: 750e91914f [formerly 7f95e486c8] [formerly 750e91914f [formerly 7f95e486c8] [formerly 7663818f6c [formerly 82d0be7824c4dd02d23e4422775d803eec4db115]]]
Former-commit-id: 7663818f6c
Former-commit-id: 2f197bad4d [formerly 6aa5904dc9]
Former-commit-id: 100e58f002
 2012-11-14 11:45:10 -06:00
Ben Steffensmeier
1bf949a006 Issue #189 fix contour subgridding for worldwide grids 
Former-commit-id: 33d07530c6 [formerly 3ee95cff21] [formerly 33d07530c6 [formerly 3ee95cff21] [formerly 929a785e1b [formerly e0fb632cc7e0d089436b64a3f2bc6977a0487708]]]
Former-commit-id: 929a785e1b
Former-commit-id: 7de15734e9 [formerly 76996706f4]
Former-commit-id: acd5002c94
 2012-11-14 11:38:25 -06:00
Roger Ferrel
d5e0266a5e Issue #1298 Changes for non-blocking WeatherElementGroupDialog. 
Changes from reviewer comments.

Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac

Former-commit-id: 5e805da0e1 [formerly 049ecefe1d] [formerly 5e805da0e1 [formerly 049ecefe1d] [formerly b32480ed08 [formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]]]
Former-commit-id: b32480ed08
Former-commit-id: be24ca5ed6 [formerly af0ad0433b]
Former-commit-id: bdeb05acbb
 2012-11-14 11:36:52 -06:00
Ron Anderson
499a0f888a Merge "Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb" into development 
Former-commit-id: 29559e851e [formerly 86c4a247cd] [formerly 29559e851e [formerly 86c4a247cd] [formerly 0fe91e0d95 [formerly 46116a80d319050628e6c8a7d01c7c2d0bb5402f]]]
Former-commit-id: 0fe91e0d95
Former-commit-id: 9f112f298c [formerly 652c27918c]
Former-commit-id: 7a828a608c
 2012-11-14 11:23:06 -06:00
Ben Steffensmeier
1231facebe Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb 
Former-commit-id: 6e6823d62d [formerly 5a1a6f2fdb] [formerly 6e6823d62d [formerly 5a1a6f2fdb] [formerly 1b4236ccc5 [formerly 26e79c68560dced9b7148e8eebf4a7394461bd7c]]]
Former-commit-id: 1b4236ccc5
Former-commit-id: 5367f936f4 [formerly 159817f538]
Former-commit-id: 6093c7cf31
 2012-11-14 11:05:42 -06:00
Steve Harris
b543be0ff1 Merge "Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml" into development 
Former-commit-id: ac834c0ebb [formerly f5c87b04d6] [formerly ac834c0ebb [formerly f5c87b04d6] [formerly 956e1a45da [formerly ce25af9ad1e713bd85fd24f10188c9f46c83da5c]]]
Former-commit-id: 956e1a45da
Former-commit-id: 397cac3352 [formerly a5ca238e96]
Former-commit-id: 71648c8d59
 2012-11-14 10:19:27 -06:00
Ben Steffensmeier
dede328be5 Issue #1331 fix grib-request spring 
Former-commit-id: 23190381cd [formerly b128a3f3c5] [formerly 23190381cd [formerly b128a3f3c5] [formerly c97223458e [formerly 3b4dda66b20f04915f406df814ca989350794ae7]]]
Former-commit-id: c97223458e
Former-commit-id: 7590451249 [formerly 60743ec4b1]
Former-commit-id: 3736a94482
 2012-11-14 10:07:44 -06:00
Brad Gonzales
ec0fc6417a Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml 
Change-Id: I6de95db502206b7b4dda198d61844570ed428862

Former-commit-id: 782ffb92ea [formerly 4af27e092f] [formerly 782ffb92ea [formerly 4af27e092f] [formerly 1617341e2a [formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]]
Former-commit-id: 1617341e2a
Former-commit-id: cc8ed35821 [formerly c024c94050]
Former-commit-id: dfc125236d
 2012-11-14 09:39:26 -06:00
Steve Harris
ae9d9985cd Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719 [formerly c8cac52915]
Former-commit-id: 59efd9a217
 2012-11-13 17:28:50 -06:00
Steve Harris
7058ebec23 12.12.1-3 baseline 
Former-commit-id: a81c46987b [formerly c999505fba] [formerly a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2e3662028f [formerly 2797cbcdd0]
Former-commit-id: 314495dc8e
 2012-11-13 17:27:04 -06:00
Steve Harris
53d74c66e7 12.12.1-2 baseline 
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 111e7607cf [formerly df89fe9bed]
Former-commit-id: 96a4a4f3f5
 2012-11-13 17:14:24 -06:00
Lee Venable
4353b75410 Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development 
Former-commit-id: 2827143110 [formerly 989d5dc5e4] [formerly 2827143110 [formerly 989d5dc5e4] [formerly dbdfda1d04 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]]
Former-commit-id: dbdfda1d04
Former-commit-id: 77af9b8699 [formerly 282e8858da]
Former-commit-id: 5f79e0f562
 2012-11-13 16:02:05 -06:00
Steve Harris
81015f6f41 Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development 
Former-commit-id: 1f1659cb16 [formerly 63b0f18a89] [formerly 1f1659cb16 [formerly 63b0f18a89] [formerly 5c23f057b3 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]]
Former-commit-id: 5c23f057b3
Former-commit-id: 6db07e2e5e [formerly 1e0ad343d6]
Former-commit-id: 07abe90d1c
 2012-11-13 16:02:03 -06:00
Ben Steffensmeier
9f2f2591ee Merge branch 'ss_builds'(12.12.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: ed4f88aa22 [formerly 69fc030bb4] [formerly ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 109ec1e778 [formerly 60f78c22e3]
Former-commit-id: 7761060a12
 2012-11-13 16:00:19 -06:00
Roger Ferrel
de65e19817 Issue #1298 Changes for non-blocking SetValueDialog. 
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f

Former-commit-id: cbacc77367 [formerly 1d5bd95866] [formerly cbacc77367 [formerly 1d5bd95866] [formerly dceb2cde5d [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]]
Former-commit-id: dceb2cde5d
Former-commit-id: c498e21b23 [formerly 29eb436b19]
Former-commit-id: 0b8ecada1b
 2012-11-13 15:53:03 -06:00
Lee Venable
c79fb63b54 Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development 
Former-commit-id: 5b4f3c68f1 [formerly c1e46f52ca] [formerly 5b4f3c68f1 [formerly c1e46f52ca] [formerly 9d149bef29 [formerly 795564ae453a7afb423980679c3719a7c453aa74]]]
Former-commit-id: 9d149bef29
Former-commit-id: 3d07136ccc [formerly 32f088d986]
Former-commit-id: 07c1a3b61b
 2012-11-13 15:35:13 -06:00
Lee Venable
26b3fb0059 Merge "Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open." into development 
Former-commit-id: 20548994dd [formerly 0c936a3f8c] [formerly 20548994dd [formerly 0c936a3f8c] [formerly d935fff585 [formerly f037a61c9fd0c0d85a7596b95cdd35072f7bafe0]]]
Former-commit-id: d935fff585
Former-commit-id: 69888e4517 [formerly a78cdc9ee4]
Former-commit-id: 92a2578ebf
 2012-11-13 15:34:40 -06:00
Roger Ferrel
295c73d59e Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg. 
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0

Former-commit-id: 6f6b9dd21a [formerly 1e8dfdc857] [formerly 6f6b9dd21a [formerly 1e8dfdc857] [formerly b421a30116 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]]
Former-commit-id: b421a30116
Former-commit-id: 1272837397 [formerly d646f32d6e]
Former-commit-id: 3eb1da1b66
 2012-11-13 13:20:28 -06:00
Lee Venable
8515ddae22 Merge "Issue #1317 - Fix problem in edexProcessStats.xml" into development 
Former-commit-id: 4b8129ea58 [formerly 5fce4fde98] [formerly 4b8129ea58 [formerly 5fce4fde98] [formerly 548973dae0 [formerly bde192a2c922a9bb239d1558794cf03ec6944118]]]
Former-commit-id: 548973dae0
Former-commit-id: 39f2ebaf14 [formerly 89e28445e5]
Former-commit-id: 901e4fa29c
 2012-11-13 13:19:00 -06:00