David Gillingham
|
5bc4e2b41b
|
Issue #361: Fine tune synchronization in GfeScriptExecutor to prevent
massive backups in access to GfeScript instance map.
Issue #361: Further modifications to GfeScriptExecutor and GfeScript to improve synchronization-caused back-logs.
Change-Id: Ic33ef5e62d2bd1e19dd2cfedcfefe050cf7efe9e
Former-commit-id: efc9e9000b [formerly 9a75c87829] [formerly efc9e9000b [formerly 9a75c87829] [formerly 3cfa029f4b [formerly 679996850315f699d47633da5baf593c72ba7927]]]
Former-commit-id: 3cfa029f4b
Former-commit-id: 882544b165 [formerly 1818e488c5]
Former-commit-id: 2f723abcb7
|
2012-03-06 16:24:58 -06:00 |
|
David Gillingham
|
f67e4bc8c2
|
Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.
Former-commit-id: 8d2ea4cfba [formerly ff231f33f4] [formerly 8d2ea4cfba [formerly ff231f33f4] [formerly 1d69867594 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]]
Former-commit-id: 1d69867594
Former-commit-id: 000ca27db9 [formerly 8c0b121cbc]
Former-commit-id: 773b6c7af6
|
2012-03-05 16:49:23 -06:00 |
|
Bryan Kowal
|
2f7b3400c5
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 6e8b4a188f [formerly 5228de77e2] [formerly 6e8b4a188f [formerly 5228de77e2] [formerly 793dad5711 [formerly a5229ac02bb3c7e177b26dae68902321c9de986c]]]
Former-commit-id: 793dad5711
Former-commit-id: 1585b4b827 [formerly 81f778e43a]
Former-commit-id: faa13ee9f7
|
2012-03-05 13:46:10 -06:00 |
|
David Gillingham
|
678953ae76
|
Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.
Former-commit-id: 1908212c27 [formerly d68e3a7eea] [formerly 1908212c27 [formerly d68e3a7eea] [formerly 494fbe93db [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]
Former-commit-id: 494fbe93db
Former-commit-id: 29f03b0d2a [formerly bc61eb1e43]
Former-commit-id: ad8efe180e
|
2012-03-05 11:23:11 -06:00 |
|
Max Schenkelberg
|
9385c7c7b3
|
Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: 225dfd15be [formerly 0cf00cb7f4] [formerly 225dfd15be [formerly 0cf00cb7f4] [formerly 76e7a02f76 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]]]
Former-commit-id: 76e7a02f76
Former-commit-id: b23dc95d40 [formerly e27d36432a]
Former-commit-id: b1a521b17e
|
2012-03-02 13:26:44 -06:00 |
|
David Gillingham
|
0b79b9ea21
|
Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: bd01975367 [formerly f6f0ca24df] [formerly bd01975367 [formerly f6f0ca24df] [formerly 0c0f659896 [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]
Former-commit-id: 0c0f659896
Former-commit-id: bce9ad39ae [formerly b3df043f97]
Former-commit-id: 788007ff63
|
2012-03-02 13:22:46 -06:00 |
|
Max Schenkelberg
|
4590c7b694
|
Issue #358 merged dataURI changes from thinclient in for plot
compatibility
Former-commit-id: 4d91a4fd74 [formerly f96ff96259] [formerly 4d91a4fd74 [formerly f96ff96259] [formerly 1f714b1a5b [formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]]]
Former-commit-id: 1f714b1a5b
Former-commit-id: 79365f1f62 [formerly e4914cbe89]
Former-commit-id: 28052629c8
|
2012-03-02 12:24:19 -06:00 |
|
Max Schenkelberg
|
ae389f0b57
|
Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements
Former-commit-id: e2cd95d3f4 [formerly ae47d9683e] [formerly e2cd95d3f4 [formerly ae47d9683e] [formerly 48b6d45f00 [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 0554abdde0 [formerly 3212cc6ebb]
Former-commit-id: 585e979c76
|
2012-03-01 16:59:40 -06:00 |
|
Steve Harris
|
cdc4d1cb44
|
Merge branch 'ss_sync' into sync_test
Former-commit-id: 3b9c3e3474 [formerly 951ecfe3dd] [formerly 3b9c3e3474 [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]
Former-commit-id: 787aed90f8
Former-commit-id: b3f831a7b4 [formerly db45babec8]
Former-commit-id: 376edad3c9
|
2012-03-01 14:01:16 -06:00 |
|
Steve Harris
|
9ce7c680d7
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 8794c4bcf6 [formerly c21bd2719c] [formerly 8794c4bcf6 [formerly c21bd2719c] [formerly 9bdea0399f [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]
Former-commit-id: 9bdea0399f
Former-commit-id: fe0b1eed94 [formerly 6f5c182af0]
Former-commit-id: 6cdedca0a3
|
2012-03-01 13:19:04 -06:00 |
|
Ben Steffensmeier
|
4e0ec11a6f
|
Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd
Former-commit-id: aa90109f45 [formerly 49cce84edf] [formerly aa90109f45 [formerly 49cce84edf] [formerly 7c2409eab0 [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]
Former-commit-id: 7c2409eab0
Former-commit-id: f8c2ad7136 [formerly 3220ee4745]
Former-commit-id: e0ad3aee33
|
2012-03-01 12:44:43 -06:00 |
|
Steve Harris
|
3306848158
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 98d1fbeb0e [formerly 703cb6e748] [formerly 98d1fbeb0e [formerly 703cb6e748] [formerly dd52eb4d40 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]
Former-commit-id: dd52eb4d40
Former-commit-id: 3e4d618486 [formerly 06baad5169]
Former-commit-id: a4d8f58c90
|
2012-02-29 16:08:39 -06:00 |
|
Ben Steffensmeier
|
da7275d80b
|
Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 56d97c95d5 [formerly 5c303ed189] [formerly 56d97c95d5 [formerly 5c303ed189] [formerly c61e40c426 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]
Former-commit-id: c61e40c426
Former-commit-id: 390700efb0 [formerly 84e6c9beb8]
Former-commit-id: 588432f980
|
2012-02-29 15:49:47 -06:00 |
|
Ben Steffensmeier
|
f668495c76
|
Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time.
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f
Former-commit-id: 3713d7a181 [formerly 5dee50e7e9] [formerly 3713d7a181 [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]
Former-commit-id: d7a63995f1
Former-commit-id: dba810ddc4 [formerly e52c2ffb20]
Former-commit-id: 7d4367ee7a
|
2012-02-28 15:20:37 -06:00 |
|
Steve Harris
|
98c100b36f
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c45e7b888c [formerly aa597242f9] [formerly c45e7b888c [formerly aa597242f9] [formerly a4538f0a48 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]
Former-commit-id: a4538f0a48
Former-commit-id: 7c18ec7c7c [formerly fdd6018d1a]
Former-commit-id: ba4a6aa434
|
2012-02-27 11:32:49 -06:00 |
|
Ben Steffensmeier
|
cc91522fa0
|
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 20481daa1b [formerly 357dc4d88b] [formerly 20481daa1b [formerly 357dc4d88b] [formerly 637c051a23 [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 637c051a23
Former-commit-id: 88d2d2e4b6 [formerly 62f1ea0aac]
Former-commit-id: 0b4134f364
|
2012-02-24 14:57:23 -06:00 |
|
Bryan Kowal
|
48f3f1e2d7
|
Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: 475849bd91 [formerly 1e3e31a657] [formerly 475849bd91 [formerly 1e3e31a657] [formerly c2cd292c32 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]]
Former-commit-id: c2cd292c32
Former-commit-id: d4367098a7 [formerly 49a30a5b1a]
Former-commit-id: 8350501de4
|
2012-02-23 16:46:48 -06:00 |
|
David Gillingham
|
98bc9450d3
|
Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: ef903bc728 [formerly d79f7e9613] [formerly ef903bc728 [formerly d79f7e9613] [formerly 5aa5b51a55 [formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: 6bca8d6353 [formerly f9ed20bada]
Former-commit-id: 85c082f1e9
|
2012-02-23 14:40:25 -06:00 |
|
Bryan Kowal
|
511f0efe24
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 4881def0e9 [formerly bae0cb555e] [formerly 4881def0e9 [formerly bae0cb555e] [formerly e135f4508d [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]]
Former-commit-id: e135f4508d
Former-commit-id: fa23b673c4 [formerly 5c86773a77]
Former-commit-id: 4a78479648
|
2012-02-23 14:20:50 -06:00 |
|
Steve Harris
|
3a53c6453c
|
Merge branch 'ss_sync'
Former-commit-id: 507374d31d [formerly 9ef773822f] [formerly 507374d31d [formerly 9ef773822f] [formerly c81cfb72c6 [formerly 5ed747b42f001de0c6d08b5fb6f77a192f2e9a03]]]
Former-commit-id: c81cfb72c6
Former-commit-id: a90ad88b3c [formerly 546db2604a]
Former-commit-id: e5fdaad4fe
|
2012-02-23 13:32:19 -06:00 |
|
David Gillingham
|
ca09c3a75a
|
Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 5a8ba0f0fb [formerly 32b2c06988] [formerly 5a8ba0f0fb [formerly 32b2c06988] [formerly 85998bc654 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]
Former-commit-id: 85998bc654
Former-commit-id: 9ff631305a [formerly 88dcd4d09d]
Former-commit-id: 8e123e3ae0
|
2012-02-23 13:23:59 -06:00 |
|
Steve Harris
|
e639c21185
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 6cab5a6709 [formerly eeddaa55f5] [formerly 6cab5a6709 [formerly eeddaa55f5] [formerly e829aa1a8b [formerly 72fce6fda1b07320cc79fbf8f09cc47ffbe32e89]]]
Former-commit-id: e829aa1a8b
Former-commit-id: 15facb4cf5 [formerly 48f081f798]
Former-commit-id: 190ebbc6a8
|
2012-02-23 13:18:50 -06:00 |
|
Steve Harris
|
db855932c5
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: db8491ee59 [formerly d6b489e69e] [formerly db8491ee59 [formerly d6b489e69e] [formerly 3b16f37675 [formerly fee006734577fd51f05ca5e9ce211d36d2b9fe57]]]
Former-commit-id: 3b16f37675
Former-commit-id: 4518d47393 [formerly 6f13b9c3b1]
Former-commit-id: 62e5b475da
|
2012-02-23 13:18:15 -06:00 |
|
Steve Harris
|
8ba0bf58ae
|
Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: d61c6bda96 [formerly f081d1a6d4] [formerly d61c6bda96 [formerly f081d1a6d4] [formerly a0063d6cb1 [formerly 5aa15dec35cf72a46288613e42e6cb02b94320a6]]]
Former-commit-id: a0063d6cb1
Former-commit-id: 62be9edb93 [formerly 4b1d072b46]
Former-commit-id: 0c7fa07eea
|
2012-02-23 13:17:26 -06:00 |
|
Steve Harris
|
034270857e
|
Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 608a0c17a0 [formerly f9baa1c98c] [formerly 608a0c17a0 [formerly f9baa1c98c] [formerly 46e1499e43 [formerly 2059372e90437312cf12f06de6c84d0824fb586c]]]
Former-commit-id: 46e1499e43
Former-commit-id: 63764220c4 [formerly 096ba6eb30]
Former-commit-id: 1328771113
|
2012-02-23 13:16:35 -06:00 |
|
Steve Harris
|
3433a1e31c
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: 07ac42866c [formerly c502603907] [formerly 07ac42866c [formerly c502603907] [formerly ecb38ba165 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]
Former-commit-id: ecb38ba165
Former-commit-id: d83100c3df [formerly a9b900821a]
Former-commit-id: 32fa2a28c5
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
93d99ca49c
|
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 4981170462 [formerly dcadf7baa4] [formerly 4981170462 [formerly dcadf7baa4] [formerly 86e586befe [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]
Former-commit-id: 86e586befe
Former-commit-id: 4eb1ef5b0f [formerly 938dc5b21c]
Former-commit-id: 2c958713b6
|
2012-02-23 12:38:55 -06:00 |
|
Nate Jensen
|
a9a165f471
|
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
Former-commit-id: a914aa38c8 [formerly e3e44707a4] [formerly a914aa38c8 [formerly e3e44707a4] [formerly fef3fcb60c [formerly fd448c2a996aef215802dc501b68d28747f66414]]]
Former-commit-id: fef3fcb60c
Former-commit-id: e0e2a82d83 [formerly d03ff9824e]
Former-commit-id: 57c46aa9e1
|
2012-02-23 11:50:39 -06:00 |
|
Ben Steffensmeier
|
c77d5e6d98
|
Issue #176 update merged ncep plot classes to use new plot interface.
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 0b0047e29d [formerly 703d59a968] [formerly 0b0047e29d [formerly 703d59a968] [formerly 03d9230879 [formerly 2e22a794183e4be8758997b9e76f896917a761db]]]
Former-commit-id: 03d9230879
Former-commit-id: f048713c31 [formerly 6db9a03560]
Former-commit-id: af545548a1
|
2012-02-23 11:23:01 -06:00 |
|
Ben Steffensmeier
|
70cf1d2ad5
|
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: a2db6975c9 [formerly 4dedc8b30d] [formerly a2db6975c9 [formerly 4dedc8b30d] [formerly 73a08e9d4e [formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]]]
Former-commit-id: 73a08e9d4e
Former-commit-id: d937284ab2 [formerly d5d8697d9f]
Former-commit-id: 92962fdd2c
|
2012-02-23 10:49:56 -06:00 |
|
Steve Harris
|
c65a7faf1b
|
Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: 9588895c2d [formerly 2d25ee9414] [formerly 9588895c2d [formerly 2d25ee9414] [formerly 19cf09274c [formerly a1b82aa2367ca506175ab0fec425c9e633ce949f]]]
Former-commit-id: 19cf09274c
Former-commit-id: b297f21344 [formerly 8afdef6680]
Former-commit-id: 24e057e722
|
2012-02-23 10:28:19 -06:00 |
|
Steve Harris
|
fd5ed23eb3
|
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
Former-commit-id: c0c0acfbe8 [formerly 957d232286] [formerly c0c0acfbe8 [formerly 957d232286] [formerly a82f2c5750 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]]
Former-commit-id: a82f2c5750
Former-commit-id: 43b83ed8aa [formerly e6c3afa7a2]
Former-commit-id: 7f8343833e
|
2012-02-23 10:19:54 -06:00 |
|
Steve Harris
|
321a11e44c
|
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
Former-commit-id: a5f8708b6a [formerly db065fcd50] [formerly a5f8708b6a [formerly db065fcd50] [formerly e94b322dc3 [formerly 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb]]]
Former-commit-id: e94b322dc3
Former-commit-id: 97184f1dc4 [formerly 78ea2de6d3]
Former-commit-id: 91ffb88ac7
|
2012-02-23 10:16:02 -06:00 |
|
Steve Harris
|
3aef320ffd
|
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 92084b3f20 [formerly d0bbbfefcc] [formerly 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 92b7072b82 [formerly 3d511fe719]
Former-commit-id: ae9c52b012
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
25167bb0eb
|
Merge branch 'OB12.2.1_test' into ss_sync
Former-commit-id: 7966ab9369 [formerly 6f7f678590] [formerly 7966ab9369 [formerly 6f7f678590] [formerly 830038b0c6 [formerly 76967f2151dcfb275be389c04060ff34be4a5018]]]
Former-commit-id: 830038b0c6
Former-commit-id: 1954443885 [formerly 5f6715ed05]
Former-commit-id: 3611ed97ca
|
2012-02-23 07:53:15 -06:00 |
|
Ben Steffensmeier
|
16d205ce9d
|
Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: b776d953d7 [formerly 06c9d4cdcf] [formerly b776d953d7 [formerly 06c9d4cdcf] [formerly 55aa66a510 [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]]
Former-commit-id: 55aa66a510
Former-commit-id: c3d3142bab [formerly 5d6b036ed7]
Former-commit-id: 8f34946969
|
2012-02-22 17:40:48 -06:00 |
|
Bryan Kowal
|
27d2b69f2b
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 0f02d05283 [formerly 9a63901c0e] [formerly 0f02d05283 [formerly 9a63901c0e] [formerly cd35220cf7 [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]]]
Former-commit-id: cd35220cf7
Former-commit-id: 53f4674f25 [formerly 5ca7ce8373]
Former-commit-id: 012661cc90
|
2012-02-22 17:07:15 -06:00 |
|
Steve Harris
|
6c53f2425f
|
creating OB12.2.1 from ss_sync for testing
Former-commit-id: 4ff546d3fd [formerly a7b68a50be] [formerly 4ff546d3fd [formerly a7b68a50be] [formerly 1fc25c6cb2 [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]]]
Former-commit-id: 1fc25c6cb2
Former-commit-id: 83618ae62b [formerly aaf2fbd05b]
Former-commit-id: 5b11c36f19
|
2012-02-22 13:06:47 -06:00 |
|
Steve Harris
|
978d22db50
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: b55a488ed8 [formerly 4450cf8963]
Former-commit-id: 15c56d11bc
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
01d72ca3c9
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 85075e6107 [formerly 94c2ea985b] [formerly 85075e6107 [formerly 94c2ea985b] [formerly 9995d22e25 [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 9995d22e25
Former-commit-id: 610fdf3f4e [formerly aaead73ec5]
Former-commit-id: 156ad8471d
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
a9cfeacc6b
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 2c12c02910 [formerly 84926c80be] [formerly 2c12c02910 [formerly 84926c80be] [formerly f3fe839c1c [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]]
Former-commit-id: f3fe839c1c
Former-commit-id: 968239217e [formerly 6d1b04e62c]
Former-commit-id: a14d90ed4d
|
2012-02-21 10:37:36 -06:00 |
|
Nate Jensen
|
0d56994428
|
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: ba5b1ee03f [formerly b90611d995] [formerly ba5b1ee03f [formerly b90611d995] [formerly ec0cd8d086 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]]
Former-commit-id: ec0cd8d086
Former-commit-id: 2ee4305d77 [formerly 13ea11ddfc]
Former-commit-id: f92be47f79
|
2012-02-21 08:57:12 -06:00 |
|
Steve Harris
|
cfea5008c1
|
Merge branch 'ss_sync'
Former-commit-id: de7a3491fa [formerly 7be1fb41ea] [formerly de7a3491fa [formerly 7be1fb41ea] [formerly 4e1def89e7 [formerly b1c075b5f5af7df5058a409622a59b7d13b36416]]]
Former-commit-id: 4e1def89e7
Former-commit-id: c2683ac759 [formerly b2965389c7]
Former-commit-id: c40f342dbe
|
2012-02-20 16:51:00 -06:00 |
|
Ben Steffensmeier
|
f934ade63a
|
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 27973ec694 [formerly 69e8cde115] [formerly 27973ec694 [formerly 69e8cde115] [formerly 73d24fad2f [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]]
Former-commit-id: 73d24fad2f
Former-commit-id: 0ee68fb6cc [formerly dcbe4fc7da]
Former-commit-id: f949f622dd
|
2012-02-20 15:28:20 -06:00 |
|
Steve Harris
|
161bc7ddc8
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: ef21df5086 [formerly 07bf1f770d] [formerly ef21df5086 [formerly 07bf1f770d] [formerly ebf5e8360e [formerly 80817ea48545c3315d8445c9acae60b6c92088f7]]]
Former-commit-id: ebf5e8360e
Former-commit-id: 2ffbfd0181 [formerly 5bc52de24a]
Former-commit-id: 06fd623597
|
2012-02-20 13:04:10 -06:00 |
|
Steve Harris
|
bcccffbaa4
|
Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: d971880b98 [formerly cabf9fd956] [formerly d971880b98 [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: b12f5e5d75 [formerly 33483f3960]
Former-commit-id: acd7845ebd
|
2012-02-20 13:03:39 -06:00 |
|
Steve Harris
|
d3c80a1557
|
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: a2fd2cf6fa [formerly 6a064cb78b] [formerly a2fd2cf6fa [formerly 6a064cb78b] [formerly d02529fef4 [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]
Former-commit-id: d02529fef4
Former-commit-id: b41e5f2415 [formerly d133454b27]
Former-commit-id: d9c8a99210
|
2012-02-20 12:54:25 -06:00 |
|
Steve Harris
|
60bf5aeced
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: c268da57bc [formerly 4b76d22f77] [formerly c268da57bc [formerly 4b76d22f77] [formerly cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]
Former-commit-id: cc66c8be24
Former-commit-id: dd911bed4d [formerly 54b5b6baef]
Former-commit-id: 09b81c6e00
|
2012-02-20 12:43:38 -06:00 |
|
Steve Harris
|
41571066d5
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: e3535054ff [formerly 62c587b841] [formerly e3535054ff [formerly 62c587b841] [formerly c825bd03a2 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]]
Former-commit-id: c825bd03a2
Former-commit-id: b609a6fd60 [formerly 0fab56e0f1]
Former-commit-id: f265cb965d
|
2012-02-20 07:49:13 -06:00 |
|
Bryan Kowal
|
ce9165ce58
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 5754f9dfd8 [formerly 10a0ca252d] [formerly 5754f9dfd8 [formerly 10a0ca252d] [formerly 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]
Former-commit-id: 682c10767d
Former-commit-id: cc8c6597a2 [formerly 2ba23624b4]
Former-commit-id: 8403801a2b
|
2012-02-17 12:17:14 -06:00 |
|