Richard Peter
|
c97db8f979
|
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 39fbaeed62 [formerly 79d3aa4e1a] [formerly 7bd6a07913] [formerly 7bd6a07913 [formerly 0e25ae35c1]] [formerly 39fbaeed62 [formerly 79d3aa4e1a] [formerly 7bd6a07913] [formerly 7bd6a07913 [formerly 0e25ae35c1]] [formerly 1c150e6e8b [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 414ccec00e [formerly 1d6e9816e0] [formerly 50a1b270c5] [formerly d17e408d9521d3f82597dba5bf5fbdcd68561d6a [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c] [formerly 50a1b270c5 [formerly f13c86bc3e]]]
Former-commit-id: e37a848a29c926a114114630bab3b1b48d0a088f [formerly 1916128dada6d785b45f3c66eda571278ddb03d7] [formerly 5fab51d41b [formerly 9b3f8f9649]]
Former-commit-id: 5fab51d41b
Former-commit-id: ef2ff1d0f7
|
2014-02-27 15:18:26 -06:00 |
|
Richard Peter
|
4eca1d880f
|
Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: a21f763dfa [formerly ae39697315] [formerly a23c8f2c27] [formerly a23c8f2c27 [formerly 729d608a15]] [formerly a21f763dfa [formerly ae39697315] [formerly a23c8f2c27] [formerly a23c8f2c27 [formerly 729d608a15]] [formerly d54fee5dae [formerly a23c8f2c27 [formerly 729d608a15] [formerly d54fee5dae [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]]]
Former-commit-id: d54fee5dae
Former-commit-id: 09a0a14180 [formerly 3b09c69f65] [formerly 67093287a0] [formerly 1a879575562ef1d74db4d48e7117ad375f8f0242 [formerly 08cbaa7fb54883ec7360be105a26ab8de2e57993] [formerly 67093287a0 [formerly 229437773b]]]
Former-commit-id: 7e7aae96772528368114520845cb4ac2bc392eb0 [formerly c9048aab5203dfd97a994e794f6e95e3997674d5] [formerly 8d35f1ce5f [formerly 9ca22fce7f]]
Former-commit-id: 8d35f1ce5f
Former-commit-id: 0f7ab600e6
|
2014-02-27 13:20:49 -06:00 |
|
Brian.Dyke
|
58b3b5fcb6
|
Issue #124
Former-commit-id: e126426e05 [formerly 6d35a4b1bc] [formerly 3ba93b175e] [formerly 3ba93b175e [formerly 439f053309]] [formerly e126426e05 [formerly 6d35a4b1bc] [formerly 3ba93b175e] [formerly 3ba93b175e [formerly 439f053309]] [formerly 0cc11ddfd3 [formerly 3ba93b175e [formerly 439f053309] [formerly 0cc11ddfd3 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]]]]
Former-commit-id: 0cc11ddfd3
Former-commit-id: 9775f544f0 [formerly d274021768] [formerly e1d788683d] [formerly 6d669dbc2a110b252c6164ca47755d776fe9cb6b [formerly 1e605ca4a47aef453131de36960bb5a057128099] [formerly e1d788683d [formerly 90b4e7ebf0]]]
Former-commit-id: c8244529ae77178ad21d4569d4ec241793d6df2a [formerly 5a34ed2e1d56f086517b4572c3b7029b51000d64] [formerly 4b9bccad66 [formerly ff2ccb40e4]]
Former-commit-id: 4b9bccad66
Former-commit-id: 99b2a226bc
|
2014-02-04 16:56:47 -05:00 |
|
Brian Clements
|
e2c863a88d
|
Issue #2667 added bin lightning data access factory
renamed lightning record's lightSource field to source
added delta script for db column change
added attribute method comments for IData and DefaultGeometryData
Former-commit-id: e580f1f490 [formerly ff97757a38] [formerly 54516275f1] [formerly 54516275f1 [formerly 402bef9c5b]] [formerly e580f1f490 [formerly ff97757a38] [formerly 54516275f1] [formerly 54516275f1 [formerly 402bef9c5b]] [formerly bd9fbc5f38 [formerly 54516275f1 [formerly 402bef9c5b] [formerly bd9fbc5f38 [formerly b6c50729919ea8a9b29ca963e18f68268c3a0b7f]]]]]
Former-commit-id: bd9fbc5f38
Former-commit-id: ecbc8bc2a5 [formerly 5bc0ffe4af] [formerly 265137fd91] [formerly 26658ead3742382825db1c91f0c2e9e2ab9bd73d [formerly 72626aac11a4c66833f161115fc8c8d2adc2b74c] [formerly 265137fd91 [formerly 83ed9dc04d]]]
Former-commit-id: 7b5efaa3c67cc47daecb7da40a071c4e39f9fe3b [formerly c5bb42d8f6a8c636420817814985ab0a5d1a0c8d] [formerly abb1c97149 [formerly 77e31f815e]]
Former-commit-id: 5c4a17ab2547578604ac82cabad7eb5ae448e585 [formerly abb1c97149]
Former-commit-id: c82cc659af
|
2014-01-23 09:32:18 -06:00 |
|
Ben Steffensmeier
|
bbc7ab21f7
|
Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: fd03ef5064 [formerly 230309c25f] [formerly f34bfc1e5b] [formerly f34bfc1e5b [formerly c14cc609a8]] [formerly fd03ef5064 [formerly 230309c25f] [formerly f34bfc1e5b] [formerly f34bfc1e5b [formerly c14cc609a8]] [formerly cac1f07cbb [formerly f34bfc1e5b [formerly c14cc609a8] [formerly cac1f07cbb [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]]]
Former-commit-id: cac1f07cbb
Former-commit-id: f2a6f89402 [formerly e03a1c1202] [formerly ce9653ab15] [formerly bf9c9e9735d90828ebe8daa9f552037b1b112098 [formerly cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9] [formerly ce9653ab15 [formerly a06bdc56d6]]]
Former-commit-id: 19d2e2210fffba4b206f1b12c3f85b44df6e56b3 [formerly 65760735e4213dff6ee5ff8730b9a56f136c8d54] [formerly 7f38aac48c [formerly 3955ac729f]]
Former-commit-id: 7f38aac48c
Former-commit-id: fed726dd48
|
2013-10-25 15:31:39 -05:00 |
|
Max Schenkelberg
|
7d5be39fa7
|
Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested
Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c
Former-commit-id: ff28590621 [formerly 3509baaa74] [formerly 8a500677d3] [formerly 8a500677d3 [formerly b633f9987a]] [formerly ff28590621 [formerly 3509baaa74] [formerly 8a500677d3] [formerly 8a500677d3 [formerly b633f9987a]] [formerly 2d1db7d0e2 [formerly 8a500677d3 [formerly b633f9987a] [formerly 2d1db7d0e2 [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]]]]]
Former-commit-id: 2d1db7d0e2
Former-commit-id: 50142c5a25 [formerly 70c91ed24b] [formerly 1bdef4ddd3] [formerly 97e5a1ae96f2388dc905a91bd700c97bd71fe2c7 [formerly c6fb597995ca49d9e40c0fe52f6d3e660affe671] [formerly 1bdef4ddd3 [formerly 61e6dd1316]]]
Former-commit-id: 8c1b5efe9449ef68ec178efb40e121dc5e89f521 [formerly c7d9f743abf7aa67f2754beecdece51254dec003] [formerly 1a466db041 [formerly 66d023227d]]
Former-commit-id: 1a466db041
Former-commit-id: 76be1e8862
|
2013-09-09 10:10:11 -05:00 |
|
Max Schenkelberg
|
79eccd28a7
|
Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc
Former-commit-id: 6b347f7aee [formerly 9be1171c33] [formerly 6c92aa9dd7] [formerly 6c92aa9dd7 [formerly 5ab8b6e2c6]] [formerly 6b347f7aee [formerly 9be1171c33] [formerly 6c92aa9dd7] [formerly 6c92aa9dd7 [formerly 5ab8b6e2c6]] [formerly 06dbae8bdb [formerly 6c92aa9dd7 [formerly 5ab8b6e2c6] [formerly 06dbae8bdb [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]]]]
Former-commit-id: 06dbae8bdb
Former-commit-id: 3cf442d3b7 [formerly 41cc45e8fc] [formerly 2fc5af010d] [formerly a47823abf31da6d5528766f453463fe1e022bcb9 [formerly 116cd76f43f817c4146cfbf39bb00d7365fdbc12] [formerly 2fc5af010d [formerly 759ff7bcfd]]]
Former-commit-id: e7d309feb1533f6c7e903bd3f0e580cf34447712 [formerly 1ff68c0f5f81b9c5c23485ff991688d04f372125] [formerly 229e0ee235 [formerly 961ed891c8]]
Former-commit-id: 229e0ee235
Former-commit-id: b57cf3de95
|
2013-08-14 09:20:28 -05:00 |
|
Nate Jensen
|
71cced2cf9
|
Issue #2142 clean up dependencies and dead code
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59
Former-commit-id: 30973d2a82 [formerly 8838a7ee75] [formerly c4bc1ef034] [formerly c4bc1ef034 [formerly a636846295]] [formerly 30973d2a82 [formerly 8838a7ee75] [formerly c4bc1ef034] [formerly c4bc1ef034 [formerly a636846295]] [formerly f28420dac4 [formerly c4bc1ef034 [formerly a636846295] [formerly f28420dac4 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]]]]]
Former-commit-id: f28420dac4
Former-commit-id: 4f741dd1fb [formerly d39a175583] [formerly 8b070975aa] [formerly 46a4dd3702c56961572c3278c043c80c54293a38 [formerly 222e227b908ca94947a44a0518892d94ce66b436] [formerly 8b070975aa [formerly 65dbc62b59]]]
Former-commit-id: 60b20061723115023689c2d62e2ee619b4ce377c [formerly 858ba69761701e13b33acad8a218e96e2b1ad8e4] [formerly 5a0dd6f037 [formerly 428d0c73dc]]
Former-commit-id: 5a0dd6f037
Former-commit-id: c6b9b2dd7f
|
2013-07-17 16:30:08 -05:00 |
|
Steve Harris
|
7baae9e023
|
13.3.1-6 baseline
Former-commit-id: 773ad46112 [formerly 4eef6862d6] [formerly 2e110bd151] [formerly 2e110bd151 [formerly 3a4c7931e1]] [formerly 773ad46112 [formerly 4eef6862d6] [formerly 2e110bd151] [formerly 2e110bd151 [formerly 3a4c7931e1]] [formerly 566b677d09 [formerly 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]]
Former-commit-id: 566b677d09
Former-commit-id: e98ea6446e [formerly 0cec06c171] [formerly 6fe4b16924] [formerly f5fbbd7106390fe6058dba0c40b94bb2cb99c2d1 [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0] [formerly 6fe4b16924 [formerly 4ed21b702b]]]
Former-commit-id: c8b9fbe2f99759feef8f59a92c8b74c2e3f1b45f [formerly 0e585016165e18d475399f775c1938136de541c6] [formerly c28f3aeb02 [formerly c6f379f59a]]
Former-commit-id: c28f3aeb02
Former-commit-id: ed1788343e
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
3c85f63935
|
13.2.1-6 baseline
Former-commit-id: f645d7220c [formerly 52f48669f6] [formerly d66ad2f77b] [formerly d66ad2f77b [formerly d0752de66c]] [formerly f645d7220c [formerly 52f48669f6] [formerly d66ad2f77b] [formerly d66ad2f77b [formerly d0752de66c]] [formerly a46e33f06e [formerly d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 6b128749f2 [formerly 5027d2365b] [formerly bbe92e6824] [formerly f3506870f6207481b364a8cfac79c7de4d08f83e [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d] [formerly bbe92e6824 [formerly 30d38334cc]]]
Former-commit-id: 99ffc46efa72b085e555d1c7d241e0316fa33b30 [formerly 0cd3f4b5889bda9de32b546358edf3d8210d3ad8] [formerly dc55ef579a [formerly 0c128dd8f0]]
Former-commit-id: dc55ef579a
Former-commit-id: b43935a991
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
2827d6bd6e
|
13.1.2-2 baseline
Former-commit-id: e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly e380aa2f8f [formerly e8f4a2f031] [formerly 51208e5515] [formerly 51208e5515 [formerly c0c1d56f3a]] [formerly 4ba416aeb3 [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 771913b0c7 [formerly 82cdde8491] [formerly cd4185ef5c] [formerly 315d42e07d543cb65d6e601e1e21011082db86e5 [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a] [formerly cd4185ef5c [formerly 941337c553]]]
Former-commit-id: 5cd56308fe7c05824700e702851648ed30cdff6e [formerly c69e1900269e630aefc061c2464bc8fea1c9776a] [formerly f52ec0b0a0 [formerly b6fa9b4858]]
Former-commit-id: f52ec0b0a0
Former-commit-id: 745f2c6409
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
b30da9a588
|
12.10.1-4 baseline
Former-commit-id: 0b8f8ce5d2 [formerly ddc923e3e0] [formerly 9cd1f3ec0f] [formerly 9cd1f3ec0f [formerly 791ef6cedf]] [formerly 0b8f8ce5d2 [formerly ddc923e3e0] [formerly 9cd1f3ec0f] [formerly 9cd1f3ec0f [formerly 791ef6cedf]] [formerly 92cc2d8605 [formerly 9cd1f3ec0f [formerly 791ef6cedf] [formerly 92cc2d8605 [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]]]
Former-commit-id: 92cc2d8605
Former-commit-id: 405935e4e6 [formerly 27d8601fe0] [formerly f641cdd4e0] [formerly 591867ae811e3105f553359394bfad5786a3f667 [formerly 53da655c90a1b4d0e3b7bbcaf373c23ba32edc6a] [formerly f641cdd4e0 [formerly b4d2a0e8dd]]]
Former-commit-id: ab1e0836abb2abd999b5e1097e961b61b6235886 [formerly 5159825bf9b81d8d0188fb4bcfd469ccb27fd393] [formerly f61c5114e8 [formerly 451459d8cb]]
Former-commit-id: f61c5114e8
Former-commit-id: 987397b2db
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
a2164a88d8
|
12.9.1-5 baseline
Former-commit-id: 4fec0b9354 [formerly 77cbd6c1e5] [formerly a1d931fd44] [formerly a1d931fd44 [formerly 61f269f54c]] [formerly 4fec0b9354 [formerly 77cbd6c1e5] [formerly a1d931fd44] [formerly a1d931fd44 [formerly 61f269f54c]] [formerly f2fac39428 [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]]
Former-commit-id: f2fac39428
Former-commit-id: c68ab3311a [formerly d9faed979f] [formerly 7fb0b17bd5] [formerly 5b54a131b7dd8cd501953ba8fd918503d0851b4c [formerly 54140b7733222bbc423315196e9781453b12f896] [formerly 7fb0b17bd5 [formerly 72824561cb]]]
Former-commit-id: a2129aca55a7ff6fdaf13fb64bacec56ad158149 [formerly 84e9e52a92ae5e740b0daf680a98316f7435f7f7] [formerly 2d928d328e [formerly 9b5c2094ed]]
Former-commit-id: b40318710922ff74b3d17e2773847774993ac0db [formerly 2d928d328e]
Former-commit-id: 98059f9ef1
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
26b250dbd1
|
12.4.1-4 baseline
Former-commit-id: 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 2a216f333c [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 6456a7f75f [formerly 98d8b3f188] [formerly a2a6a18fae] [formerly 8177a31ae65520dcaf2978b703dc497369e03cf1 [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b] [formerly a2a6a18fae [formerly a4e519f3cd]]]
Former-commit-id: a5e6e414f62a4ad9f7e0da4037f64ad5885e2f16 [formerly 816045b74a6ddb3791f4e241a6f25a4d4ab3391a] [formerly 74b66d9683 [formerly 8cd5974f4c]]
Former-commit-id: 74b66d9683
Former-commit-id: 5b35d8a6e0
|
2012-04-18 15:18:16 -05: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 |
|