Ben Steffensmeier
|
94770ece64
|
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 5395e71757 [formerly aa90109f45] [formerly 49cce84edf] [formerly 7c2409eab0 [formerly 49cce84edf [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]]
Former-commit-id: 7c2409eab0
Former-commit-id: 6ec01d1d19 [formerly f8c2ad7136] [formerly 691ebf923ce51c7c2978a0c30511852ac7042b3c [formerly 3220ee4745]]
Former-commit-id: b51eb6e37b89c7532969074ffcbece5003a934be [formerly e0ad3aee33]
Former-commit-id: 4e0ec11a6f
|
2012-03-01 12:44:43 -06:00 |
|
David Gillingham
|
ac4ffd696c
|
Issue #20: Fix breakage to alertViz caused by changes to
FileUtil.join().
Former-commit-id: 33b41f1b0e [formerly 6a2b7e12d6] [formerly c6803ba434] [formerly 33b41f1b0e [formerly 6a2b7e12d6] [formerly c6803ba434] [formerly 8a45f1f4c3 [formerly c6803ba434 [formerly 8832c64ba47f87027d5215caf7d84b9fc6a187cd]]]]
Former-commit-id: 8a45f1f4c3
Former-commit-id: d5779b3101 [formerly 234801c998] [formerly 2791eec232ac17fe9ced7b27957c3b17a5fe3742 [formerly 953f8a6535]]
Former-commit-id: 3e1e2877c3fb4b37bf9840c3ddda1c204a84b956 [formerly ad5601c5ec]
Former-commit-id: 1d48986042
|
2012-03-01 11:19:22 -06:00 |
|
Steve Harris
|
a92abefb52
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 27fb50d455 [formerly 98d1fbeb0e] [formerly 703cb6e748] [formerly 27fb50d455 [formerly 98d1fbeb0e] [formerly 703cb6e748] [formerly dd52eb4d40 [formerly 703cb6e748 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]]
Former-commit-id: dd52eb4d40
Former-commit-id: f5db44b7aa [formerly 3e4d618486] [formerly fe7d53e8a206e849dc25fe40d0bef8cfe7ab3606 [formerly 06baad5169]]
Former-commit-id: eee203cb31afb34d2d81e92c3211de866f2b3b6f [formerly a4d8f58c90]
Former-commit-id: 3306848158
|
2012-02-29 16:08:39 -06:00 |
|
Ben Steffensmeier
|
029c938b45
|
Issue #353 add logic to syncronize times for thin client data updates..
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]]
Former-commit-id: c61e40c426
Former-commit-id: cc8e7897cf [formerly 390700efb0] [formerly bc3ac83b421a21ffdbc670c12096f7c96ca7c87f [formerly 84e6c9beb8]]
Former-commit-id: d164073f91d0b2a6b493c5bba3ad3cafd728023d [formerly 588432f980]
Former-commit-id: da7275d80b
|
2012-02-29 15:49:47 -06:00 |
|
Bryan Kowal
|
57fae78242
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 4ba738041e [formerly 861ca25a4e] [formerly 47230422ce] [formerly 4ba738041e [formerly 861ca25a4e] [formerly 47230422ce] [formerly 94d6af30f0 [formerly 47230422ce [formerly 8b2a29b3f76fc10ccb6ee2ee5401aa4dc2cab74c]]]]
Former-commit-id: 94d6af30f0
Former-commit-id: dc2253dc9b [formerly 421c425047] [formerly 7b911aa542fe20d21eca67fd282d200dd07394b8 [formerly ca62eb90f3]]
Former-commit-id: 5807436789894a1befc6bbae966b4c36f4b85c8c [formerly e23844d671]
Former-commit-id: e3f992a525
|
2012-02-29 12:43:46 -06:00 |
|
Ben Steffensmeier
|
70e6e0c580
|
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 7c3545170d [formerly 3713d7a181] [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly 5dee50e7e9 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]]
Former-commit-id: d7a63995f1
Former-commit-id: 1ac84dc230 [formerly dba810ddc4] [formerly 17cbace4358ff60cc55095422d0870a3cb6e704b [formerly e52c2ffb20]]
Former-commit-id: b1cbf0e1d3e7d64bdf7e7eb29373c28474ccbf6b [formerly 7d4367ee7a]
Former-commit-id: f668495c76
|
2012-02-28 15:20:37 -06:00 |
|
Steve Harris
|
da7d5d2a73
|
Merge branch 'ss_sync' (OB12.2.1) into 11-Collaboration
Former-commit-id: 640855a3ca [formerly 45e43fa592] [formerly 7817380140] [formerly 640855a3ca [formerly 45e43fa592] [formerly 7817380140] [formerly fb9896b8c9 [formerly 7817380140 [formerly a606419ccbf3cc1503cbe058af2264d0448b31af]]]]
Former-commit-id: fb9896b8c9
Former-commit-id: 8fe13dfa21 [formerly 1a6195da8b] [formerly 9916188028c6711811f02e5c842801697a68ada5 [formerly c1e626d256]]
Former-commit-id: 44091da63a83ed791af9af9b4b463976074e9aad [formerly 39b71d1960]
Former-commit-id: e567859e3b
|
2012-02-28 09:55:05 -06:00 |
|
Nate Jensen
|
4debf7bdc5
|
Integrating Richard's changes with 12.2.1
Change-Id: I774e69f166dbc48c7cb31d066cb8bf5dd626520c
Former-commit-id: 43538daf06 [formerly a22448c3d5] [formerly 2515d56c9f] [formerly 43538daf06 [formerly a22448c3d5] [formerly 2515d56c9f] [formerly c5ba181cd8 [formerly 2515d56c9f [formerly 50680111c00b8d2bec9f2479a0cc22380ef6ecfe]]]]
Former-commit-id: c5ba181cd8
Former-commit-id: 88d65bde01 [formerly 414785ee0e] [formerly 347bc2c5bd372e1a2607ac2c2f9145fdcbaf53d5 [formerly 699e417731]]
Former-commit-id: 549c960cf30cf415a3d73856fd0d5a52f67394f0 [formerly a0d01a57d0]
Former-commit-id: 25a134cc57
|
2012-02-28 09:42:47 -06:00 |
|
Nate Jensen
|
b7a2e728d1
|
Integrating Richard's changes with 12.2.1
Change-Id: I1831502d72bed7b804287bb7c3e4ea501514ada4
Former-commit-id: 8106ba956f [formerly 94ae63b740] [formerly d18a15535a] [formerly 8106ba956f [formerly 94ae63b740] [formerly d18a15535a] [formerly afe3c5db9c [formerly d18a15535a [formerly 729a478cf151a4d61bb31adba4193c3fc33717a1]]]]
Former-commit-id: afe3c5db9c
Former-commit-id: 87691e4627 [formerly a65f8d8242] [formerly 046f91bda3cc120bf473a4bc36c00fa19e038a47 [formerly 74b6e7b389]]
Former-commit-id: 55f7627291c0a0fe2ab80bcc8255fc4d7fd0191e [formerly 5c1aae46e1]
Former-commit-id: 8bf1058be3
|
2012-02-28 09:37:45 -06:00 |
|
Steve Harris
|
85d3d96d4c
|
Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 2dbdc945bf [formerly 73a337bc31] [formerly 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165]]
Former-commit-id: 9ad2c540c010a2b27f18bb9c98356065c7663bd2 [formerly 21f12bae82]
Former-commit-id: f8ae79c35c
|
2012-02-27 15:58:49 -06:00 |
|
Steve Harris
|
e0dc50a21c
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: e08a6e4b1c [formerly c45e7b888c] [formerly aa597242f9] [formerly e08a6e4b1c [formerly c45e7b888c] [formerly aa597242f9] [formerly a4538f0a48 [formerly aa597242f9 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]]
Former-commit-id: a4538f0a48
Former-commit-id: b65a901af6 [formerly 7c18ec7c7c] [formerly 0f7bb182634a23c54efdab2309f3cd0d4a2a8f14 [formerly fdd6018d1a]]
Former-commit-id: f8460df64844cd1534062e9459b9c707411b2b18 [formerly ba4a6aa434]
Former-commit-id: 98c100b36f
|
2012-02-27 11:32:49 -06:00 |
|
Ben Steffensmeier
|
4496b2f98c
|
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 8fd9d92f0a [formerly 20481daa1b] [formerly 357dc4d88b] [formerly 637c051a23 [formerly 357dc4d88b [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]]
Former-commit-id: 637c051a23
Former-commit-id: d5118790dd [formerly 88d2d2e4b6] [formerly bc7a93cc6ff900a77e00a7eb9d6864845eda90c8 [formerly 62f1ea0aac]]
Former-commit-id: 8c5c8bff0b6bd1f4321d4b9718028339dd9a0374 [formerly 0b4134f364]
Former-commit-id: cc91522fa0
|
2012-02-24 14:57:23 -06:00 |
|
Bryan Kowal
|
4f320a2de2
|
Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id: 48d5fd8ee6 [formerly 475849bd91] [formerly 1e3e31a657] [formerly 48d5fd8ee6 [formerly 475849bd91] [formerly 1e3e31a657] [formerly c2cd292c32 [formerly 1e3e31a657 [formerly 6984db8c852a552867b1b8159637d96dcd83ab5a]]]]
Former-commit-id: c2cd292c32
Former-commit-id: 2fa51704a0 [formerly d4367098a7] [formerly e59528ebf20a3f9e9fafe944e7bf90cae2f7d19f [formerly 49a30a5b1a]]
Former-commit-id: 8426e1c56a4cc6dfca4864365d9663eb933e5c32 [formerly 8350501de4]
Former-commit-id: 48f3f1e2d7
|
2012-02-23 16:46:48 -06:00 |
|
David Gillingham
|
adb2cd9b62
|
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 586f77e788 [formerly ef903bc728] [formerly d79f7e9613] [formerly 5aa5b51a55 [formerly d79f7e9613 [formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: d10c91b814 [formerly 6bca8d6353] [formerly 9d586efeed036f273d51786977174c550e093ace [formerly f9ed20bada]]
Former-commit-id: 881794234bd8fda0f5c8288097c527c0e21e3ce0 [formerly 85c082f1e9]
Former-commit-id: 98bc9450d3
|
2012-02-23 14:40:25 -06:00 |
|
Bryan Kowal
|
a9438f6213
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: e723d50244 [formerly 4881def0e9] [formerly bae0cb555e] [formerly e723d50244 [formerly 4881def0e9] [formerly bae0cb555e] [formerly e135f4508d [formerly bae0cb555e [formerly 10339dcba7c9ae535766e5c5dddac57ddb3f99c4]]]]
Former-commit-id: e135f4508d
Former-commit-id: 70afebc3a9 [formerly fa23b673c4] [formerly a9d31b1493dd373f2fd8124779bfc4579645858b [formerly 5c86773a77]]
Former-commit-id: 714a9d69c4598e4a6c8a319b0560c1a948d819b3 [formerly 4a78479648]
Former-commit-id: 511f0efe24
|
2012-02-23 14:20:50 -06:00 |
|
Steve Harris
|
268dce059a
|
Merge branch 'ss_sync'
Former-commit-id: 5004037bda [formerly 507374d31d] [formerly 9ef773822f] [formerly 5004037bda [formerly 507374d31d] [formerly 9ef773822f] [formerly c81cfb72c6 [formerly 9ef773822f [formerly 5ed747b42f001de0c6d08b5fb6f77a192f2e9a03]]]]
Former-commit-id: c81cfb72c6
Former-commit-id: 3df0fd8ff9 [formerly a90ad88b3c] [formerly 535912a1a82ff301f9e8633ae937dc30a8404833 [formerly 546db2604a]]
Former-commit-id: ac0de298d07f3155708b68efa5d04fc4934bf8fe [formerly e5fdaad4fe]
Former-commit-id: 3a53c6453c
|
2012-02-23 13:32:19 -06:00 |
|
David Gillingham
|
406ee3779d
|
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 adfd42b5ce [formerly 5a8ba0f0fb] [formerly 32b2c06988] [formerly 85998bc654 [formerly 32b2c06988 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]]
Former-commit-id: 85998bc654
Former-commit-id: d9def42052 [formerly 9ff631305a] [formerly fb4654a71df93b18d676c70825d89036de6bfcfe [formerly 88dcd4d09d]]
Former-commit-id: 3d9fbb450c702f842828ace3e919005130e3d6e0 [formerly 8e123e3ae0]
Former-commit-id: ca09c3a75a
|
2012-02-23 13:23:59 -06:00 |
|
Steve Harris
|
cf1f084aaf
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 7174904570 [formerly 6cab5a6709] [formerly eeddaa55f5] [formerly 7174904570 [formerly 6cab5a6709] [formerly eeddaa55f5] [formerly e829aa1a8b [formerly eeddaa55f5 [formerly 72fce6fda1b07320cc79fbf8f09cc47ffbe32e89]]]]
Former-commit-id: e829aa1a8b
Former-commit-id: 42594c734b [formerly 15facb4cf5] [formerly c0e93a29fcec7a2d69d301012349901b89a5de9c [formerly 48f081f798]]
Former-commit-id: 3330cd4bdd4d853645d6bbbc6acd85aa0baeea29 [formerly 190ebbc6a8]
Former-commit-id: e639c21185
|
2012-02-23 13:18:50 -06:00 |
|
Steve Harris
|
c286f63b5f
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c4616866d0 [formerly db8491ee59] [formerly d6b489e69e] [formerly c4616866d0 [formerly db8491ee59] [formerly d6b489e69e] [formerly 3b16f37675 [formerly d6b489e69e [formerly fee006734577fd51f05ca5e9ce211d36d2b9fe57]]]]
Former-commit-id: 3b16f37675
Former-commit-id: 3c7bf434ba [formerly 4518d47393] [formerly a3fec26c8a86a1ded9e0ab2b00a9fa60cab06b8a [formerly 6f13b9c3b1]]
Former-commit-id: f0b1faa8d9352712e6c8f6332eb12e3b9ab7a145 [formerly 62e5b475da]
Former-commit-id: db855932c5
|
2012-02-23 13:18:15 -06:00 |
|
Steve Harris
|
ef8ea5b641
|
Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: 7c3760b319 [formerly d61c6bda96] [formerly f081d1a6d4] [formerly 7c3760b319 [formerly d61c6bda96] [formerly f081d1a6d4] [formerly a0063d6cb1 [formerly f081d1a6d4 [formerly 5aa15dec35cf72a46288613e42e6cb02b94320a6]]]]
Former-commit-id: a0063d6cb1
Former-commit-id: 969bfd1146 [formerly 62be9edb93] [formerly 9b7fd7be1274ee48006e725dcf3a6947cf15044f [formerly 4b1d072b46]]
Former-commit-id: b1b105012aeb6fece6250e69569074500eb9cb50 [formerly 0c7fa07eea]
Former-commit-id: 8ba0bf58ae
|
2012-02-23 13:17:26 -06:00 |
|
Steve Harris
|
fab0e2ccd5
|
Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 55b44a00db [formerly 608a0c17a0] [formerly f9baa1c98c] [formerly 55b44a00db [formerly 608a0c17a0] [formerly f9baa1c98c] [formerly 46e1499e43 [formerly f9baa1c98c [formerly 2059372e90437312cf12f06de6c84d0824fb586c]]]]
Former-commit-id: 46e1499e43
Former-commit-id: 1fa3e31716 [formerly 63764220c4] [formerly 4963e367347650292e79807030506ea282547db3 [formerly 096ba6eb30]]
Former-commit-id: 72d2a2722e035133e9f491f4cc02223a9f5a00ab [formerly 1328771113]
Former-commit-id: 034270857e
|
2012-02-23 13:16:35 -06:00 |
|
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 |
|
Steve Harris
|
90432da18a
|
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: 121ec88a98 [formerly ec0f1aebfc] [formerly b89ebc5e01] [formerly 121ec88a98 [formerly ec0f1aebfc] [formerly b89ebc5e01] [formerly 496cc6a06b [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]]]
Former-commit-id: 496cc6a06b
Former-commit-id: 3371e158a6 [formerly dd3a5a8d88] [formerly 8f3e38d67a9e00af420a14793a365b7fbe9bd292 [formerly 4a93298877]]
Former-commit-id: 745a23d67040229fe246ffa1c83646920a36c89f [formerly 37e57b6588]
Former-commit-id: 7ca623525e
|
2012-02-20 16:38:06 -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
|
d7a2004679
|
Merge branch 'ss_sync' (OB12.1.2) into 11-Collaboration
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
Added
Former-commit-id: cbade8ffea [formerly 0d2bd27a08] [formerly eca4aef9a8] [formerly cbade8ffea [formerly 0d2bd27a08] [formerly eca4aef9a8] [formerly e5a5b3eefa [formerly eca4aef9a8 [formerly d74a1285a30ce98a656668c93c71462e7dc51c2a]]]]
Former-commit-id: e5a5b3eefa
Former-commit-id: b0735040cb [formerly d879ca2f3f] [formerly 03e76106f4a88bef1ddb1ae9403d5f1806fc5958 [formerly ff6c744fa7]]
Former-commit-id: daf0c9b261bd1f2b5c85033755673b5f83ca3937 [formerly 2864659287]
Former-commit-id: cd66297c18
|
2012-02-20 14:02:14 -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 |
|