David Gillingham
|
e0987cc993
|
Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.
Former-commit-id: 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 494fbe93db [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]
Former-commit-id: 494fbe93db
Former-commit-id: 22e522451d0eb5f0c7b3b2a357bfc73d015795c9 [formerly bc61eb1e43]
Former-commit-id: 29f03b0d2a
|
2012-03-05 11:23:11 -06:00 |
|
Max Schenkelberg
|
2300065c15
|
Issue #358 merged esb.camel project for plot update compatibility
Former-commit-id: 8438bc54db [formerly 225dfd15be] [formerly 0cf00cb7f4] [formerly 76e7a02f76 [formerly 0cf00cb7f4 [formerly ba90282320443c6c41c3188db9f43ffb11399bdd]]]
Former-commit-id: 76e7a02f76
Former-commit-id: 7e077fb0a73db21250703b0387c3382298480c99 [formerly e27d36432a]
Former-commit-id: b23dc95d40
|
2012-03-02 13:26:44 -06:00 |
|
David Gillingham
|
f670f3c950
|
Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 0c0f659896 [formerly f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]
Former-commit-id: 0c0f659896
Former-commit-id: de321dd91cb8346ac092574ed9b7c81299c63edf [formerly b3df043f97]
Former-commit-id: bce9ad39ae
|
2012-03-02 13:22:46 -06:00 |
|
Max Schenkelberg
|
236c8f4ba3
|
Issue #358 merged dataURI changes from thinclient in for plot
compatibility
Former-commit-id: 7337ff7ed6 [formerly 4d91a4fd74] [formerly f96ff96259] [formerly 1f714b1a5b [formerly f96ff96259 [formerly 14d0dc1cd0e5eb0b48de89f5c73f30152d4789de]]]
Former-commit-id: 1f714b1a5b
Former-commit-id: c406d73453a39a7f5f13343ad3eebf5e47637d1a [formerly e4914cbe89]
Former-commit-id: 79365f1f62
|
2012-03-02 12:24:19 -06:00 |
|
Max Schenkelberg
|
52c7dec2e8
|
Issue #358 Committing NPP core rendering improvements merged with Thin
Client core improvements
Former-commit-id: fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb]
Former-commit-id: 0554abdde0
|
2012-03-01 16:59:40 -06:00 |
|
Steve Harris
|
6fdae68267
|
Merge branch 'ss_sync' into sync_test
Former-commit-id: 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]
Former-commit-id: 787aed90f8
Former-commit-id: 64c60f8d4b42c0f811914474c3baf46e1940786e [formerly db45babec8]
Former-commit-id: b3f831a7b4
|
2012-03-01 14:01:16 -06:00 |
|
Steve Harris
|
13597e2d3d
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 5bf956755a [formerly 8794c4bcf6] [formerly c21bd2719c] [formerly 9bdea0399f [formerly c21bd2719c [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]
Former-commit-id: 9bdea0399f
Former-commit-id: 79ca895e04be795aebb8555aa0b0ba51850c543e [formerly 6f5c182af0]
Former-commit-id: fe0b1eed94
|
2012-03-01 13:19:04 -06:00 |
|
Ben Steffensmeier
|
6ec01d1d19
|
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: 5395e71757 [formerly aa90109f45] [formerly 49cce84edf] [formerly 7c2409eab0 [formerly 49cce84edf [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]
Former-commit-id: 7c2409eab0
Former-commit-id: 691ebf923ce51c7c2978a0c30511852ac7042b3c [formerly 3220ee4745]
Former-commit-id: f8c2ad7136
|
2012-03-01 12:44:43 -06:00 |
|
Steve Harris
|
f5db44b7aa
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 27fb50d455 [formerly 98d1fbeb0e] [formerly 703cb6e748] [formerly dd52eb4d40 [formerly 703cb6e748 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]
Former-commit-id: dd52eb4d40
Former-commit-id: fe7d53e8a206e849dc25fe40d0bef8cfe7ab3606 [formerly 06baad5169]
Former-commit-id: 3e4d618486
|
2012-02-29 16:08:39 -06:00 |
|
Ben Steffensmeier
|
cc8e7897cf
|
Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]
Former-commit-id: c61e40c426
Former-commit-id: bc3ac83b421a21ffdbc670c12096f7c96ca7c87f [formerly 84e6c9beb8]
Former-commit-id: 390700efb0
|
2012-02-29 15:49:47 -06:00 |
|
Ben Steffensmeier
|
1ac84dc230
|
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: 7c3545170d [formerly 3713d7a181] [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly 5dee50e7e9 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]
Former-commit-id: d7a63995f1
Former-commit-id: 17cbace4358ff60cc55095422d0870a3cb6e704b [formerly e52c2ffb20]
Former-commit-id: dba810ddc4
|
2012-02-28 15:20:37 -06:00 |
|
Steve Harris
|
b65a901af6
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: e08a6e4b1c [formerly c45e7b888c] [formerly aa597242f9] [formerly a4538f0a48 [formerly aa597242f9 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]
Former-commit-id: a4538f0a48
Former-commit-id: 0f7bb182634a23c54efdab2309f3cd0d4a2a8f14 [formerly fdd6018d1a]
Former-commit-id: 7c18ec7c7c
|
2012-02-27 11:32:49 -06:00 |
|
Ben Steffensmeier
|
d5118790dd
|
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 8fd9d92f0a [formerly 20481daa1b] [formerly 357dc4d88b] [formerly 637c051a23 [formerly 357dc4d88b [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 637c051a23
Former-commit-id: bc7a93cc6ff900a77e00a7eb9d6864845eda90c8 [formerly 62f1ea0aac]
Former-commit-id: 88d2d2e4b6
|
2012-02-24 14:57:23 -06:00 |
|
Bryan Kowal
|
2fa51704a0
|
Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: 48d5fd8ee6 [formerly 475849bd91] [formerly 1e3e31a657] [formerly c2cd292c32 [formerly 1e3e31a657 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]]
Former-commit-id: c2cd292c32
Former-commit-id: e59528ebf20a3f9e9fafe944e7bf90cae2f7d19f [formerly 49a30a5b1a]
Former-commit-id: d4367098a7
|
2012-02-23 16:46:48 -06:00 |
|
David Gillingham
|
d10c91b814
|
Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: 586f77e788 [formerly ef903bc728] [formerly d79f7e9613] [formerly 5aa5b51a55 [formerly d79f7e9613 [formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: 9d586efeed036f273d51786977174c550e093ace [formerly f9ed20bada]
Former-commit-id: 6bca8d6353
|
2012-02-23 14:40:25 -06:00 |
|
Bryan Kowal
|
70afebc3a9
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: e723d50244 [formerly 4881def0e9] [formerly 787a2bdbc4f7f2536dc9e89bd790b020c7dfbe6d [formerly bae0cb555e]] [formerly e135f4508d [formerly bae0cb555e [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]]
Former-commit-id: e135f4508d
Former-commit-id: a9d31b1493dd373f2fd8124779bfc4579645858b [formerly 5c86773a77]
Former-commit-id: fa23b673c4
|
2012-02-23 14:20:50 -06:00 |
|
Steve Harris
|
3df0fd8ff9
|
Merge branch 'ss_sync'
Former-commit-id: 5004037bda [formerly 507374d31d] [formerly 9ef773822f] [formerly c81cfb72c6 [formerly 9ef773822f [formerly 5ed747b42f001de0c6d08b5fb6f77a192f2e9a03]]]
Former-commit-id: c81cfb72c6
Former-commit-id: 535912a1a82ff301f9e8633ae937dc30a8404833 [formerly 546db2604a]
Former-commit-id: a90ad88b3c
|
2012-02-23 13:32:19 -06:00 |
|
David Gillingham
|
d9def42052
|
Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: adfd42b5ce [formerly 5a8ba0f0fb] [formerly 32b2c06988] [formerly 85998bc654 [formerly 32b2c06988 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]
Former-commit-id: 85998bc654
Former-commit-id: fb4654a71df93b18d676c70825d89036de6bfcfe [formerly 88dcd4d09d]
Former-commit-id: 9ff631305a
|
2012-02-23 13:23:59 -06:00 |
|
Steve Harris
|
42594c734b
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 7174904570 [formerly 6cab5a6709] [formerly eeddaa55f5] [formerly e829aa1a8b [formerly eeddaa55f5 [formerly 72fce6fda1b07320cc79fbf8f09cc47ffbe32e89]]]
Former-commit-id: e829aa1a8b
Former-commit-id: c0e93a29fcec7a2d69d301012349901b89a5de9c [formerly 48f081f798]
Former-commit-id: 15facb4cf5
|
2012-02-23 13:18:50 -06:00 |
|
Steve Harris
|
3c7bf434ba
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c4616866d0 [formerly db8491ee59] [formerly d6b489e69e] [formerly 3b16f37675 [formerly d6b489e69e [formerly fee006734577fd51f05ca5e9ce211d36d2b9fe57]]]
Former-commit-id: 3b16f37675
Former-commit-id: a3fec26c8a86a1ded9e0ab2b00a9fa60cab06b8a [formerly 6f13b9c3b1]
Former-commit-id: 4518d47393
|
2012-02-23 13:18:15 -06:00 |
|
Steve Harris
|
969bfd1146
|
Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: 7c3760b319 [formerly d61c6bda96] [formerly f081d1a6d4] [formerly a0063d6cb1 [formerly f081d1a6d4 [formerly 5aa15dec35cf72a46288613e42e6cb02b94320a6]]]
Former-commit-id: a0063d6cb1
Former-commit-id: 9b7fd7be1274ee48006e725dcf3a6947cf15044f [formerly 4b1d072b46]
Former-commit-id: 62be9edb93
|
2012-02-23 13:17:26 -06:00 |
|
Steve Harris
|
1fa3e31716
|
Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 55b44a00db [formerly 608a0c17a0] [formerly f9baa1c98c] [formerly 46e1499e43 [formerly f9baa1c98c [formerly 2059372e90437312cf12f06de6c84d0824fb586c]]]
Former-commit-id: 46e1499e43
Former-commit-id: 4963e367347650292e79807030506ea282547db3 [formerly 096ba6eb30]
Former-commit-id: 63764220c4
|
2012-02-23 13:16:35 -06:00 |
|
Steve Harris
|
9397ca10a8
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: 2f8260ccbc [formerly 07ac42866c] [formerly c502603907] [formerly ecb38ba165 [formerly c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]
Former-commit-id: ecb38ba165
Former-commit-id: 7430208f5d1e69b088b0ad09205b10f1007182e4 [formerly a9b900821a]
Former-commit-id: d83100c3df
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
fbb5de922a
|
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: 0be3703c7e [formerly 4981170462] [formerly dcadf7baa4] [formerly 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]
Former-commit-id: 86e586befe
Former-commit-id: 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c]
Former-commit-id: 4eb1ef5b0f
|
2012-02-23 12:38:55 -06:00 |
|
Nate Jensen
|
2db5dbe305
|
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
Former-commit-id: b07575c5b3 [formerly a914aa38c8] [formerly e3e44707a4] [formerly fef3fcb60c [formerly e3e44707a4 [formerly fd448c2a996aef215802dc501b68d28747f66414]]]
Former-commit-id: fef3fcb60c
Former-commit-id: 834f82bd59e01c6c99532d9991840fdacffe244d [formerly d03ff9824e]
Former-commit-id: e0e2a82d83
|
2012-02-23 11:50:39 -06:00 |
|
Ben Steffensmeier
|
d1b9b4bc84
|
Issue #176 update merged ncep plot classes to use new plot interface.
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 41ca3213a4 [formerly 0b0047e29d] [formerly 703d59a968] [formerly 03d9230879 [formerly 703d59a968 [formerly 2e22a794183e4be8758997b9e76f896917a761db]]]
Former-commit-id: 03d9230879
Former-commit-id: 892ee6361f74622da1f7045e0847bcce6026e627 [formerly 6db9a03560]
Former-commit-id: f048713c31
|
2012-02-23 11:23:01 -06:00 |
|
Ben Steffensmeier
|
3f86d825d5
|
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: 127dde9454 [formerly a2db6975c9] [formerly 4dedc8b30d] [formerly 73a08e9d4e [formerly 4dedc8b30d [formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]]]
Former-commit-id: 73a08e9d4e
Former-commit-id: 57785c3dff7f653eb1377659f11622f20ae35a74 [formerly d5d8697d9f]
Former-commit-id: d937284ab2
|
2012-02-23 10:49:56 -06:00 |
|
Steve Harris
|
91e382233d
|
Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: 40fee93b99 [formerly 9588895c2d] [formerly 2d25ee9414] [formerly 19cf09274c [formerly 2d25ee9414 [formerly a1b82aa2367ca506175ab0fec425c9e633ce949f]]]
Former-commit-id: 19cf09274c
Former-commit-id: 8fb7fd39b6a6c047b2867b19a4f0a225371f7b42 [formerly 8afdef6680]
Former-commit-id: b297f21344
|
2012-02-23 10:28:19 -06:00 |
|
Steve Harris
|
d1589bf5e5
|
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
Former-commit-id: ed66d12d24 [formerly c0c0acfbe8] [formerly 957d232286] [formerly a82f2c5750 [formerly 957d232286 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]]
Former-commit-id: a82f2c5750
Former-commit-id: 252271566acafedef77dcd075974af95164c1987 [formerly e6c3afa7a2]
Former-commit-id: 43b83ed8aa
|
2012-02-23 10:19:54 -06:00 |
|
Steve Harris
|
391451e14b
|
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
Former-commit-id: 909a19606c [formerly a5f8708b6a] [formerly db065fcd50] [formerly e94b322dc3 [formerly db065fcd50 [formerly 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb]]]
Former-commit-id: e94b322dc3
Former-commit-id: e5d89cf4f3149ec572a32c84f492bd3f9f2178c4 [formerly 78ea2de6d3]
Former-commit-id: 97184f1dc4
|
2012-02-23 10:16:02 -06:00 |
|
Steve Harris
|
2d02f819be
|
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: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]
Former-commit-id: 92b7072b82
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
b3031c14d9
|
Merge branch 'OB12.2.1_test' into ss_sync
Former-commit-id: 5fcd6629dc [formerly 7966ab9369] [formerly 6f7f678590] [formerly 830038b0c6 [formerly 6f7f678590 [formerly 76967f2151dcfb275be389c04060ff34be4a5018]]]
Former-commit-id: 830038b0c6
Former-commit-id: bde9de0656d064c2040558e807738aec3e5cb5a5 [formerly 5f6715ed05]
Former-commit-id: 1954443885
|
2012-02-23 07:53:15 -06:00 |
|
Ben Steffensmeier
|
e99e823ca8
|
Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 13ecc7e4ea [formerly b776d953d7] [formerly 06c9d4cdcf] [formerly 55aa66a510 [formerly 06c9d4cdcf [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]]
Former-commit-id: 55aa66a510
Former-commit-id: caf20037931a8dff74e314931dddc204682bcdf7 [formerly 5d6b036ed7]
Former-commit-id: c3d3142bab
|
2012-02-22 17:40:48 -06:00 |
|
Bryan Kowal
|
1401b352aa
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 22bea830e7 [formerly 0f02d05283] [formerly 9a63901c0e] [formerly cd35220cf7 [formerly 9a63901c0e [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]]]
Former-commit-id: cd35220cf7
Former-commit-id: 92a815e7a7ec0656dd9e267ce64094f37042e075 [formerly 5ca7ce8373]
Former-commit-id: 53f4674f25
|
2012-02-22 17:07:15 -06:00 |
|
Steve Harris
|
bad18c25a8
|
creating OB12.2.1 from ss_sync for testing
Former-commit-id: aefccec0f4 [formerly 4ff546d3fd] [formerly a7b68a50be] [formerly 1fc25c6cb2 [formerly a7b68a50be [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]]]
Former-commit-id: 1fc25c6cb2
Former-commit-id: f5447b76ca6821a52960c9806a09d4327000f174 [formerly aaf2fbd05b]
Former-commit-id: 83618ae62b
|
2012-02-22 13:06:47 -06:00 |
|
Steve Harris
|
13a3edd4f6
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]
Former-commit-id: b55a488ed8
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
139d42c594
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 9995d22e25
Former-commit-id: dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]
Former-commit-id: 610fdf3f4e
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
0295f24df1
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: aee8ef48fe [formerly 2c12c02910] [formerly 39d576f84fe54a129e1631ac7c208e0d49e5fd36 [formerly 84926c80be]] [formerly f3fe839c1c [formerly 84926c80be [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]]
Former-commit-id: f3fe839c1c
Former-commit-id: f0db7f39e4b09a4a991fc462354c2e91299cc7e0 [formerly 6d1b04e62c]
Former-commit-id: 968239217e
|
2012-02-21 10:37:36 -06:00 |
|
Nate Jensen
|
8dc1ff026f
|
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: f17df86ba3 [formerly ba5b1ee03f] [formerly b90611d995] [formerly ec0cd8d086 [formerly b90611d995 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]]
Former-commit-id: ec0cd8d086
Former-commit-id: 7bcacb16073573ba01393828f50c6e24f05ad1a2 [formerly 13ea11ddfc]
Former-commit-id: 2ee4305d77
|
2012-02-21 08:57:12 -06:00 |
|
Steve Harris
|
b6b15d8f96
|
Merge branch 'ss_sync'
Former-commit-id: 567a30dc74 [formerly de7a3491fa] [formerly 7be1fb41ea] [formerly 4e1def89e7 [formerly 7be1fb41ea [formerly b1c075b5f5af7df5058a409622a59b7d13b36416]]]
Former-commit-id: 4e1def89e7
Former-commit-id: 8848192c36eea795874bed1406108b0e05ed5abf [formerly b2965389c7]
Former-commit-id: c2683ac759
|
2012-02-20 16:51:00 -06:00 |
|
Ben Steffensmeier
|
ab464fde3e
|
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 1c1500408b [formerly 27973ec694] [formerly 69e8cde115] [formerly 73d24fad2f [formerly 69e8cde115 [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]]
Former-commit-id: 73d24fad2f
Former-commit-id: 2e661e9d7cba71c6da9333bda034d1523204696a [formerly dcbe4fc7da]
Former-commit-id: 0ee68fb6cc
|
2012-02-20 15:28:20 -06:00 |
|
Steve Harris
|
37bb0ba95d
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c69eb6d93d [formerly ef21df5086] [formerly 07bf1f770d] [formerly ebf5e8360e [formerly 07bf1f770d [formerly 80817ea48545c3315d8445c9acae60b6c92088f7]]]
Former-commit-id: ebf5e8360e
Former-commit-id: e89cc2471d046b992aa36e77f1042ebf13c884a0 [formerly 5bc52de24a]
Former-commit-id: 2ffbfd0181
|
2012-02-20 13:04:10 -06:00 |
|
Steve Harris
|
2e0f1d3ecc
|
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: eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960]
Former-commit-id: b12f5e5d75
|
2012-02-20 13:03:39 -06:00 |
|
Steve Harris
|
4ffbe4780e
|
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly d02529fef4 [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]
Former-commit-id: d02529fef4
Former-commit-id: b1cec7b0617c7b5f5c46fade03d4b59fd4aeb442 [formerly d133454b27]
Former-commit-id: b41e5f2415
|
2012-02-20 12:54:25 -06:00 |
|
Steve Harris
|
c9a7ff42f4
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: d129eab241 [formerly c268da57bc] [formerly 4b76d22f77] [formerly cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]
Former-commit-id: cc66c8be24
Former-commit-id: 892342d6ba506e3495ef7df3355174001fd47f5a [formerly 54b5b6baef]
Former-commit-id: dd911bed4d
|
2012-02-20 12:43:38 -06:00 |
|
Steve Harris
|
07f2cb3a81
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: f3cee62470 [formerly e3535054ff] [formerly 62c587b841] [formerly c825bd03a2 [formerly 62c587b841 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]]
Former-commit-id: c825bd03a2
Former-commit-id: 84a9ca92db5e27c27139e506edd8d80314f58cf7 [formerly 0fab56e0f1]
Former-commit-id: b609a6fd60
|
2012-02-20 07:49:13 -06:00 |
|
Bryan Kowal
|
e326a29d2f
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly 682c10767d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]
Former-commit-id: 682c10767d
Former-commit-id: a057be46f691d8ed25cfea1a37709fd22cddecd5 [formerly 2ba23624b4]
Former-commit-id: cc8c6597a2
|
2012-02-17 12:17:14 -06:00 |
|
Bryan Kowal
|
2d6d83c3d8
|
Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
Former-commit-id: 75c8f18793 [formerly d4b76c1057] [formerly 4276fc2fe8] [formerly 9f1b7a613a [formerly 4276fc2fe8 [formerly 1ec51accade835c1133eac9222131f9186985053]]]
Former-commit-id: 9f1b7a613a
Former-commit-id: 25079234f2afb61c81441d4fa189a886bdbf5294 [formerly 38ccaf882b]
Former-commit-id: 8a71854fe1
|
2012-02-17 11:09:13 -06:00 |
|
Steve Harris
|
43c3cfdd1a
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]
Former-commit-id: 1ac6b36d1f
|
2012-02-17 10:55:02 -06:00 |
|
Ben Steffensmeier
|
44cf04ab3c
|
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: be6c430985 [formerly 38993f5a5a] [formerly 26d82729c9] [formerly 3e3e4bd4e3 [formerly 26d82729c9 [formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]]]
Former-commit-id: 3e3e4bd4e3
Former-commit-id: 352ec371eefbdee61fc6971ec28eadecfb26a5b4 [formerly d4e7df98a9]
Former-commit-id: ea93dcd939
|
2012-02-16 16:36:56 -06:00 |
|