Commit graph

5 commits

Author SHA1 Message Date
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