Commit graph

10 commits

Author SHA1 Message Date
Steve Harris
73ebee575a Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: b2394f317f [formerly b05701d2d7] [formerly 0665862abe] [formerly 0665862abe [formerly 70357d90bc]] [formerly b2394f317f [formerly b05701d2d7] [formerly 0665862abe] [formerly 0665862abe [formerly 70357d90bc]] [formerly a0abcf8120 [formerly 0665862abe [formerly 70357d90bc] [formerly a0abcf8120 [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]]]
Former-commit-id: a0abcf8120
Former-commit-id: 0d448151ff [formerly 239813406d] [formerly 65aa72fee7] [formerly 3b6d3ed67a670ad0aee1f55c2748ebef536765a0 [formerly 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da] [formerly 65aa72fee7 [formerly 6884520750]]]
Former-commit-id: 16f7e392d488313d3d36a70717bee66957129386 [formerly 5a694628c15cf0ff0b617182e7f4ca869e47cb8d] [formerly 0a7cb5fd7a [formerly 5a310acb18]]
Former-commit-id: 0a7cb5fd7a
Former-commit-id: 8850e44772
2012-03-29 10:03:05 -05:00
David Gillingham
df8897042c 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: 9394503075 [formerly d3d2046df0] [formerly efc9e9000b] [formerly efc9e9000b [formerly 9a75c87829]] [formerly 9394503075 [formerly d3d2046df0] [formerly efc9e9000b] [formerly efc9e9000b [formerly 9a75c87829]] [formerly 3cfa029f4b [formerly efc9e9000b [formerly 9a75c87829] [formerly 3cfa029f4b [formerly 679996850315f699d47633da5baf593c72ba7927]]]]]
Former-commit-id: 3cfa029f4b
Former-commit-id: 4808f5995e [formerly ad170c7b51] [formerly 882544b165] [formerly d52c028bc73402fc9fae1672ecca4c7d64e1d9ee [formerly 40b8cde016ba8c02a3df6cf49704fcd4f543df58] [formerly 882544b165 [formerly 1818e488c5]]]
Former-commit-id: 8e86a66ecaef3e4d5b45a766ba7be310eec48c46 [formerly 69b2b65bc9f95e43a6d7e1b4fd315cc1000bd325] [formerly 5bc4e2b41b [formerly 2f723abcb7]]
Former-commit-id: 5bc4e2b41b
Former-commit-id: 8afb307353
2012-03-06 16:24:58 -06:00
David Gillingham
4f55e3aea4 Issue #361: Refactor IscDataRecRequest handler to execute iscDataRec
asynchronously.

Former-commit-id: 5ddf8c9fdd [formerly b8acb1912c] [formerly 8d2ea4cfba] [formerly 8d2ea4cfba [formerly ff231f33f4]] [formerly 5ddf8c9fdd [formerly b8acb1912c] [formerly 8d2ea4cfba] [formerly 8d2ea4cfba [formerly ff231f33f4]] [formerly 1d69867594 [formerly 8d2ea4cfba [formerly ff231f33f4] [formerly 1d69867594 [formerly 26161f9fd457f02b4df8780750064aeb27fc7ba1]]]]]
Former-commit-id: 1d69867594
Former-commit-id: 3c8992ad46 [formerly 8bf167bc15] [formerly 000ca27db9] [formerly 23c953615551c2c79367dff4a8723977e6841365 [formerly 2c7dd92ec610e80343c37fb794682b682556ef19] [formerly 000ca27db9 [formerly 8c0b121cbc]]]
Former-commit-id: 9c3f969b183d1e0cc84073fe8792598715f4e56b [formerly 0e62e1016f98b0289b90c4259c26ce541cf534be] [formerly f67e4bc8c2 [formerly 773b6c7af6]]
Former-commit-id: f67e4bc8c2
Former-commit-id: c2dedd3c7c
2012-03-05 16:49:23 -06:00
Steve Harris
65659c7ca7 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: f7e218e8f9 [formerly 5a96582f16] [formerly 92084b3f20] [formerly 92084b3f20 [formerly d0bbbfefcc]] [formerly f7e218e8f9 [formerly 5a96582f16] [formerly 92084b3f20] [formerly 92084b3f20 [formerly d0bbbfefcc]] [formerly 7a10ca9766 [formerly 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 1180916a07 [formerly 2d02f819be] [formerly 92b7072b82] [formerly 43e6cb72041ade192010e6fbe7f83b6adc71dc75 [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b] [formerly 92b7072b82 [formerly 3d511fe719]]]
Former-commit-id: 856bddcc44621b450aa6e450b43cd072b943423a [formerly 91921bfe8a96f90874dbc2e55763bb94f1fea024] [formerly 3aef320ffd [formerly ae9c52b012]]
Former-commit-id: 3aef320ffd
Former-commit-id: 43ff909553
2012-02-23 10:06:18 -06:00
Steve Harris
973e60b46c Merging SS OB12.2.1 into ss_sync
Former-commit-id: 516722475b [formerly 829d2791e9] [formerly 8da36046de] [formerly 8da36046de [formerly c8aae98741]] [formerly 516722475b [formerly 829d2791e9] [formerly 8da36046de] [formerly 8da36046de [formerly c8aae98741]] [formerly 54be9660f1 [formerly 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 15f9cd43bd [formerly 13a3edd4f6] [formerly b55a488ed8] [formerly e472382f9c2c7295ee0641f46e123e17ccbada03 [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec] [formerly b55a488ed8 [formerly 4450cf8963]]]
Former-commit-id: 8cb557de3f08dfa5c79e7f9bff0b59099866ae89 [formerly 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe] [formerly 978d22db50 [formerly 15c56d11bc]]
Former-commit-id: 978d22db50
Former-commit-id: 3a4af24369
2012-02-22 11:14:43 -06:00
Steve Harris
fdca28a85f Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: c83432c7f0 [formerly d129eab241] [formerly c268da57bc] [formerly c268da57bc [formerly 4b76d22f77]] [formerly c83432c7f0 [formerly d129eab241] [formerly c268da57bc] [formerly c268da57bc [formerly 4b76d22f77]] [formerly cc66c8be24 [formerly c268da57bc [formerly 4b76d22f77] [formerly cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]]]
Former-commit-id: cc66c8be24
Former-commit-id: a288fae6fe [formerly c9a7ff42f4] [formerly dd911bed4d] [formerly 9edc9d289a9c981315339c2b125871b759d76922 [formerly 892342d6ba506e3495ef7df3355174001fd47f5a] [formerly dd911bed4d [formerly 54b5b6baef]]]
Former-commit-id: ce4d72695302a18bb4ddae4f27b4321236422aa3 [formerly 589ae505ef0a6ce52a577fd189d1c8eec012a6bd] [formerly 60bf5aeced [formerly 09b81c6e00]]
Former-commit-id: 60bf5aeced
Former-commit-id: 33aafe9ce0
2012-02-20 12:43:38 -06:00
Steve Harris
98bc95faee Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 3de7238a33 [formerly 7b4b066a2b] [formerly c209d6de36] [formerly c209d6de36 [formerly 93f6535bd8]] [formerly 3de7238a33 [formerly 7b4b066a2b] [formerly c209d6de36] [formerly c209d6de36 [formerly 93f6535bd8]] [formerly b137302802 [formerly c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]]
Former-commit-id: b137302802
Former-commit-id: 529c1315c1 [formerly 43c3cfdd1a] [formerly 1ac6b36d1f] [formerly cd2679b7c1db8bdaaed79773702c8431abd0fc31 [formerly eeaad2f7633b220d953999828d906362e3a79992] [formerly 1ac6b36d1f [formerly 65b22abd24]]]
Former-commit-id: e31cb91407686b01398682664c5c9b2cec140f9d [formerly f9b44e61385fcc409fa97cc2681f13c4a9c57a4a] [formerly 9a09879521 [formerly 895404abeb]]
Former-commit-id: 9a09879521
Former-commit-id: 8c9e581f41
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
ba23e1d776 Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a

Former-commit-id: 0587f0197b [formerly 700cb47baa] [formerly 3c673896a0] [formerly 3c673896a0 [formerly b3463d27fc]] [formerly 0587f0197b [formerly 700cb47baa] [formerly 3c673896a0] [formerly 3c673896a0 [formerly b3463d27fc]] [formerly 0d75fbf942 [formerly 3c673896a0 [formerly b3463d27fc] [formerly 0d75fbf942 [formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]]]]
Former-commit-id: 0d75fbf942
Former-commit-id: a0b34a80fb [formerly 13f6e4f868] [formerly 8b1cdd8db1] [formerly bea1224ea718d25f41107b2e3d39ff0e81a87d88 [formerly 3e19b92cbce5cee988b6ee87c18925f5342d0749] [formerly 8b1cdd8db1 [formerly c22f135dbc]]]
Former-commit-id: aefe472d2b1e0590032f3a1aeb8ca048863d8f98 [formerly 42253bc94fbbcaf565d110a034287d18a8369666] [formerly 50d560a874 [formerly 713811bb95]]
Former-commit-id: 50d560a874
Former-commit-id: 8c733c95b1
2012-01-30 16:39:57 -06:00
Matt Nash
1b128de135 Moving 12.1.1 into ss_sync
Former-commit-id: 6bcbc7d8ef [formerly d8da2252c3] [formerly 580e2938d7] [formerly 580e2938d7 [formerly 66be3bec40]] [formerly 6bcbc7d8ef [formerly d8da2252c3] [formerly 580e2938d7] [formerly 580e2938d7 [formerly 66be3bec40]] [formerly c83e5ff474 [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]]
Former-commit-id: c83e5ff474
Former-commit-id: 50944163ba [formerly fa4cd88c90] [formerly 82300ccdcf] [formerly bcc32c10bc [formerly 21d2361f00] [formerly 82300ccdcf [formerly 1faae42484]]]
Former-commit-id: bcc32c10bc [formerly 21d2361f00]
Former-commit-id: bcc32c10bc
Former-commit-id: 515196cb86
2012-01-19 11:53:12 -06:00
root
57877615f5 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 06a8b51d6d [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 2c3569dd39 [formerly 9bb8decbcf] [formerly 8e80217e59] [formerly e2ecdcfe33 [formerly 377dcd10b9] [formerly 8e80217e59 [formerly 3360eb6c5f]]]
Former-commit-id: e2ecdcfe33 [formerly 377dcd10b9]
Former-commit-id: e2ecdcfe33
Former-commit-id: 7dbd17a5aa
2012-01-06 08:55:05 -06:00