Steve Harris
|
3c8ac339bb
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: 2f8260ccbc [formerly 07ac42866c] [formerly c502603907] [formerly 2f8260ccbc [formerly 07ac42866c] [formerly c502603907] [formerly ecb38ba165 [formerly c502603907 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]]
Former-commit-id: ecb38ba165
Former-commit-id: 9397ca10a8 [formerly d83100c3df] [formerly 7430208f5d1e69b088b0ad09205b10f1007182e4 [formerly a9b900821a]]
Former-commit-id: 45ca1834b3349431a2e9329f63d92b5396d451f6 [formerly 32fa2a28c5]
Former-commit-id: 3433a1e31c
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
587c928f4e
|
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 0be3703c7e [formerly 4981170462] [formerly dcadf7baa4] [formerly 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]]
Former-commit-id: 86e586befe
Former-commit-id: fbb5de922a [formerly 4eb1ef5b0f] [formerly 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c]]
Former-commit-id: a02575690595cf7dbca41fcc8e53a47ab455d3ac [formerly 2c958713b6]
Former-commit-id: 93d99ca49c
|
2012-02-23 12:38:55 -06:00 |
|
Nate Jensen
|
cc42feebbd
|
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 b07575c5b3 [formerly a914aa38c8] [formerly e3e44707a4] [formerly fef3fcb60c [formerly e3e44707a4 [formerly fd448c2a996aef215802dc501b68d28747f66414]]]]
Former-commit-id: fef3fcb60c
Former-commit-id: 2db5dbe305 [formerly e0e2a82d83] [formerly 834f82bd59e01c6c99532d9991840fdacffe244d [formerly d03ff9824e]]
Former-commit-id: 00d9274cb54bfd12a616a71999f8fb9951113a37 [formerly 57c46aa9e1]
Former-commit-id: a9a165f471
|
2012-02-23 11:50:39 -06:00 |
|
Ben Steffensmeier
|
33bb5f50fd
|
Issue #176 update merged ncep plot classes to use new plot interface.
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 41ca3213a4 [formerly 0b0047e29d] [formerly 703d59a968] [formerly 41ca3213a4 [formerly 0b0047e29d] [formerly 703d59a968] [formerly 03d9230879 [formerly 703d59a968 [formerly 2e22a794183e4be8758997b9e76f896917a761db]]]]
Former-commit-id: 03d9230879
Former-commit-id: d1b9b4bc84 [formerly f048713c31] [formerly 892ee6361f74622da1f7045e0847bcce6026e627 [formerly 6db9a03560]]
Former-commit-id: f17f8d23418b7553936aaabe763a4b5f33f8092d [formerly af545548a1]
Former-commit-id: c77d5e6d98
|
2012-02-23 11:23:01 -06:00 |
|
Ben Steffensmeier
|
bfd03c9f39
|
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: 127dde9454 [formerly a2db6975c9] [formerly 4dedc8b30d] [formerly 127dde9454 [formerly a2db6975c9] [formerly 4dedc8b30d] [formerly 73a08e9d4e [formerly 4dedc8b30d [formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]]]]
Former-commit-id: 73a08e9d4e
Former-commit-id: 3f86d825d5 [formerly d937284ab2] [formerly 57785c3dff7f653eb1377659f11622f20ae35a74 [formerly d5d8697d9f]]
Former-commit-id: adb5a54a3ea8bfa8ae225932cb273046e74cfa00 [formerly 92962fdd2c]
Former-commit-id: 70cf1d2ad5
|
2012-02-23 10:49:56 -06:00 |
|
Steve Harris
|
39932e885a
|
Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: 40fee93b99 [formerly 9588895c2d] [formerly 2d25ee9414] [formerly 40fee93b99 [formerly 9588895c2d] [formerly 2d25ee9414] [formerly 19cf09274c [formerly 2d25ee9414 [formerly a1b82aa2367ca506175ab0fec425c9e633ce949f]]]]
Former-commit-id: 19cf09274c
Former-commit-id: 91e382233d [formerly b297f21344] [formerly 8fb7fd39b6a6c047b2867b19a4f0a225371f7b42 [formerly 8afdef6680]]
Former-commit-id: 4b447a105af71de80a9c536a3995a6d38087d347 [formerly 24e057e722]
Former-commit-id: c65a7faf1b
|
2012-02-23 10:28:19 -06:00 |
|
Steve Harris
|
5eee48b9d4
|
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 ed66d12d24 [formerly c0c0acfbe8] [formerly 957d232286] [formerly a82f2c5750 [formerly 957d232286 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]]]
Former-commit-id: a82f2c5750
Former-commit-id: d1589bf5e5 [formerly 43b83ed8aa] [formerly 252271566acafedef77dcd075974af95164c1987 [formerly e6c3afa7a2]]
Former-commit-id: c518b10c39dfc70213090f622cc6866c1ea80878 [formerly 7f8343833e]
Former-commit-id: fd5ed23eb3
|
2012-02-23 10:19:54 -06:00 |
|
Steve Harris
|
e5abab44f9
|
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
Former-commit-id: 909a19606c [formerly a5f8708b6a] [formerly db065fcd50] [formerly 909a19606c [formerly a5f8708b6a] [formerly db065fcd50] [formerly e94b322dc3 [formerly db065fcd50 [formerly 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb]]]]
Former-commit-id: e94b322dc3
Former-commit-id: 391451e14b [formerly 97184f1dc4] [formerly e5d89cf4f3149ec572a32c84f492bd3f9f2178c4 [formerly 78ea2de6d3]]
Former-commit-id: 61136e5cc83b2f18a1627288324c6504321d3572 [formerly 91ffb88ac7]
Former-commit-id: 321a11e44c
|
2012-02-23 10:16:02 -06:00 |
|
Steve Harris
|
43ff909553
|
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 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be [formerly 92b7072b82] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012]
Former-commit-id: 3aef320ffd
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
2fcfdd3353
|
Merge branch 'OB12.2.1_test' into ss_sync
Former-commit-id: 5fcd6629dc [formerly 7966ab9369] [formerly 6f7f678590] [formerly 5fcd6629dc [formerly 7966ab9369] [formerly 6f7f678590] [formerly 830038b0c6 [formerly 6f7f678590 [formerly 76967f2151dcfb275be389c04060ff34be4a5018]]]]
Former-commit-id: 830038b0c6
Former-commit-id: b3031c14d9 [formerly 1954443885] [formerly bde9de0656d064c2040558e807738aec3e5cb5a5 [formerly 5f6715ed05]]
Former-commit-id: 078a662dce77310f2032feca8c4c594b1a6bc52d [formerly 3611ed97ca]
Former-commit-id: 25167bb0eb
|
2012-02-23 07:53:15 -06:00 |
|
Ben Steffensmeier
|
1ab0935d7e
|
Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 13ecc7e4ea [formerly b776d953d7] [formerly 06c9d4cdcf] [formerly 13ecc7e4ea [formerly b776d953d7] [formerly 06c9d4cdcf] [formerly 55aa66a510 [formerly 06c9d4cdcf [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]]]
Former-commit-id: 55aa66a510
Former-commit-id: e99e823ca8 [formerly c3d3142bab] [formerly caf20037931a8dff74e314931dddc204682bcdf7 [formerly 5d6b036ed7]]
Former-commit-id: 6fee95c5b888e0fa8f9b2d7a97de873918e1fe3b [formerly 8f34946969]
Former-commit-id: 16d205ce9d
|
2012-02-22 17:40:48 -06:00 |
|
Bryan Kowal
|
4c381c8094
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 22bea830e7 [formerly 0f02d05283] [formerly 9a63901c0e] [formerly 22bea830e7 [formerly 0f02d05283] [formerly 9a63901c0e] [formerly cd35220cf7 [formerly 9a63901c0e [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]]]]
Former-commit-id: cd35220cf7
Former-commit-id: 1401b352aa [formerly 53f4674f25] [formerly 92a815e7a7ec0656dd9e267ce64094f37042e075 [formerly 5ca7ce8373]]
Former-commit-id: b9e5c8321af1fbbbb0cf4f4ce3529fe05a1805c8 [formerly 012661cc90]
Former-commit-id: 27d2b69f2b
|
2012-02-22 17:07:15 -06:00 |
|
Steve Harris
|
56f114db87
|
creating OB12.2.1 from ss_sync for testing
Former-commit-id: aefccec0f4 [formerly 4ff546d3fd] [formerly a7b68a50be] [formerly aefccec0f4 [formerly 4ff546d3fd] [formerly a7b68a50be] [formerly 1fc25c6cb2 [formerly a7b68a50be [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]]]]
Former-commit-id: 1fc25c6cb2
Former-commit-id: bad18c25a8 [formerly 83618ae62b] [formerly f5447b76ca6821a52960c9806a09d4327000f174 [formerly aaf2fbd05b]]
Former-commit-id: 80f7200d8276f5e8c572ec095a9b1160a82f9e62 [formerly 5b11c36f19]
Former-commit-id: 6c53f2425f
|
2012-02-22 13:06:47 -06:00 |
|
Steve Harris
|
3a4af24369
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6 [formerly b55a488ed8] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc]
Former-commit-id: 978d22db50
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
5876e9cbd8
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]]
Former-commit-id: 9995d22e25
Former-commit-id: 139d42c594 [formerly 610fdf3f4e] [formerly dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]]
Former-commit-id: e696cc8d41ac682e234429cfacbb076d01f9bf39 [formerly 156ad8471d]
Former-commit-id: 01d72ca3c9
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
3f3299ecc9
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: aee8ef48fe [formerly 2c12c02910] [formerly 84926c80be] [formerly aee8ef48fe [formerly 2c12c02910] [formerly 84926c80be] [formerly f3fe839c1c [formerly 84926c80be [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]]]
Former-commit-id: f3fe839c1c
Former-commit-id: 0295f24df1 [formerly 968239217e] [formerly f0db7f39e4b09a4a991fc462354c2e91299cc7e0 [formerly 6d1b04e62c]]
Former-commit-id: 55a40f23e7eef8b7b541db51cc5f43dbd2a6486a [formerly a14d90ed4d]
Former-commit-id: a9cfeacc6b
|
2012-02-21 10:37:36 -06:00 |
|
Nate Jensen
|
5e8b286356
|
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 f17df86ba3 [formerly ba5b1ee03f] [formerly b90611d995] [formerly ec0cd8d086 [formerly b90611d995 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]]]
Former-commit-id: ec0cd8d086
Former-commit-id: 8dc1ff026f [formerly 2ee4305d77] [formerly 7bcacb16073573ba01393828f50c6e24f05ad1a2 [formerly 13ea11ddfc]]
Former-commit-id: d35beb3e9eb86a05ce74f17d71f4a87fbd877d46 [formerly f92be47f79]
Former-commit-id: 0d56994428
|
2012-02-21 08:57:12 -06:00 |
|
Steve Harris
|
18e4d484d9
|
Merge branch 'ss_sync'
Former-commit-id: 567a30dc74 [formerly de7a3491fa] [formerly 7be1fb41ea] [formerly 567a30dc74 [formerly de7a3491fa] [formerly 7be1fb41ea] [formerly 4e1def89e7 [formerly 7be1fb41ea [formerly b1c075b5f5af7df5058a409622a59b7d13b36416]]]]
Former-commit-id: 4e1def89e7
Former-commit-id: b6b15d8f96 [formerly c2683ac759] [formerly 8848192c36eea795874bed1406108b0e05ed5abf [formerly b2965389c7]]
Former-commit-id: 40e35ac6229dceca5d279f4b97a4cf743bc3cba5 [formerly c40f342dbe]
Former-commit-id: cfea5008c1
|
2012-02-20 16:51:00 -06:00 |
|
Ben Steffensmeier
|
3db83d5483
|
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 1c1500408b [formerly 27973ec694] [formerly 69e8cde115] [formerly 73d24fad2f [formerly 69e8cde115 [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]]]
Former-commit-id: 73d24fad2f
Former-commit-id: ab464fde3e [formerly 0ee68fb6cc] [formerly 2e661e9d7cba71c6da9333bda034d1523204696a [formerly dcbe4fc7da]]
Former-commit-id: 7ea333df81161d3c9921a921c48714ab475fa9aa [formerly f949f622dd]
Former-commit-id: f934ade63a
|
2012-02-20 15:28:20 -06:00 |
|
Steve Harris
|
53c3c095c6
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c69eb6d93d [formerly ef21df5086] [formerly 07bf1f770d] [formerly c69eb6d93d [formerly ef21df5086] [formerly 07bf1f770d] [formerly ebf5e8360e [formerly 07bf1f770d [formerly 80817ea48545c3315d8445c9acae60b6c92088f7]]]]
Former-commit-id: ebf5e8360e
Former-commit-id: 37bb0ba95d [formerly 2ffbfd0181] [formerly e89cc2471d046b992aa36e77f1042ebf13c884a0 [formerly 5bc52de24a]]
Former-commit-id: 5b08ed58293cc7d32a46c0cd4ee746eccdf2d9db [formerly 06fd623597]
Former-commit-id: 161bc7ddc8
|
2012-02-20 13:04:10 -06:00 |
|
Steve Harris
|
f0c1c03fff
|
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 eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 2e0f1d3ecc [formerly b12f5e5d75] [formerly a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960]]
Former-commit-id: f7595a0be89f8ab41c20c0d16d038e5e650e4712 [formerly acd7845ebd]
Former-commit-id: bcccffbaa4
|
2012-02-20 13:03:39 -06:00 |
|
Steve Harris
|
2acea8b7d5
|
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly d02529fef4 [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]]
Former-commit-id: d02529fef4
Former-commit-id: 4ffbe4780e [formerly b41e5f2415] [formerly b1cec7b0617c7b5f5c46fade03d4b59fd4aeb442 [formerly d133454b27]]
Former-commit-id: 1d157738e844ae1be12f9b1669c8101f16df9737 [formerly d9c8a99210]
Former-commit-id: d3c80a1557
|
2012-02-20 12:54:25 -06:00 |
|
Steve Harris
|
33aafe9ce0
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: d129eab241 [formerly c268da57bc] [formerly 4b76d22f77] [formerly d129eab241 [formerly c268da57bc] [formerly 4b76d22f77] [formerly cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]]
Former-commit-id: cc66c8be24
Former-commit-id: c9a7ff42f4 [formerly dd911bed4d] [formerly 892342d6ba506e3495ef7df3355174001fd47f5a [formerly 54b5b6baef]]
Former-commit-id: 589ae505ef0a6ce52a577fd189d1c8eec012a6bd [formerly 09b81c6e00]
Former-commit-id: 60bf5aeced
|
2012-02-20 12:43:38 -06:00 |
|
Steve Harris
|
b19d2a7103
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: f3cee62470 [formerly e3535054ff] [formerly 62c587b841] [formerly f3cee62470 [formerly e3535054ff] [formerly 62c587b841] [formerly c825bd03a2 [formerly 62c587b841 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]]]
Former-commit-id: c825bd03a2
Former-commit-id: 07f2cb3a81 [formerly b609a6fd60] [formerly 84a9ca92db5e27c27139e506edd8d80314f58cf7 [formerly 0fab56e0f1]]
Former-commit-id: 791c66fd6faa00ee56fdc3d955b64d47cef51e34 [formerly f265cb965d]
Former-commit-id: 41571066d5
|
2012-02-20 07:49:13 -06:00 |
|
Bryan Kowal
|
3476936eac
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly eda0f92b17 [formerly 5754f9dfd8] [formerly 10a0ca252d] [formerly 682c10767d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]]
Former-commit-id: 682c10767d
Former-commit-id: e326a29d2f [formerly cc8c6597a2] [formerly a057be46f691d8ed25cfea1a37709fd22cddecd5 [formerly 2ba23624b4]]
Former-commit-id: 177408d3d8058b38f3b908359601d7498ff2db8c [formerly 8403801a2b]
Former-commit-id: ce9165ce58
|
2012-02-17 12:17:14 -06:00 |
|
Bryan Kowal
|
3ceb2b3d98
|
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 75c8f18793 [formerly d4b76c1057] [formerly 4276fc2fe8] [formerly 9f1b7a613a [formerly 4276fc2fe8 [formerly 1ec51accade835c1133eac9222131f9186985053]]]]
Former-commit-id: 9f1b7a613a
Former-commit-id: 2d6d83c3d8 [formerly 8a71854fe1] [formerly 25079234f2afb61c81441d4fa189a886bdbf5294 [formerly 38ccaf882b]]
Former-commit-id: 4f7f773ad8b61332e18e2736ed81b17d4a07cf05 [formerly 2fefca4860]
Former-commit-id: 9db8b4f405
|
2012-02-17 11:09:13 -06:00 |
|
Steve Harris
|
8c9e581f41
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]
Former-commit-id: b137302802
Former-commit-id: 43c3cfdd1a [formerly 1ac6b36d1f] [formerly eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]]
Former-commit-id: f9b44e61385fcc409fa97cc2681f13c4a9c57a4a [formerly 895404abeb]
Former-commit-id: 9a09879521
|
2012-02-17 10:55:02 -06:00 |
|
Ben Steffensmeier
|
455537fa9f
|
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 be6c430985 [formerly 38993f5a5a] [formerly 26d82729c9] [formerly 3e3e4bd4e3 [formerly 26d82729c9 [formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]]]]
Former-commit-id: 3e3e4bd4e3
Former-commit-id: 44cf04ab3c [formerly ea93dcd939] [formerly 352ec371eefbdee61fc6971ec28eadecfb26a5b4 [formerly d4e7df98a9]]
Former-commit-id: 5159ce4d957b2c026dd58d2bc6e3b0b3711f002c [formerly c286cb0406]
Former-commit-id: b648274e36
|
2012-02-16 16:36:56 -06:00 |
|
Steve Harris
|
932615c8fe
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: dc6e74757a [formerly c26a22cfb7] [formerly e2989d1a9f] [formerly dc6e74757a [formerly c26a22cfb7] [formerly e2989d1a9f] [formerly 64ddef69b6 [formerly e2989d1a9f [formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]]]]
Former-commit-id: 64ddef69b6
Former-commit-id: 1355f55290 [formerly 840c858697] [formerly 2f9c0de46ffed17da8fa4729621963717c0e2d99 [formerly ff45f4eaab]]
Former-commit-id: ed90a7142e2de19c644f80a8f5b8f4e0ce41ae21 [formerly c2cf0253bf]
Former-commit-id: caa8a19335
|
2012-02-16 14:23:01 -06:00 |
|
Nate Jensen
|
f2dea074e9
|
Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
Former-commit-id: 109331a15c [formerly c20df8b229] [formerly bdb08a9f4c] [formerly 109331a15c [formerly c20df8b229] [formerly bdb08a9f4c] [formerly 642ad4e9b0 [formerly bdb08a9f4c [formerly 712f278a25a67d3d05375213b4d5bc8e7743aaa9]]]]
Former-commit-id: 642ad4e9b0
Former-commit-id: 3651644d8f [formerly 9a8dd201c5] [formerly 339bb8ca3cdb079e62de828131caaaf1ef6523d3 [formerly 051e8faf55]]
Former-commit-id: da69b97efdf90ff4cca82a6a7a2b284d66a308bb [formerly f7767084b6]
Former-commit-id: f30073312c
|
2012-02-16 14:00:33 -06:00 |
|
Bryan Kowal
|
f1b84ddcb3
|
Issue #34 - recompiled the nsharp dll with the latest ncep code.
Former-commit-id: 573356d574 [formerly 2ce7c520b3] [formerly c8dba08a9d] [formerly 573356d574 [formerly 2ce7c520b3] [formerly c8dba08a9d] [formerly 4888756560 [formerly c8dba08a9d [formerly d3affc909e299af8826d16bc02754fc61754e287]]]]
Former-commit-id: 4888756560
Former-commit-id: 134afd329c [formerly e4da2bcb9c] [formerly 5a1a83e71fb5f2c49f093b157a87cfb844467487 [formerly 71fe94b322]]
Former-commit-id: 5960cb8e5313e1a831d1915b387f34e4aa93edfb [formerly 82513080ba]
Former-commit-id: 6d311633c4
|
2012-02-16 12:51:24 -06:00 |
|
Ben Steffensmeier
|
4d960d6261
|
Issue #343 remove extra perspectives when in thinclient component
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 7abc89a7d0 [formerly 0104e1970d] [formerly 28c7e6bc22] [formerly 7abc89a7d0 [formerly 0104e1970d] [formerly 28c7e6bc22] [formerly 8cf7360e3b [formerly 28c7e6bc22 [formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]]]]
Former-commit-id: 8cf7360e3b
Former-commit-id: e55c51da39 [formerly 7de650c868] [formerly 47e1a23d52597de86c39cbd5e06efa8089017300 [formerly b819bfa8e9]]
Former-commit-id: ba35786f01f5e56983fe326c0eb54f4861fd6e7e [formerly 1aff4d27fb]
Former-commit-id: 2d4d4faf20
|
2012-02-15 17:10:34 -06:00 |
|
Steve Harris
|
13b1dba3d5
|
Merge commit 'awips2_OB12.1.1_Omaha'
Former-commit-id: 5f426ccb14 [formerly 296ce23f5f] [formerly 2783331dd6] [formerly 5f426ccb14 [formerly 296ce23f5f] [formerly 2783331dd6] [formerly 1909537682 [formerly 2783331dd6 [formerly b1bce76fd8170d05e57624f969e5293c1257c533]]]]
Former-commit-id: 1909537682
Former-commit-id: 36a615049d [formerly a2850d9280] [formerly 3b04f9f590255ace34c5aade287db4c7510fb51d [formerly 3c3eebfd0e]]
Former-commit-id: bd4612f0d8fb05e1f7b6f6536302aefd7b3b5870 [formerly 1771876628]
Former-commit-id: de048d100b
|
2012-02-15 15:45:23 -06:00 |
|
Steve Harris
|
11f597481d
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: ac26c9d9ae [formerly 5e2b2ddc22] [formerly 64b3ba9d2b] [formerly ac26c9d9ae [formerly 5e2b2ddc22] [formerly 64b3ba9d2b] [formerly 09c3e613e5 [formerly 64b3ba9d2b [formerly 7b981a7bb3e35d9147bf686150e5ed91e5b22d79]]]]
Former-commit-id: 09c3e613e5
Former-commit-id: 1686090144 [formerly 96c7c9acf8] [formerly cfc5438adc1051f01ac8180e4c6d18bc5fd2d549 [formerly 17c9ad4c0c]]
Former-commit-id: 341476721d3464a38fccfcc6370ec8f55aac1415 [formerly 69dec3a5fa]
Former-commit-id: 980a8569a1
|
2012-02-15 15:09:30 -06:00 |
|
Steve Harris
|
8f7d54c268
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: d64ae288ba [formerly 68a5ebc0ad] [formerly 272ba87883] [formerly d64ae288ba [formerly 68a5ebc0ad] [formerly 272ba87883] [formerly c1129dbd00 [formerly 272ba87883 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]]]]
Former-commit-id: c1129dbd00
Former-commit-id: f926b7f573 [formerly 4e6af98f5b] [formerly 068b8034ffb61386ed780cd0fe93c987c1459c31 [formerly ad402655f4]]
Former-commit-id: c549fbf0699e92ca57699732d6da0499379d0cdf [formerly c74ded15b9]
Former-commit-id: 8e09b816da
|
2012-02-15 15:08:58 -06:00 |
|
Steve Harris
|
f1abad69fd
|
Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client
Conflicts:
msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif
msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_
nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_
Chose to keep in 4-Thin_Client
Former-commit-id: 6d3d1066eb [formerly 221a02882a] [formerly b9f4780fcb] [formerly 6d3d1066eb [formerly 221a02882a] [formerly b9f4780fcb] [formerly 23cc9689de [formerly b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]]]
Former-commit-id: 23cc9689de
Former-commit-id: f3d32f34ce [formerly a85a777232] [formerly 601b02191762801f860cf28b52a200c6e003e7ea [formerly a2e3aabc60]]
Former-commit-id: 14ed1eaa2666eb1db1b97a732045d1fc5b864aba [formerly b2999a6d59]
Former-commit-id: 3598fb2fcd
|
2012-02-15 14:39:43 -06:00 |
|
Steve Harris
|
6618009c1d
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: c4ced8af2d [formerly 6aed9311a8] [formerly 7356d655da] [formerly c4ced8af2d [formerly 6aed9311a8] [formerly 7356d655da] [formerly 1707b98721 [formerly 7356d655da [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]]]
Former-commit-id: 1707b98721
Former-commit-id: 89aae82ed1 [formerly de85613a99] [formerly 93362db30561096d2866d511737a68309011a825 [formerly db1e3b1215]]
Former-commit-id: eb4d2045ca82ab5ff3c3501bed0d3d8a2c55bbbf [formerly a1462275f7]
Former-commit-id: 604b6c1f10
|
2012-02-15 14:34:47 -06:00 |
|
Steve Harris
|
a385a3da90
|
Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
Former-commit-id: 6ccbe6143e [formerly d84f7061f7] [formerly 05c0347d90] [formerly 6ccbe6143e [formerly d84f7061f7] [formerly 05c0347d90] [formerly 86a0e3f5ee [formerly 05c0347d90 [formerly f83e2bd22a74e9604fb878a899d9a2df5fbb28eb]]]]
Former-commit-id: 86a0e3f5ee
Former-commit-id: 610d3c3281 [formerly 780b0c9592] [formerly 8e8b60aed5cf4bf70bed43175774d14a20e6ad8f [formerly 72466ef0ca]]
Former-commit-id: f65620a268d9a481acfedfb18facefd34db84bec [formerly 28471f8e94]
Former-commit-id: 4efa9fcbc3
|
2012-02-15 14:26:22 -06:00 |
|
Steve Harris
|
44fcb44d45
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: e21fc62dd9 [formerly 74c156e508] [formerly 5e47f8c33a] [formerly e21fc62dd9 [formerly 74c156e508] [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly 5e47f8c33a [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]]]
Former-commit-id: a91b01bfbe
Former-commit-id: 1d02286ab1 [formerly 98b223d08e] [formerly 4e98d4f2cb2afa20c737603123503ba7a42a68ea [formerly 39b13d7102]]
Former-commit-id: 202ae427973d5fcd9dad1196212f733362bbbc31 [formerly ad1f608967]
Former-commit-id: 79698247d7
|
2012-02-15 12:54:54 -06:00 |
|
Bryan Kowal
|
f4fb4ad7b9
|
Issue #243 - it is now possible to build meteolib on Windows; meteolib, jep, and gridslice are now all built using MSBuild when built from the command line.
Former-commit-id: 7b5b643d18 [formerly 2fabaff1d9] [formerly 38eb4bd2b6] [formerly 7b5b643d18 [formerly 2fabaff1d9] [formerly 38eb4bd2b6] [formerly 521756e57e [formerly 38eb4bd2b6 [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]]]
Former-commit-id: 521756e57e
Former-commit-id: 83ba57dcd1 [formerly 134b8f2915] [formerly 66ae2354057f0c9b76ece5f6ef014f53d118b46b [formerly 1c023403e2]]
Former-commit-id: 588279ad4f4dbf9fd1f3f78ffb920ff7bc7e9ca6 [formerly e19d034858]
Former-commit-id: b59b0ef8d5
|
2012-02-15 10:31:58 -06:00 |
|
Steve Harris
|
95e6601959
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c2a47087ce [formerly 46dda7b8bd] [formerly 2119a1513e] [formerly c2a47087ce [formerly 46dda7b8bd] [formerly 2119a1513e] [formerly 2e29bc8ee2 [formerly 2119a1513e [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: 1d529a0d83 [formerly d23d12d596] [formerly 1e32c15008441ec81c586e6dfaf0f8d5acded476 [formerly cb3371ee28]]
Former-commit-id: 18d1f5125e904eb011450ccd159a15fe5f2fe0e0 [formerly dc9df63a11]
Former-commit-id: 0d9992da14
|
2012-02-14 15:54:46 -06:00 |
|
Steve Harris
|
6f48e89574
|
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: f463be9da5 [formerly 7911304736] [formerly 7a28b5ea62] [formerly f463be9da5 [formerly 7911304736] [formerly 7a28b5ea62] [formerly 708348e9e4 [formerly 7a28b5ea62 [formerly 70f1516d0cc4dcd62214453974f1e65dd57d1ddd]]]]
Former-commit-id: 708348e9e4
Former-commit-id: a895813d3a [formerly 77d083d6fa] [formerly 5826b08681c06dd9a36d323cf17835ec37871196 [formerly 6c719e6fc2]]
Former-commit-id: 71e2475b910a4506c36e9e02d7a8d1a73f5b55c1 [formerly e3832b4054]
Former-commit-id: f37bc7d5e5
|
2012-02-14 15:47:32 -06:00 |
|
Ben Steffensmeier
|
be33534dea
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2
Former-commit-id: 2edb2afe04 [formerly 808846e237] [formerly 944e59e989] [formerly 2edb2afe04 [formerly 808846e237] [formerly 944e59e989] [formerly f65d86a06a [formerly 944e59e989 [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]]]
Former-commit-id: f65d86a06a
Former-commit-id: 6212d0efc7 [formerly 993f2aafa4] [formerly 2203a419ff9c3a59fd6802a9ac886bf01d7ca8c3 [formerly d00572c122]]
Former-commit-id: 0c58fbd21f81bc1efc1a1672d07433fa637d3c8d [formerly 800e674078]
Former-commit-id: 16b7863b52
|
2012-02-14 15:46:11 -06:00 |
|
Steve Harris
|
49cf48f2f9
|
Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
Former-commit-id: d747dd7016 [formerly 1d7daf3576] [formerly 3973ed2360] [formerly d747dd7016 [formerly 1d7daf3576] [formerly 3973ed2360] [formerly 376650ce9d [formerly 3973ed2360 [formerly e8e020e3bd86ffcd918366990d605acee8bd6a80]]]]
Former-commit-id: 376650ce9d
Former-commit-id: a2ae81561b [formerly 0b936af499] [formerly 6b9f09121d1469ace6cd86318982ba8b3b4c8a9e [formerly b847ef442c]]
Former-commit-id: 02c3cb688a81ae1b5f6d48689287d6af78b074fe [formerly 2a2bffa947]
Former-commit-id: 06ccb964ed
|
2012-02-14 15:41:54 -06:00 |
|
Ben Steffensmeier
|
dd1d44dbed
|
Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce
Former-commit-id: 87ed849204 [formerly 8561802d14] [formerly 97000f0738] [formerly 87ed849204 [formerly 8561802d14] [formerly 97000f0738] [formerly b080ab8f6c [formerly 97000f0738 [formerly 78deeca92b5916c7c57b1f866e9be2e11992c13d]]]]
Former-commit-id: b080ab8f6c
Former-commit-id: 115dc013be [formerly ed952e100a] [formerly 43bb05a38b4a658b5e2ee103697e6e0f0544c373 [formerly 2e49f3b6aa]]
Former-commit-id: 20016d719e8b3dd701b7cadca444407b5043646e [formerly cc173f99d2]
Former-commit-id: ff9c887e7e
|
2012-02-14 15:39:50 -06:00 |
|
Nate Jensen
|
1f22deaddf
|
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 38438625c2 [formerly 27c3458b5e] [formerly daeda3f898] [formerly 38438625c2 [formerly 27c3458b5e] [formerly daeda3f898] [formerly dd7d200f7f [formerly daeda3f898 [formerly 1135f27699b49795352ae5b1b31ac9fe06c564b6]]]]
Former-commit-id: dd7d200f7f
Former-commit-id: 0e1fb8c214 [formerly b0819f7828] [formerly d2f8851d381d2c70d4f5b4fab63ef914894d279e [formerly c49691bc7b]]
Former-commit-id: e7a6cdda4ec2f6f9c7a7a0b95034a3025042c3f2 [formerly 18671bb3e6]
Former-commit-id: 11fa731db5
|
2012-02-14 13:06:27 -06:00 |
|
Ben Steffensmeier
|
5c42485acd
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: 0c8da60976 [formerly e2141b574e] [formerly 100b4c4ba0] [formerly 0c8da60976 [formerly e2141b574e] [formerly 100b4c4ba0] [formerly 2995d2b29b [formerly 100b4c4ba0 [formerly 32b8f723ebf64d97636705911c0b7b22a9cd2148]]]]
Former-commit-id: 2995d2b29b
Former-commit-id: 52353717ec [formerly 132f023a06] [formerly bb0cc9e70a0e959720588a30e73d2981fdded634 [formerly 7914496c96]]
Former-commit-id: 488657067522f2c7ac803b59a89335c66054d318 [formerly a8b2e65a7c]
Former-commit-id: 4d0ddd50dc
|
2012-02-14 12:59:42 -06:00 |
|
Greg Armendariz
|
4fff7ed609
|
Merge "Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console." into 4-Thin_Client
Former-commit-id: e28d01f426 [formerly fd72f98fc2] [formerly cb16a5256a] [formerly e28d01f426 [formerly fd72f98fc2] [formerly cb16a5256a] [formerly e3dda29720 [formerly cb16a5256a [formerly 41ed9251ca6ef83a6de3362c52acaa21dd00da3d]]]]
Former-commit-id: e3dda29720
Former-commit-id: ba02161771 [formerly 22b4dd70e8] [formerly a0d352ef1737c4ac48d359c88a9d7bbac504be92 [formerly 7ce17e1234]]
Former-commit-id: f18e9d268667c2eb9967c62455c1c38d4b83b2c8 [formerly 0793dc0853]
Former-commit-id: 8f60b4364b
|
2012-02-13 15:02:29 -06:00 |
|
Bryan Kowal
|
4cd41c4137
|
Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console.
Former-commit-id: 02c48be369 [formerly c78e988d55] [formerly 67562b0674] [formerly 02c48be369 [formerly c78e988d55] [formerly 67562b0674] [formerly 4faf9831ed [formerly 67562b0674 [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]]]
Former-commit-id: 4faf9831ed
Former-commit-id: 2e2b3b4869 [formerly 0bf4fecb62] [formerly e75d6befa5289852fa8cf3ebd7ce2bc1848f4f41 [formerly eb91bb964e]]
Former-commit-id: e2850a17d1b816139542eb5da9c6e23e34013580 [formerly 0978aa5d1d]
Former-commit-id: 4ccdc365e1
|
2012-02-13 13:57:10 -06:00 |
|
Nate Jensen
|
dc20148e28
|
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
Former-commit-id: b95dd7bc43 [formerly 364cd8f5fc] [formerly da7d13d933] [formerly b95dd7bc43 [formerly 364cd8f5fc] [formerly da7d13d933] [formerly 06327646d9 [formerly da7d13d933 [formerly ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9]]]]
Former-commit-id: 06327646d9
Former-commit-id: fd5eb06abf [formerly ce7e58062c] [formerly bc709c1847d2b067f7c218676ccb865beb2e58fe [formerly dd8500b081]]
Former-commit-id: 7d7e38ad92d21783c8847618ac1ba771783e1fe8 [formerly ab4ab01dd4]
Former-commit-id: 9fb2590b25
|
2012-02-13 11:40:36 -06:00 |
|