Richard Peter
|
490a96fe1d
|
Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
Former-commit-id: be6e9a56c2 [formerly 181df35afc] [formerly 1f32ef9c7a] [formerly 1f32ef9c7a [formerly 5e5047cc4f]] [formerly be6e9a56c2 [formerly 181df35afc] [formerly 1f32ef9c7a] [formerly 1f32ef9c7a [formerly 5e5047cc4f]] [formerly 2a9276c728 [formerly 1f32ef9c7a [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]]]
Former-commit-id: 2a9276c728
Former-commit-id: 952cd0ba74 [formerly 84bef1f2ec] [formerly c0b0eef331] [formerly f4a9d1b418785d46989c39e20a932c12931ea5c2 [formerly 9c1694fcc8344cffbdb2feb402c25389a357d414] [formerly c0b0eef331 [formerly db7c941f6f]]]
Former-commit-id: 598d61cea0ae533b59edefd72edeb04ee2e5c1dc [formerly 45b98e41300d826058702743e6eeb0852aa1ad89] [formerly 42c78326f1 [formerly 9cf5e247ab]]
Former-commit-id: 42c78326f1
Former-commit-id: e6a36eb12a
|
2013-08-14 15:23:18 -05:00 |
|
Richard Peter
|
9beb641ab6
|
Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: 1db3b4c11b [formerly 9ff9054d7e] [formerly 2608dfe1d8] [formerly 2608dfe1d8 [formerly c61afa1bfa]] [formerly 1db3b4c11b [formerly 9ff9054d7e] [formerly 2608dfe1d8] [formerly 2608dfe1d8 [formerly c61afa1bfa]] [formerly ee6b9eb11a [formerly 2608dfe1d8 [formerly c61afa1bfa] [formerly ee6b9eb11a [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: bb0a231e8c [formerly 28a53c8a33] [formerly 3f65eaf74b] [formerly 38b08d4593ed0200ab8b3cbdb48c0e5acd2e65b0 [formerly 4ccbd370354ae0debc8270aa65a8ac1c72bc2ba9] [formerly 3f65eaf74b [formerly 58a4aaa080]]]
Former-commit-id: 437be2dca7826c60d85c5c552c2c856951d38a23 [formerly 7b21c6b410610be2392c1ea462eebd5eaebc5a75] [formerly a7075027be [formerly 7ca1edf371]]
Former-commit-id: 7ae1d53df20df88753bf8613b73178de66d46d24 [formerly a7075027be]
Former-commit-id: f48818579c
|
2013-08-14 14:29:55 -05:00 |
|
Richard Peter
|
b3f5a0bb2a
|
Merge "Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for. Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode." into development
Former-commit-id: 6ba91900d2 [formerly 6c7c5a5b4b] [formerly 09e4f4f4da] [formerly 09e4f4f4da [formerly bdf3d5a295]] [formerly 6ba91900d2 [formerly 6c7c5a5b4b] [formerly 09e4f4f4da] [formerly 09e4f4f4da [formerly bdf3d5a295]] [formerly bca32c2e0a [formerly 09e4f4f4da [formerly bdf3d5a295] [formerly bca32c2e0a [formerly 3f45f1988372462a7f541b9e76a893b1e2f4e1ae]]]]]
Former-commit-id: bca32c2e0a
Former-commit-id: 2c2acd3d0d [formerly bb4f543c8a] [formerly cc2bc4e366] [formerly 39f9e5a70ff1ef8d635c4b37e615a6e5f1ee2721 [formerly 33c6f0656217ce1577fa695c01be18653cbe1953] [formerly cc2bc4e366 [formerly 925f6cade4]]]
Former-commit-id: d0cdb063b51ba57301ab5dfed566a4ac53a0d7f6 [formerly 97f77d3fe553d98fd782447dc29129818b535849] [formerly 3e062d95de [formerly b555889e5c]]
Former-commit-id: 3e062d95de
Former-commit-id: a53a20830d
|
2013-08-14 13:57:48 -05:00 |
|
Nate Jensen
|
e37a532b00
|
Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development
Former-commit-id: b9f7180d8d [formerly 9407a5202a] [formerly 3b97de573a] [formerly 3b97de573a [formerly 9776721a46]] [formerly b9f7180d8d [formerly 9407a5202a] [formerly 3b97de573a] [formerly 3b97de573a [formerly 9776721a46]] [formerly 0947f358b1 [formerly 3b97de573a [formerly 9776721a46] [formerly 0947f358b1 [formerly 34c2b29b569f9179d37c330bc2f8edf5d56edf6c]]]]]
Former-commit-id: 0947f358b1
Former-commit-id: fbdb544f37 [formerly edbd00224d] [formerly 49567ae86c] [formerly 7e432ccd49b84e4372219494c1f1bf5056154676 [formerly 4e7d46f90eefa803d5b1de7984747157dee229fb] [formerly 49567ae86c [formerly b1882e2e42]]]
Former-commit-id: 6e796f9d1d651796cccd323d80eb596d88de0e68 [formerly f7a2c6d6794b20d8612ed1eb38167c5d7fd33c00] [formerly bc7cbd4aba [formerly 01ee796921]]
Former-commit-id: bc7cbd4aba
Former-commit-id: 10a705f87d
|
2013-08-14 12:55:15 -05:00 |
|
Brad Gonzales
|
69d4b23f2e
|
Issue #2196 changed ncfRegistry.sh EBXML_THRIFT_SERVICE_PORT to correspond to the port that the DPA looks for.
Renamed registry mode to wfoRegistry mode. Renamed devWfoRegistry mode to devRegistry mode.
Change-Id: I8793b2a5c6ebf0f2ce342103e81d48de1b3e2044
Former-commit-id: c70dd5e0c4 [formerly ec3646def6] [formerly 50a10b3efb] [formerly 50a10b3efb [formerly 533deffd53]] [formerly c70dd5e0c4 [formerly ec3646def6] [formerly 50a10b3efb] [formerly 50a10b3efb [formerly 533deffd53]] [formerly 5d169e4df1 [formerly 50a10b3efb [formerly 533deffd53] [formerly 5d169e4df1 [formerly b4ee9c5753571a8cdd0720986c76723f4e646f0c]]]]]
Former-commit-id: 5d169e4df1
Former-commit-id: 010ef4c767 [formerly bd8a061ef4] [formerly 88fdc1e56b] [formerly 11ba288dd229fa6f86b41505e1d311fa7861f54f [formerly 6534d32bcc0af9a21a9c40a2ef91bb08b973dcca] [formerly 88fdc1e56b [formerly f3bc3d9185]]]
Former-commit-id: 5f6767bccb326c8ef53b7ac53274c3766a2244f3 [formerly 3c378820641428aae469fe6519545209aa8c3cf4] [formerly 490b772aaf [formerly 526c244fc5]]
Former-commit-id: 490b772aaf
Former-commit-id: 435ed0e32d
|
2013-08-14 12:35:18 -05:00 |
|
Richard Peter
|
54f20b1a0e
|
Merge "Issue #2224 Bug fixes to pass unit test." into development
Former-commit-id: 2e526ff940 [formerly c489a4e9b2] [formerly a9ef2e7fd3] [formerly a9ef2e7fd3 [formerly 1a3dfd45ab]] [formerly 2e526ff940 [formerly c489a4e9b2] [formerly a9ef2e7fd3] [formerly a9ef2e7fd3 [formerly 1a3dfd45ab]] [formerly 11229d4b51 [formerly a9ef2e7fd3 [formerly 1a3dfd45ab] [formerly 11229d4b51 [formerly 0063088d0cffc2e7c6ba12f055184dd85f8820ca]]]]]
Former-commit-id: 11229d4b51
Former-commit-id: 75ac69d063 [formerly 8a4e3714c2] [formerly ea0ca8a055] [formerly c243a2d3659d5dfebbc9144f123adfe968acf697 [formerly c62c3b2c38e630e4071897d31b680ea252f1d4be] [formerly ea0ca8a055 [formerly 5eb9ca0e1a]]]
Former-commit-id: 3011667365df682367fb4f2b356aea6f089b6ad5 [formerly 762236bc55a5b5010ae64c2dbbf7ae403421e336] [formerly 4dd0dac7da [formerly bf33ae0ab3]]
Former-commit-id: 4dd0dac7da
Former-commit-id: 81ba602dca
|
2013-08-14 11:55:17 -05:00 |
|
Richard Peter
|
e8899587d9
|
Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development
Former-commit-id: 9eb6c06b2d [formerly 2169c7ae71] [formerly 72ecb0b995] [formerly 72ecb0b995 [formerly cfe449d838]] [formerly 9eb6c06b2d [formerly 2169c7ae71] [formerly 72ecb0b995] [formerly 72ecb0b995 [formerly cfe449d838]] [formerly 045d3cd618 [formerly 72ecb0b995 [formerly cfe449d838] [formerly 045d3cd618 [formerly 247b8d0848b7cfcadfe2163938226f20e654a98d]]]]]
Former-commit-id: 045d3cd618
Former-commit-id: 7c4dc910e8 [formerly 143973d9d0] [formerly f02fc50031] [formerly 0054ce067229072e75e96a2c17a9a879075b6f69 [formerly d416d75ca336101c5ae43270118c2986ff81ec92] [formerly f02fc50031 [formerly 3f456db0f1]]]
Former-commit-id: 7dbccef29b84abd849281bf18784cbf33e7320fc [formerly 334d0c139537590db2522582d16a6782d75e8a10] [formerly 6c9e009af6 [formerly f8f31253ce]]
Former-commit-id: 6c9e009af6
Former-commit-id: 3a2237fcd6
|
2013-08-14 10:53:53 -05:00 |
|
Roger Ferrel
|
bead0afdd5
|
Issue #2224 Bug fixes to pass unit test.
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00
Former-commit-id: ef3be7c029 [formerly d3a33f2855] [formerly 81a31214cd] [formerly 81a31214cd [formerly caa97d7d09]] [formerly ef3be7c029 [formerly d3a33f2855] [formerly 81a31214cd] [formerly 81a31214cd [formerly caa97d7d09]] [formerly 87f9cb2fb3 [formerly 81a31214cd [formerly caa97d7d09] [formerly 87f9cb2fb3 [formerly ca2bb73e1fd77bc289a106eb7743ee5344be3a52]]]]]
Former-commit-id: 87f9cb2fb3
Former-commit-id: bb9d0830ed [formerly 8daa627e56] [formerly 87ca79b294] [formerly 1210694d7fb9e69c4cc29e0e264d08c1b27cddd4 [formerly f7dc5f884640b503af95dd11719fbe5689844939] [formerly 87ca79b294 [formerly 5be73428f0]]]
Former-commit-id: 764f213d87deeebe8d917be774ff328dcaf2b4f6 [formerly 7115e4fd7f944cfea7961517975e209d1ee7ab05] [formerly 0760fb70e2 [formerly 39239f4005]]
Former-commit-id: 0760fb70e2
Former-commit-id: dea3a105dc
|
2013-08-14 10:25:49 -05:00 |
|
Mike Duff
|
e671985595
|
Issue #2247 - Fix permission displays in UserAdmin Dialogs
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4
Former-commit-id: e59a16406d [formerly 3959e7e9f8] [formerly e319928638] [formerly e319928638 [formerly 097028ec59]] [formerly e59a16406d [formerly 3959e7e9f8] [formerly e319928638] [formerly e319928638 [formerly 097028ec59]] [formerly e791617acc [formerly e319928638 [formerly 097028ec59] [formerly e791617acc [formerly ca3499309373b553874e7a89e8f38f30e9b041e6]]]]]
Former-commit-id: e791617acc
Former-commit-id: 6aafe3a741 [formerly d0df6c3107] [formerly b70b7a0681] [formerly db84653c9cd4399003e115571ad9dc42294a2773 [formerly ba7884d6eb75737a8c3c26d231fc65031b3c02a1] [formerly b70b7a0681 [formerly 081d30db4f]]]
Former-commit-id: a51d7d29561f30a6c655412e54621fd26a19ee7b [formerly 89dc750c21817a4d6c345dc5b21e6c5789869dd4] [formerly 622f835330 [formerly 242f34efa9]]
Former-commit-id: 622f835330
Former-commit-id: bf7bfbb742
|
2013-08-14 10:13:05 -05:00 |
|
Steve Harris
|
ab45189ba9
|
13.5.1-15 baseline
Former-commit-id: 64369ef595 [formerly b05abcaec0] [formerly 535218c676] [formerly 535218c676 [formerly 53e96e21db]] [formerly 64369ef595 [formerly b05abcaec0] [formerly 535218c676] [formerly 535218c676 [formerly 53e96e21db]] [formerly c6dc1817e7 [formerly 535218c676 [formerly 53e96e21db] [formerly c6dc1817e7 [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]]]
Former-commit-id: c6dc1817e7
Former-commit-id: b04a64a4b4 [formerly 6f1b6d494f] [formerly 4f9288e7c1] [formerly 74bb01712c9c41fbc400ff837dbac191ba4e87f3 [formerly c5d936eabd4d2eeade071aad734eb9b268940a49] [formerly 4f9288e7c1 [formerly 65beefde58]]]
Former-commit-id: 464dc2147c90311ff4c3f0dbb0f94a9887747601 [formerly 813df6d93357ffbcdd78c9658dc75c9aaa803d60] [formerly d0be6956e9 [formerly 9ea3f0c215]]
Former-commit-id: d0be6956e9
Former-commit-id: a700182250
|
2013-08-14 10:24:26 -04: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 |
|
Steve Harris
|
bf73474e16
|
13.5.1-14 baseline
Former-commit-id: 05ec949b01 [formerly c6465a3398] [formerly b848317203] [formerly b848317203 [formerly d695e5debe]] [formerly 05ec949b01 [formerly c6465a3398] [formerly b848317203] [formerly b848317203 [formerly d695e5debe]] [formerly 80e5f7fbd4 [formerly b848317203 [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: f1b3e9c061 [formerly 4e75333155] [formerly 9bd983e2fe] [formerly 73d6a7f0a3aed600a04f1685e4f19dc4009e9968 [formerly 979d519294a0cce041889e9000a739088fbe1b71] [formerly 9bd983e2fe [formerly cd5b1e9e2f]]]
Former-commit-id: 00b59fe865fb0a28c97f28079382f0f281d741a7 [formerly d8f0e84b19aec7b3ded8283169da1f9631e8d68a] [formerly f4262380d6 [formerly 0f3ffc3892]]
Former-commit-id: f4262380d6
Former-commit-id: a338706fa4
|
2013-08-14 10:07:41 -04:00 |
|
Jonathan Sanchez
|
ba0045725f
|
Issue #2243 Resolved incorrect import.
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb
Former-commit-id: 7365c246ef [formerly 714982e96f] [formerly 52d7862d36] [formerly 52d7862d36 [formerly c6b6576f01]] [formerly 7365c246ef [formerly 714982e96f] [formerly 52d7862d36] [formerly 52d7862d36 [formerly c6b6576f01]] [formerly fd0f2f1c09 [formerly 52d7862d36 [formerly c6b6576f01] [formerly fd0f2f1c09 [formerly f79e7820ea010e0bc860b0033183147d7299221f]]]]]
Former-commit-id: fd0f2f1c09
Former-commit-id: 7734a8f5f9 [formerly aafcbe9520] [formerly 7189057682] [formerly 2be2c34661e0134a6d1c655fa77e34e8d79cefac [formerly ea268f1966644425a392151655f4081fa9cf6ad5] [formerly 7189057682 [formerly 70bb266da7]]]
Former-commit-id: 9cbf4b1380a9a40593be55f15c2bd15f9a419938 [formerly 33471e77379cb1c3960ddea8f4ec562cbdf3eb20] [formerly c2e2741ad6 [formerly 77a919a7e8]]
Former-commit-id: c2e2741ad6
Former-commit-id: 1e5c5696b5
|
2013-08-13 20:47:49 -05:00 |
|
Nate Jensen
|
fb23274420
|
Merge "Issue #2262 create new wxmath plugin seeded by Java derivparam functions" into development
Former-commit-id: c66c09a725 [formerly a72d987b2e] [formerly a50328f796] [formerly a50328f796 [formerly e4a9195477]] [formerly c66c09a725 [formerly a72d987b2e] [formerly a50328f796] [formerly a50328f796 [formerly e4a9195477]] [formerly c844396230 [formerly a50328f796 [formerly e4a9195477] [formerly c844396230 [formerly 5b909886e84f0f6942a06367f223940e4448e315]]]]]
Former-commit-id: c844396230
Former-commit-id: b4231a64f2 [formerly 67d028c561] [formerly e3f8c316f2] [formerly 8214765803621d50f71eda0bb8d759fe12efbb09 [formerly 9d055ae25b28b02efc2fc1cfa94af89b4bcce17d] [formerly e3f8c316f2 [formerly ffed8deab6]]]
Former-commit-id: 90b8b362a889f63f7c1e3d7f7c8b0433c2d26731 [formerly a3b6d10413f39ee33b902a34f71fcd2b5826722b] [formerly 0159659393 [formerly 2b9c2a7b3f]]
Former-commit-id: 8777f4c6821d7cf325cd1cafb61f06ea67cdb38e [formerly 0159659393]
Former-commit-id: d6f79151f6
|
2013-08-13 17:19:25 -05:00 |
|
Nate Jensen
|
b936009020
|
Issue #2262 create new wxmath plugin seeded by Java derivparam functions
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2
Former-commit-id: 3871882405 [formerly 9df41ff246] [formerly 23fe237b7e] [formerly 23fe237b7e [formerly 09872d6713]] [formerly 3871882405 [formerly 9df41ff246] [formerly 23fe237b7e] [formerly 23fe237b7e [formerly 09872d6713]] [formerly 959b50d184 [formerly 23fe237b7e [formerly 09872d6713] [formerly 959b50d184 [formerly f3d233aeff8017c521288affd4b5be668c9a890a]]]]]
Former-commit-id: 959b50d184
Former-commit-id: f39b1dc975 [formerly dde8a77452] [formerly aaee338f5c] [formerly d08492cb32d6a36fbf9540fe02656f2d6701967f [formerly 51c4ef63ff05fff6b408532bd09a5c1ae80588a3] [formerly aaee338f5c [formerly 44ef756627]]]
Former-commit-id: 4a2944774dd706f1d060da5adf4a4735f28d6c9a [formerly e365f2b72b6587537eecf35e48ae9b815f253b51] [formerly 2bed514c66 [formerly 5a2c7fd36f]]
Former-commit-id: 2bed514c66
Former-commit-id: 28f3475d8a
|
2013-08-13 16:59:57 -05:00 |
|
Richard Peter
|
e2142618d5
|
Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
Former-commit-id: 297b1003b3 [formerly 4dd1b27e44] [formerly 2b23cb871e] [formerly 2b23cb871e [formerly 6efc27c1b1]] [formerly 297b1003b3 [formerly 4dd1b27e44] [formerly 2b23cb871e] [formerly 2b23cb871e [formerly 6efc27c1b1]] [formerly d5130432a8 [formerly 2b23cb871e [formerly 6efc27c1b1] [formerly d5130432a8 [formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]]]]
Former-commit-id: d5130432a8
Former-commit-id: 63d52f5032 [formerly 0c915ec5dc] [formerly e28de494e9] [formerly 29413100bb239527967ce2e265358201f880fe9c [formerly 2a26f47bc2eef0af172637a67f611d6028ddb875] [formerly e28de494e9 [formerly 2fc754b899]]]
Former-commit-id: 8fd98ee124147840f31af90e6916beeb1fdf4620 [formerly 667b56480988a0d27554fe0b37597d7fbe2dfa40] [formerly 48e9e757e9 [formerly 6e3624d1a7]]
Former-commit-id: df41ad6b0e7918b3827b5d85521c9db41a58adf2 [formerly 48e9e757e9]
Former-commit-id: a100febd89
|
2013-08-13 16:45:37 -05:00 |
|
Jonathan Sanchez
|
287d55ef6a
|
Issue #2243 Fixed update list bugs.
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f
Former-commit-id: 0c048d00ff [formerly dc2363ffd7] [formerly 8d0ee7f5ca] [formerly 8d0ee7f5ca [formerly d685125b25]] [formerly 0c048d00ff [formerly dc2363ffd7] [formerly 8d0ee7f5ca] [formerly 8d0ee7f5ca [formerly d685125b25]] [formerly 49f488a58f [formerly 8d0ee7f5ca [formerly d685125b25] [formerly 49f488a58f [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]]]]
Former-commit-id: 49f488a58f
Former-commit-id: 1be5abcbf1 [formerly 3806121231] [formerly d33332bd58] [formerly f2bff6ccc3b4801ae6914924197becd1d01efa69 [formerly dd476c502c979c6b882524dd8959a4110265b20f] [formerly d33332bd58 [formerly 96c88ad28b]]]
Former-commit-id: df7461cf2a8dbedfd9b7c5cef09e4be4887da00a [formerly 359b6c726ca69372c3a6c6e3771187107c6d2a19] [formerly ba585b9424 [formerly 721b2c7c04]]
Former-commit-id: ba585b9424
Former-commit-id: 0487e62197
|
2013-08-13 16:30:05 -05:00 |
|
Roger Ferrel
|
4dced6d10b
|
Issue #2224 Quick for daily build until I figure out what is really wrong.
Change-Id: I589b04aae265239dc2cb2e34819ff28eb2ced8d6
Former-commit-id: 6d877ab021 [formerly ed22d942af] [formerly 91b375e761] [formerly 91b375e761 [formerly f4d6bf5ff3]] [formerly 6d877ab021 [formerly ed22d942af] [formerly 91b375e761] [formerly 91b375e761 [formerly f4d6bf5ff3]] [formerly ea862ea395 [formerly 91b375e761 [formerly f4d6bf5ff3] [formerly ea862ea395 [formerly 261e40897b011ea7f0aec668d57b65631a6c735f]]]]]
Former-commit-id: ea862ea395
Former-commit-id: 5580e8d040 [formerly d3a5376597] [formerly 3a402e1e52] [formerly dea4e2fefba8ac55393df4aef3debaf3eabcd126 [formerly 467e5b38475fe29d7c77be9e7a713528e59cb489] [formerly 3a402e1e52 [formerly 05d0a371e2]]]
Former-commit-id: 0dd89cdceddd54670ba63dd343a67f269a139891 [formerly b5046cabb3c32379cb035e6ea0b6b765a6367119] [formerly b591bd604d [formerly 0df3bdb780]]
Former-commit-id: b591bd604d
Former-commit-id: 039c14aec6
|
2013-08-13 16:03:50 -05:00 |
|
Mike Duff
|
614eb23a77
|
Issue #2263 - remove build failure on unit test failure
Change-Id: I921470904bf894cf49c7952b6c5feba3caf5b83f
Former-commit-id: 86347133cd [formerly e1e84be2b9] [formerly 18f0ef68db] [formerly 18f0ef68db [formerly 367420ad48]] [formerly 86347133cd [formerly e1e84be2b9] [formerly 18f0ef68db] [formerly 18f0ef68db [formerly 367420ad48]] [formerly 62c3e2107f [formerly 18f0ef68db [formerly 367420ad48] [formerly 62c3e2107f [formerly 57870e24ca02e1cb66705cac79fb8856685a56b3]]]]]
Former-commit-id: 62c3e2107f
Former-commit-id: ebe5c1106c [formerly 0d2c072dce] [formerly bd7c39692a] [formerly 5420427f44e38ee12ad78e446a8ce6a644ad823f [formerly 82b156d8e15bf36f13a55daced70457967e7b450] [formerly bd7c39692a [formerly cac7a8d0da]]]
Former-commit-id: d0cbedad8aab65695959a1116ac4ef34cdf82a73 [formerly 974a43b987e2054fbd1ef56bf7efd9e4d28f8575] [formerly f2141a2f80 [formerly 420025ae77]]
Former-commit-id: 0b0b204ed271fba3bae3c52341781c7bce88ff60 [formerly f2141a2f80]
Former-commit-id: b2c42221ea
|
2013-08-13 14:54:24 -05:00 |
|
Nate Jensen
|
21274615ce
|
Merge "Issue #2253 fix issue where warnings do not show up in the drop down in Warngen" into development
Former-commit-id: 96ff74eae4 [formerly ee45599b10] [formerly b435eba010] [formerly b435eba010 [formerly f8d8e312f3]] [formerly 96ff74eae4 [formerly ee45599b10] [formerly b435eba010] [formerly b435eba010 [formerly f8d8e312f3]] [formerly d995e29afe [formerly b435eba010 [formerly f8d8e312f3] [formerly d995e29afe [formerly 32053b62812fc375aebb5af21af1149b2b4944c5]]]]]
Former-commit-id: d995e29afe
Former-commit-id: 06b58c5ed6 [formerly 98b8bcaf15] [formerly f8a839a0a1] [formerly 266a662949a05011404737a01e7123529f54beba [formerly d45c592549b4132053bd6601c4ebc9e98574f455] [formerly f8a839a0a1 [formerly 759348ba2e]]]
Former-commit-id: c6b567f089ef30b266de6dece33a0f9063b3c7c0 [formerly ae3a0ab1500ef0f94e532c7a09187a789dd9d3da] [formerly 76773c9b82 [formerly 087658d413]]
Former-commit-id: 76773c9b82
Former-commit-id: a5552abef2
|
2013-08-13 12:34:44 -05:00 |
|
Greg Armendariz
|
f181323aaa
|
Merge "Issue #2164 - fix 13.6.1 build" into development
Former-commit-id: 1564720241 [formerly 0e4fb54616] [formerly 8bcfc737e6] [formerly 8bcfc737e6 [formerly 34b428b5a0]] [formerly 1564720241 [formerly 0e4fb54616] [formerly 8bcfc737e6] [formerly 8bcfc737e6 [formerly 34b428b5a0]] [formerly 84413bd66f [formerly 8bcfc737e6 [formerly 34b428b5a0] [formerly 84413bd66f [formerly aa808c2ef1cbee907fbe910892a2c37fa5b0d45c]]]]]
Former-commit-id: 84413bd66f
Former-commit-id: 18728bc5e5 [formerly 23c92a0580] [formerly 02dfe84d31] [formerly 6ed8780a1637b4bb8219af798063e583650c5f7f [formerly f27556222bac4d9edcd174ff7f0a255be940034e] [formerly 02dfe84d31 [formerly dbae6131cb]]]
Former-commit-id: d2fc67c9d4d20a5ae88569bc0818f67084fbcc63 [formerly e8ba020059e20401e83646629621c84cddf4d30a] [formerly 0995174c2e [formerly e5399de2a2]]
Former-commit-id: 0995174c2e
Former-commit-id: 09e31f389a
|
2013-08-13 12:34:04 -05:00 |
|
Nate Jensen
|
b05f9a25b9
|
Merge "Issue #2142 removing more dependencies on edex.common" into development
Former-commit-id: 9fface9dba [formerly d6a7d77ae6] [formerly 86e823cc9f] [formerly 86e823cc9f [formerly 260ea8a0b9]] [formerly 9fface9dba [formerly d6a7d77ae6] [formerly 86e823cc9f] [formerly 86e823cc9f [formerly 260ea8a0b9]] [formerly 576b8fa830 [formerly 86e823cc9f [formerly 260ea8a0b9] [formerly 576b8fa830 [formerly 725b2654ce507b302ac111a740f27460799ecd80]]]]]
Former-commit-id: 576b8fa830
Former-commit-id: 629849983c [formerly f63ade7443] [formerly 12fd3b3b8d] [formerly c3a54f90cae1714957141dbe3c54336bc82e398d [formerly 3bce82da0dd11c2290eaa18420eb44d314e94d13] [formerly 12fd3b3b8d [formerly 295b29860b]]]
Former-commit-id: aaa8cc9a9064fa953a82b6c9241ad094267458fa [formerly 836ab8b74a9ca91f1a50c311959787ec56a63d30] [formerly ede849eea4 [formerly f8dc20caba]]
Former-commit-id: ede849eea4
Former-commit-id: 79074e67a7
|
2013-08-13 12:32:09 -05:00 |
|
Nate Jensen
|
d806656a70
|
Issue #2197 cherry picking 2197 into 13.5
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: baee72c5c3 [formerly 9a01271f5f] [formerly a9815b0551] [formerly a9815b0551 [formerly 15405cab1b]] [formerly baee72c5c3 [formerly 9a01271f5f] [formerly a9815b0551] [formerly a9815b0551 [formerly 15405cab1b]] [formerly 63b2fe798a [formerly a9815b0551 [formerly 15405cab1b] [formerly 63b2fe798a [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]]]
Former-commit-id: 63b2fe798a
Former-commit-id: 6936023d6b [formerly e63e7120e5] [formerly 464a104dc1] [formerly 454b468fcc5412206ca46a5e671057570c349c8b [formerly 63f208510706ceb9b97414afeb3057e182119b34] [formerly 464a104dc1 [formerly 3be446fca8]]]
Former-commit-id: 1582ebed44f832939d2b85598d68f1071edf722e [formerly 3574b3d0242e822b25fae435b013a4f5730216e4] [formerly 7e35afdd49 [formerly 96214e9554]]
Former-commit-id: 7e35afdd49
Former-commit-id: 346e1d1fb7
|
2013-08-13 12:27:02 -05:00 |
|
Matt Nash
|
cb3e4a607d
|
Issue #2253 fix issue where warnings do not show up in the drop down in Warngen
Change-Id: I680948f5e5224da9f649632fd72ca0412eb9b186
Former-commit-id: 9c6215335a [formerly 9289576049] [formerly 80172b1aba] [formerly 80172b1aba [formerly 5aeda85fca]] [formerly 9c6215335a [formerly 9289576049] [formerly 80172b1aba] [formerly 80172b1aba [formerly 5aeda85fca]] [formerly dda3d78b48 [formerly 80172b1aba [formerly 5aeda85fca] [formerly dda3d78b48 [formerly 1c72a8cfeeb9263f8d406002de9703a1ee73f40e]]]]]
Former-commit-id: dda3d78b48
Former-commit-id: e2a4188993 [formerly 5803a64603] [formerly fc6e2bf0c3] [formerly e30d56ff60c20b38f86162fa231f3c80114a408b [formerly 1d7ef8f99d91ca142fcc53e65be8304b5a111b8c] [formerly fc6e2bf0c3 [formerly ebb291e6c3]]]
Former-commit-id: 7ce1d9cb5d5cd72dcf2b18a3f65d8cdc52c44006 [formerly 4598937cce72016ce51cded9bba33621a5c8fb07] [formerly 53fbeaff34 [formerly 82214b871e]]
Former-commit-id: 53fbeaff34
Former-commit-id: a43cb2bf28
|
2013-08-13 11:59:35 -05:00 |
|
Bryan Kowal
|
7c66ad2d0e
|
Issue #2164 - fix 13.6.1 build
Former-commit-id: bd0bb4ed34 [formerly 17c4406504] [formerly dbaa6da3ea] [formerly dbaa6da3ea [formerly 4604653241]] [formerly bd0bb4ed34 [formerly 17c4406504] [formerly dbaa6da3ea] [formerly dbaa6da3ea [formerly 4604653241]] [formerly 586b7646f0 [formerly dbaa6da3ea [formerly 4604653241] [formerly 586b7646f0 [formerly 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371]]]]]
Former-commit-id: 586b7646f0
Former-commit-id: 2b050905a5 [formerly ac9f30c364] [formerly d96ca6737c] [formerly e1cdad798ad6802529b8dee9a69cabc8a796d5af [formerly 35049ac07bfb3bc55f39b499e9526b76e59c3cf0] [formerly d96ca6737c [formerly 8b3827c745]]]
Former-commit-id: 57a35646e1637783c53ec65b094d5d357a29926c [formerly ec9f485bacfdf0d2204f2d81a57a303b83c0ee49] [formerly 197cc17ce7 [formerly 64916e1833]]
Former-commit-id: 9c6a7c6e3df3f329e0d97fca8c5afdbc8197efe4 [formerly 197cc17ce7]
Former-commit-id: 6afd751590
|
2013-08-13 11:13:52 -05:00 |
|
Richard Peter
|
8d79bef284
|
Merge "Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals." into development
Former-commit-id: b8ad7fc2c1 [formerly 64496ad332] [formerly 3763073459] [formerly 3763073459 [formerly 3f6d8a28da]] [formerly b8ad7fc2c1 [formerly 64496ad332] [formerly 3763073459] [formerly 3763073459 [formerly 3f6d8a28da]] [formerly 60831564a0 [formerly 3763073459 [formerly 3f6d8a28da] [formerly 60831564a0 [formerly c4cc04a6b759f934a556004a242da4dfa4709653]]]]]
Former-commit-id: 60831564a0
Former-commit-id: 96e943d7fe [formerly 2be0bfe06c] [formerly 35a3e81478] [formerly 8e9cffac08ad906cf80a39b88e0a75569b9a3b12 [formerly b8c51d60a2d0aa03907fcbc0718b69115b70690e] [formerly 35a3e81478 [formerly a4d9a82ca5]]]
Former-commit-id: e43f390f77618a7af8797afd077f08de8c33cf23 [formerly 936a0fbde4b06bab6da8988c88fefe97a8362d35] [formerly 912f409622 [formerly c14c5c3b15]]
Former-commit-id: 912f409622
Former-commit-id: 718b4b388a
|
2013-08-13 10:10:07 -05:00 |
|
Nate Jensen
|
6c9d984a9d
|
Issue #2142 removing more dependencies on edex.common
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf
Former-commit-id: b25287ad9e [formerly 5e24a11e06] [formerly 78256fd891] [formerly 78256fd891 [formerly df95db8f78]] [formerly b25287ad9e [formerly 5e24a11e06] [formerly 78256fd891] [formerly 78256fd891 [formerly df95db8f78]] [formerly 0c92461c65 [formerly 78256fd891 [formerly df95db8f78] [formerly 0c92461c65 [formerly 231c873711159c9a59f0bc4e25e70cc9c989ecc0]]]]]
Former-commit-id: 0c92461c65
Former-commit-id: 57fe8d954d [formerly 766da72c20] [formerly 988ac46c2b] [formerly ab1f7f14dc415abcb5f939192d20f0f6cb1fe4c9 [formerly 19ebf5cd40eb632cc1ff7e301922bcea379b8369] [formerly 988ac46c2b [formerly bf821fdbe0]]]
Former-commit-id: b06450ba63e96595cdf180015eae5a74e2692715 [formerly b3e126abefacb3578607250bbde04e86d391e148] [formerly bfca6dac18 [formerly 276f78d5f3]]
Former-commit-id: bfca6dac18
Former-commit-id: 07c3bdd58b
|
2013-08-13 09:09:05 -05:00 |
|
Nate Jensen
|
fa035c6529
|
Merge "Issue #2162: Add performance logging for GFE edit area query evaluation." into development
Former-commit-id: e634d29ffd [formerly 9424d4d05e] [formerly 9e283f0640] [formerly 9e283f0640 [formerly bb955e6ee7]] [formerly e634d29ffd [formerly 9424d4d05e] [formerly 9e283f0640] [formerly 9e283f0640 [formerly bb955e6ee7]] [formerly e6fc534b8c [formerly 9e283f0640 [formerly bb955e6ee7] [formerly e6fc534b8c [formerly 731fb620ed8dec721c1fe4bbc0b55b4e11e1283f]]]]]
Former-commit-id: e6fc534b8c
Former-commit-id: 466503b7a5 [formerly 6d5db1a0ef] [formerly c370d3b7d0] [formerly 9f9387c557afcd6d623aa0ca566207862f224d8f [formerly a3cf360d5a76db93070e8919ea77aed528d12fca] [formerly c370d3b7d0 [formerly ea4355e018]]]
Former-commit-id: 1af51d3cae854370d848a05e5604be69e1ebc703 [formerly 34bf0f65fd707b8ec8c56a52314db9c9a7d47b8f] [formerly d9c2941c1d [formerly 74bf4205cb]]
Former-commit-id: d9c2941c1d
Former-commit-id: ed59997955
|
2013-08-13 08:58:50 -05:00 |
|
Nate Jensen
|
1ca2f52746
|
Merge "Issue #2033 Fixed alertviz startup" into development
Former-commit-id: 0f2b05bb28 [formerly 74a6174e78] [formerly 5b3334b2ff] [formerly 5b3334b2ff [formerly 58e7b31de9]] [formerly 0f2b05bb28 [formerly 74a6174e78] [formerly 5b3334b2ff] [formerly 5b3334b2ff [formerly 58e7b31de9]] [formerly c62139c327 [formerly 5b3334b2ff [formerly 58e7b31de9] [formerly c62139c327 [formerly 3312f297f36ab27d9f9fb74d48bf291f60292e5a]]]]]
Former-commit-id: c62139c327
Former-commit-id: becc358a47 [formerly b4d5ba2d2c] [formerly d9e4590947] [formerly dd9e6019e59ca6ac0d0af110c9ebb30183ca62ba [formerly 0e55127933254744d7ac69d6ba3078acd0ce5ab4] [formerly d9e4590947 [formerly 95010dbbf4]]]
Former-commit-id: 87bdb8e675a892b190e5bc1306ebb350c1b38054 [formerly 500f7660748c998274c41dcd56757c5491055abb] [formerly a6ec68d567 [formerly 1b0049b36b]]
Former-commit-id: a6ec68d567
Former-commit-id: 4d525edaa5
|
2013-08-13 08:56:24 -05:00 |
|
Nate Jensen
|
590f947727
|
Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development
Former-commit-id: 9a147fc4ce [formerly 7bbc2ec7d7] [formerly ce20de02a7] [formerly ce20de02a7 [formerly 5948ebca87]] [formerly 9a147fc4ce [formerly 7bbc2ec7d7] [formerly ce20de02a7] [formerly ce20de02a7 [formerly 5948ebca87]] [formerly 8101c961d4 [formerly ce20de02a7 [formerly 5948ebca87] [formerly 8101c961d4 [formerly e9e46b68652caff85b2206180856654876f55f12]]]]]
Former-commit-id: 8101c961d4
Former-commit-id: 29f39f2197 [formerly d037198231] [formerly 835516348f] [formerly d12cf78b5389f2cc6bd7807511dd5601c0522e03 [formerly e0c53384ed3969b5434ffaf4846c3219ee84cc83] [formerly 835516348f [formerly 75f31b372e]]]
Former-commit-id: e3aa41a49b5e6350fa6b531c826594c1688168d5 [formerly 96278da6e01844e8874ee07161ec92fd65e91c2d] [formerly f1c8e329d9 [formerly abbe1e21d0]]
Former-commit-id: f1c8e329d9
Former-commit-id: 387a90c721
|
2013-08-13 08:56:01 -05:00 |
|
Max Schenkelberg
|
9f59ee95e5
|
Issue #2033 Fixed alertviz startup
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5
Former-commit-id: 1a324ae28b [formerly 7598c95fd9] [formerly c825e2f0e2] [formerly c825e2f0e2 [formerly 49381ac481]] [formerly 1a324ae28b [formerly 7598c95fd9] [formerly c825e2f0e2] [formerly c825e2f0e2 [formerly 49381ac481]] [formerly 3f35c335c9 [formerly c825e2f0e2 [formerly 49381ac481] [formerly 3f35c335c9 [formerly 1cdd5eab835f2df85f8ebc82d0bea79bca3977da]]]]]
Former-commit-id: 3f35c335c9
Former-commit-id: d8d894a7ca [formerly 971c4d5184] [formerly c34cc88aa8] [formerly ae11e6119e111f4cea6a6b76270f3d312e215a51 [formerly afbfb22a6fac492f6776c223cc090e8fa76b92f2] [formerly c34cc88aa8 [formerly 17a28bf292]]]
Former-commit-id: 6f7f60be40d9aa8bc4c82d1c03ef74a16096a6af [formerly fb9bda56bac64601c19ee19d27b02d91a5e94209] [formerly eacb9a3696 [formerly c292d1bdc0]]
Former-commit-id: eacb9a3696
Former-commit-id: e8ed9affda
|
2013-08-12 17:37:15 -05:00 |
|
Nate Jensen
|
d4ede7df42
|
Issue #2142 more removing of dependencies from common plugins to edex.common
Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f
Former-commit-id: 285ed9898f [formerly c137e92198] [formerly 23802cfe02] [formerly 23802cfe02 [formerly 28c79d0a56]] [formerly 285ed9898f [formerly c137e92198] [formerly 23802cfe02] [formerly 23802cfe02 [formerly 28c79d0a56]] [formerly c2bf2163d9 [formerly 23802cfe02 [formerly 28c79d0a56] [formerly c2bf2163d9 [formerly 2342170ce4cf51f12759afa26fc5af46f35c6188]]]]]
Former-commit-id: c2bf2163d9
Former-commit-id: 1b28e40119 [formerly 342649b95b] [formerly 2117ec71c6] [formerly 68c2e702d47956d029ed2cace2173fd5b8c0e205 [formerly 80525ffd198786b7cfb596c35ca6de95bc0f8008] [formerly 2117ec71c6 [formerly 018845db8f]]]
Former-commit-id: ef3a91ea855433ef6a622d648cd60e591018d623 [formerly a40c49a988ae1f533493b9287fcce9665cb4594f] [formerly 3801d84a2f [formerly f0a8895a98]]
Former-commit-id: 3801d84a2f
Former-commit-id: 90f625f6f9
|
2013-08-12 15:41:39 -05:00 |
|
Richard Peter
|
7279b65e3b
|
Merge "Issue #2224 Changes to have DataSet in configuration." into development
Former-commit-id: 37719d8cd5 [formerly 201004e203] [formerly 5548ae76b1] [formerly 5548ae76b1 [formerly d8124958b5]] [formerly 37719d8cd5 [formerly 201004e203] [formerly 5548ae76b1] [formerly 5548ae76b1 [formerly d8124958b5]] [formerly 2de533cbbf [formerly 5548ae76b1 [formerly d8124958b5] [formerly 2de533cbbf [formerly d4a46b8283ac0cb47f62c43b999d7f119161e08d]]]]]
Former-commit-id: 2de533cbbf
Former-commit-id: 58a76b8675 [formerly 6dd74d080f] [formerly e9651a43ed] [formerly 923b9cb75a958ac3d3d1300ef0f46aa48a1ef6c6 [formerly 36f4d2af4006b315ff6170d430184188400680b2] [formerly e9651a43ed [formerly 4605595354]]]
Former-commit-id: 8de40bd0a1b45edd78e9bec4864461b1610b6b19 [formerly 7b7126e4a52616c3c982eea2f26e9664b76e7c1b] [formerly 35dec4295c [formerly 96336e3fa3]]
Former-commit-id: 9224cf15cf5d20ee45c73ef789243cd9cb8df9c3 [formerly 35dec4295c]
Former-commit-id: dda77cc9e4
|
2013-08-12 15:01:51 -05:00 |
|
Nate Jensen
|
9f6e6470da
|
Merge "Issue #2142 remove some uf.common dependencies on edex.common" into development
Former-commit-id: e707a0f25e [formerly 04d2a4741d] [formerly 1473d04e25] [formerly 1473d04e25 [formerly 82472058e9]] [formerly e707a0f25e [formerly 04d2a4741d] [formerly 1473d04e25] [formerly 1473d04e25 [formerly 82472058e9]] [formerly de38280317 [formerly 1473d04e25 [formerly 82472058e9] [formerly de38280317 [formerly 9e3b68a2e0ed6dcc63c5d2cace84c0fa3cadb521]]]]]
Former-commit-id: de38280317
Former-commit-id: 770f2f3434 [formerly 5d26df965e] [formerly 65c7c9e9b3] [formerly f850741a3f8f1947bed73d691a9b051b25e99bfd [formerly fbcdcf125155de037dae9b094e3b3d3c7c63fb4c] [formerly 65c7c9e9b3 [formerly f6c4ec164f]]]
Former-commit-id: a0584c6c4135f79690f596c499604496467870a6 [formerly 705ac5bcd11eac9567339f2706f155daa3fff4cd] [formerly a80ab51f46 [formerly 5b096c5524]]
Former-commit-id: a80ab51f46
Former-commit-id: f349600446
|
2013-08-12 14:16:29 -05:00 |
|
Ben Steffensmeier
|
092370f7f3
|
Issue #2245 make DataTimeCompatible Java 6 compatible.
Former-commit-id: 31da6c1dfc [formerly 62961949ba] [formerly 00f61c4858] [formerly 00f61c4858 [formerly 67c84f2fb8]] [formerly 31da6c1dfc [formerly 62961949ba] [formerly 00f61c4858] [formerly 00f61c4858 [formerly 67c84f2fb8]] [formerly 46c3413805 [formerly 00f61c4858 [formerly 67c84f2fb8] [formerly 46c3413805 [formerly e32655d3daef131c451d972c7b2747b01e49d840]]]]]
Former-commit-id: 46c3413805
Former-commit-id: a1cd38eb29 [formerly f80b7d3112] [formerly 16dd725cc1] [formerly f225299e848ef463057c511e737b4280ce6ddb3d [formerly 8897a82fdb7c4ccf99db2fe277299859be6243af] [formerly 16dd725cc1 [formerly 64b1d5d9dd]]]
Former-commit-id: 828ce807bdcb97cd9c2f1b13679354b6d48de4be [formerly f2ca707dd86aa8999cff7c997ec48dba8cd6c9b9] [formerly 0ab1fb6e3c [formerly bf58a91f2d]]
Former-commit-id: 0ab1fb6e3c
Former-commit-id: cdcd9bdd10
|
2013-08-12 13:43:43 -05:00 |
|
Roger Ferrel
|
03d54b6428
|
Issue #2224 Changes to have DataSet in configuration.
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8
Former-commit-id: fef46c4cdb [formerly 09360f30c5] [formerly 705a3482f8] [formerly 705a3482f8 [formerly 1863d4d65b]] [formerly fef46c4cdb [formerly 09360f30c5] [formerly 705a3482f8] [formerly 705a3482f8 [formerly 1863d4d65b]] [formerly 3ecf95b18a [formerly 705a3482f8 [formerly 1863d4d65b] [formerly 3ecf95b18a [formerly de48fa389414c87ba557b70a480ce6b45144f4aa]]]]]
Former-commit-id: 3ecf95b18a
Former-commit-id: 9320228a35 [formerly 3ff13b5a3a] [formerly 8884343d89] [formerly 2f51e964a65aed372360af8880d384fbaf8d77c5 [formerly d6bebdca540bfacd287d4ffd9f21c25794c91d4f] [formerly 8884343d89 [formerly 3d9be94e7e]]]
Former-commit-id: 73aab37499fd3b5e7b03bb93074a91a9eac0d98b [formerly 51ddb755a5783a79e40ea7bc4708a317725db50b] [formerly 9dd8173991 [formerly e51bf3559c]]
Former-commit-id: 9dd8173991
Former-commit-id: 7678e266b8
|
2013-08-12 12:50:12 -05:00 |
|
Nate Jensen
|
e86484c272
|
Issue #2142 remove some uf.common dependencies on edex.common
Change-Id: I327d9c6a184c2a9b422c02a39a2268459775a887
Former-commit-id: cdf60409ea [formerly 525666a23f] [formerly 2f641b40d7] [formerly 2f641b40d7 [formerly 94096b8f65]] [formerly cdf60409ea [formerly 525666a23f] [formerly 2f641b40d7] [formerly 2f641b40d7 [formerly 94096b8f65]] [formerly 48758e64ef [formerly 2f641b40d7 [formerly 94096b8f65] [formerly 48758e64ef [formerly c0c65319cd731aea51f730f700b0fda3c6992d38]]]]]
Former-commit-id: 48758e64ef
Former-commit-id: de1433347f [formerly f3618a3bca] [formerly f69d155d26] [formerly e99a9aee3cff909ebfef0a655f4e215a32a0265d [formerly 7f46154e70296dfe6b057533331f4761d699edc2] [formerly f69d155d26 [formerly ce0c8f3259]]]
Former-commit-id: 9b906a3e52b98513f350fc051fb2692de0e118e2 [formerly 9537addcd08e6d8d2c723dbbf79e893f985eec4a] [formerly 4ee212306e [formerly 4bb302cd5c]]
Former-commit-id: 4ee212306e
Former-commit-id: 8d9aeceb45
|
2013-08-12 12:47:51 -05:00 |
|
Greg Armendariz
|
cb434f3e6e
|
Merge "Issue #2254 - Fix the nightly automated junit tests" into development
Former-commit-id: 581d602611 [formerly 8ac14d0f1b] [formerly 773a7a4903] [formerly 773a7a4903 [formerly 1386598257]] [formerly 581d602611 [formerly 8ac14d0f1b] [formerly 773a7a4903] [formerly 773a7a4903 [formerly 1386598257]] [formerly 594198b5a5 [formerly 773a7a4903 [formerly 1386598257] [formerly 594198b5a5 [formerly 347fe4615e9902892a95f13d13cfd8c0bcd7c39d]]]]]
Former-commit-id: 594198b5a5
Former-commit-id: 60f07b0f41 [formerly 98f05beab6] [formerly 20cffb4cad] [formerly d60853a20a56f8a35a0563a53254b5e2e1681b58 [formerly a35a78e5eda85ce674a232de597ca6fd183a8a1f] [formerly 20cffb4cad [formerly 3c0c7ee56b]]]
Former-commit-id: 8de57427a8d98b8cbde0830dcdf0a1ebb036ce27 [formerly f75a50c2b9aeaade8dc34ae40207901a69c637dd] [formerly 792f31fbce [formerly 84e38e55c7]]
Former-commit-id: 792f31fbce
Former-commit-id: aaab00ce8b
|
2013-08-12 12:25:17 -05:00 |
|
David Gillingham
|
2fae08f8f3
|
Issue #2162: Add performance logging for GFE edit area query evaluation.
Change-Id: I916750fd00549dc53b1dd645792c04f4f63aa338
Former-commit-id: c6a93b13b9 [formerly 11384d2198] [formerly ed39a866f0] [formerly ed39a866f0 [formerly 07312fe01f]] [formerly c6a93b13b9 [formerly 11384d2198] [formerly ed39a866f0] [formerly ed39a866f0 [formerly 07312fe01f]] [formerly 98f48e5a64 [formerly ed39a866f0 [formerly 07312fe01f] [formerly 98f48e5a64 [formerly 7d24f69078e324c56db448f293d3094df83f5c34]]]]]
Former-commit-id: 98f48e5a64
Former-commit-id: 9106c10228 [formerly ef8d1ab050] [formerly ffa45d26d9] [formerly 2b5cb0ec0ee443c2509e1c3493e4f9a890630643 [formerly 0527b1c234a834d22bfd7b3815bbcd2f2a5ee8ef] [formerly ffa45d26d9 [formerly 0b8a48b12e]]]
Former-commit-id: 5621164380982838c8b50f3ab0f4b5bea94c58be [formerly 23d77b644b9e924392294d072039d0266bf858c7] [formerly 98fdc5d1a1 [formerly 235df668a6]]
Former-commit-id: 98fdc5d1a1
Former-commit-id: 1134f407f6
|
2013-08-12 12:18:02 -05:00 |
|
Nate Jensen
|
4c5cc759ab
|
Merge "Issue #2245 Make all DataTime comparisons consistent. Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d" into development
Former-commit-id: 88a6d31464 [formerly d4dbb8fe98] [formerly 81510bc3b7] [formerly 81510bc3b7 [formerly 9f0698fe75]] [formerly 88a6d31464 [formerly d4dbb8fe98] [formerly 81510bc3b7] [formerly 81510bc3b7 [formerly 9f0698fe75]] [formerly c5b96690ce [formerly 81510bc3b7 [formerly 9f0698fe75] [formerly c5b96690ce [formerly 971df482819466e48efcbc3a1b01eab88687436a]]]]]
Former-commit-id: c5b96690ce
Former-commit-id: bc3d46a262 [formerly b886cddc80] [formerly 0261071228] [formerly 1f7740f42d02cfc0968a0d1cb97b7d4aa92cad9b [formerly a8203aeffc85324d517d20a945883c7a079b265e] [formerly 0261071228 [formerly b18fa88aaf]]]
Former-commit-id: 485d5dbad65b01405438a760b28c9b67fc545388 [formerly ce4493bc39d39b4651d356d7dccccd406b437835] [formerly 2ba81e806a [formerly 1afec6d94d]]
Former-commit-id: 586f9626d443eac177f0507be917ddfa643c9e43 [formerly 2ba81e806a]
Former-commit-id: 30b8856941
|
2013-08-12 12:06:53 -05:00 |
|
Ben Steffensmeier
|
d53e012fac
|
Issue #2245 Make all DataTime comparisons consistent.
Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d
Former-commit-id: 3bf313eec4 [formerly e39f55eeb7] [formerly 7e65ad5fe8] [formerly 7e65ad5fe8 [formerly 479f72bc10]] [formerly 3bf313eec4 [formerly e39f55eeb7] [formerly 7e65ad5fe8] [formerly 7e65ad5fe8 [formerly 479f72bc10]] [formerly 9901e7a622 [formerly 7e65ad5fe8 [formerly 479f72bc10] [formerly 9901e7a622 [formerly b175ec81e61f18b42432e0245cddb953fbc5963f]]]]]
Former-commit-id: 9901e7a622
Former-commit-id: 2d022c7a2a [formerly 4376d4c066] [formerly 98dab7a5bd] [formerly e0373cd18bba0080693bef3ae427df5b11cf5875 [formerly 9bb59859513212d7b568900c9fea7ec4afdb0e0a] [formerly 98dab7a5bd [formerly 5071cf2fce]]]
Former-commit-id: d48452b7fc55e29aa288e133509d2058fe13a83c [formerly 21724cc18fe4234e4dfd9b24a7136c0658599635] [formerly 23e244e520 [formerly 2c2b4c6c41]]
Former-commit-id: 23e244e520
Former-commit-id: e8923fc949
|
2013-08-12 11:37:51 -05:00 |
|
Greg Armendariz
|
749e9a2724
|
Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into development
Former-commit-id: c8c6ff0fc8 [formerly 949e3974ef] [formerly ab41d0cdb6] [formerly ab41d0cdb6 [formerly 5ea53e1c0f]] [formerly c8c6ff0fc8 [formerly 949e3974ef] [formerly ab41d0cdb6] [formerly ab41d0cdb6 [formerly 5ea53e1c0f]] [formerly 487b751143 [formerly ab41d0cdb6 [formerly 5ea53e1c0f] [formerly 487b751143 [formerly a978af636454b1c1ef5287869de3b91ceac52ee1]]]]]
Former-commit-id: 487b751143
Former-commit-id: 88d91e2359 [formerly 99315891ce] [formerly 84360a83de] [formerly 09ed222e6c5ba8c9b7de0d0eb2dbf27dc953609f [formerly b1c84fa3b3553a3c0e0d8722e08ad6ea8340df09] [formerly 84360a83de [formerly fd306c44bd]]]
Former-commit-id: d0f39335270dea0c2032e23156ef4f139ba25c64 [formerly e853ba06748f435e74caa2c9b1350aa8d110c022] [formerly 65d727103d [formerly 488ad3b167]]
Former-commit-id: 65d727103d
Former-commit-id: 8c073c655e
|
2013-08-12 11:14:03 -05:00 |
|
Richard Peter
|
8392c84fe1
|
Merge "Issue #2222 Changes to allow display of all selected data." into development
Former-commit-id: 1daa9655fd [formerly e61f9667c6] [formerly bb2dfdbcce] [formerly bb2dfdbcce [formerly b6c34162c6]] [formerly 1daa9655fd [formerly e61f9667c6] [formerly bb2dfdbcce] [formerly bb2dfdbcce [formerly b6c34162c6]] [formerly b89bb1e8a0 [formerly bb2dfdbcce [formerly b6c34162c6] [formerly b89bb1e8a0 [formerly 957ff1720c6bc80372c0cdb44b95e628e7dbbdd2]]]]]
Former-commit-id: b89bb1e8a0
Former-commit-id: 061946cc81 [formerly 76acb0349e] [formerly 6d713faf72] [formerly b349c94a67cb2346b12e4df550786f8dc0a88d9a [formerly 5df3d208a95eb5996e46425cd66aab9d4d336f54] [formerly 6d713faf72 [formerly a3895de934]]]
Former-commit-id: 8ad2aa066c20a5630b42e9f8f169656d316c1aad [formerly ca177e3ef17f81e8c3d8ba4ae26293c4378c2104] [formerly 2608077df4 [formerly f820e819b9]]
Former-commit-id: dd4e6b4eefd4066f3833937e81717c2184991300 [formerly 2608077df4]
Former-commit-id: c4ea5f4964
|
2013-08-12 11:09:55 -05:00 |
|
Nate Jensen
|
ffda586c9d
|
Merge "Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base" into development
Former-commit-id: a69447f1c1 [formerly 5fafd2f64e] [formerly ba4ca59667] [formerly ba4ca59667 [formerly 564c26361f]] [formerly a69447f1c1 [formerly 5fafd2f64e] [formerly ba4ca59667] [formerly ba4ca59667 [formerly 564c26361f]] [formerly 2245b2f7a6 [formerly ba4ca59667 [formerly 564c26361f] [formerly 2245b2f7a6 [formerly 187dd7ebbada6ef7d2d6cdddd9d9354fc73c0fc8]]]]]
Former-commit-id: 2245b2f7a6
Former-commit-id: 0677044a56 [formerly d9cf3a6d3f] [formerly e82ecb755a] [formerly d6a4f2c44e701547a90195dd790e909626239912 [formerly a5bea3938a36d8f40e4ad78c67ad582ea9a1ec66] [formerly e82ecb755a [formerly 47e3e698de]]]
Former-commit-id: cc39e382f15743cce7ed74415bac7c49b3ae2ac9 [formerly 1a95638984f5e65b52cbad676a4f8a5b780690e7] [formerly 2c1c96016b [formerly 292d9e92a2]]
Former-commit-id: 658d89bc6711a0224840a623e066ea7ded4f6a4f [formerly 2c1c96016b]
Former-commit-id: 50db03ebae
|
2013-08-12 09:49:22 -05:00 |
|
Mike Duff
|
40dcbcdf41
|
Issue #2254 - Fix the nightly automated junit tests
Change-Id: I8e595c097682ddd01cebf23fedbe5380d078085a
Former-commit-id: aa0ec73726 [formerly 5a3578accd] [formerly f25d52e1e7] [formerly f25d52e1e7 [formerly 9558b20e7c]] [formerly aa0ec73726 [formerly 5a3578accd] [formerly f25d52e1e7] [formerly f25d52e1e7 [formerly 9558b20e7c]] [formerly 832e61f938 [formerly f25d52e1e7 [formerly 9558b20e7c] [formerly 832e61f938 [formerly 96eddd84c4f1287fa56e5356831961209c76331a]]]]]
Former-commit-id: 832e61f938
Former-commit-id: d72459e5c1 [formerly 3ca0a91246] [formerly 7d5413647c] [formerly 88069ffd99e2788d462ebbe1024a19bcbd14ace4 [formerly 00a0bf66e1141f15efb1bb46edae8f4643e7d7c9] [formerly 7d5413647c [formerly 7b36ba1a19]]]
Former-commit-id: eb5cb3186af4e587b6cb07f5832fb2abcf695292 [formerly bf3693d59197a0504a6680fce6f20c902823b8b0] [formerly d081e799c8 [formerly 93ce81f949]]
Former-commit-id: d081e799c8
Former-commit-id: b8ec9f07fb
|
2013-08-12 09:25:21 -05:00 |
|
Brad Gonzales
|
ec4846f2c7
|
Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals.
Change-Id: If1037781d8fbf0e3a88556ef4401fb77621187d7
Former-commit-id: d1986224c7 [formerly b0779c9b4f] [formerly 5ebe8ee093] [formerly 5ebe8ee093 [formerly 21c1b35c8b]] [formerly d1986224c7 [formerly b0779c9b4f] [formerly 5ebe8ee093] [formerly 5ebe8ee093 [formerly 21c1b35c8b]] [formerly d5ee61dc2b [formerly 5ebe8ee093 [formerly 21c1b35c8b] [formerly d5ee61dc2b [formerly 9ddb76125f51eb0ea73b7bb54a77e84fb32349e4]]]]]
Former-commit-id: d5ee61dc2b
Former-commit-id: 00e186f8c3 [formerly 030b466b8a] [formerly 2468077e8b] [formerly 74841bf6ecdd2dbf33d0894a351d0594009af96f [formerly 1f321bfc5353c97375cf29fe6b5a3b7362000fbf] [formerly 2468077e8b [formerly 780062acf3]]]
Former-commit-id: 6149fa84685e5fec3f750fae71c6f35fd234aaac [formerly d4831539fc28c09ade22bc75769737d060ad4fe3] [formerly b6745768de [formerly e642fb330f]]
Former-commit-id: 1f62eb7e99f1f13ed0a053b59eceaa3f47c99503 [formerly b6745768de]
Former-commit-id: 6242314838
|
2013-08-09 15:42:38 -05:00 |
|
Max Schenkelberg
|
7d23d045d6
|
Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f
Former-commit-id: 23520d6f7a [formerly cb1d5d1c5b] [formerly b95a96f4c9] [formerly b95a96f4c9 [formerly 0f3c791120]] [formerly 23520d6f7a [formerly cb1d5d1c5b] [formerly b95a96f4c9] [formerly b95a96f4c9 [formerly 0f3c791120]] [formerly d79cfe8ad1 [formerly b95a96f4c9 [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: f2ff85b4e5 [formerly cc6950107f] [formerly 4fdb3c8306] [formerly cc8e0cdf31112699e7c47aa937cde736cb0f0669 [formerly 0d46128ba8af16237227239c716ce61a2bd99042] [formerly 4fdb3c8306 [formerly 75c95e83ef]]]
Former-commit-id: fad90e489d422a21f39e385373035ceeba54e262 [formerly 6330e8d0028065ee6a7110c911ee4f47033f7729] [formerly 5167a52b65 [formerly 2178fac70d]]
Former-commit-id: 5167a52b65
Former-commit-id: 750f71ea98
|
2013-08-09 14:24:49 -05:00 |
|
Ben Steffensmeier
|
b10ab7c06d
|
Issue #1869 Fix bufrua point data stationId.
Former-commit-id: 6e9955ac74 [formerly c88e432d04] [formerly bf2dfbaca8] [formerly bf2dfbaca8 [formerly 9e799b4df1]] [formerly 6e9955ac74 [formerly c88e432d04] [formerly bf2dfbaca8] [formerly bf2dfbaca8 [formerly 9e799b4df1]] [formerly d1d3491aaf [formerly bf2dfbaca8 [formerly 9e799b4df1] [formerly d1d3491aaf [formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]]]]
Former-commit-id: d1d3491aaf
Former-commit-id: cd6722b9f0 [formerly b357fb0018] [formerly 20a7ba8e69] [formerly 42f837799800f3aef5294905384a9cacfcabe224 [formerly 5ee45ce1a1eec70e460a54a9e98781bb2db78baa] [formerly 20a7ba8e69 [formerly 761cb47f73]]]
Former-commit-id: 2818a1bc4c4a07741684ee74a8a0e5816c568d5f [formerly f26d6075dc3483c9d4f7cfcf7de81d03d46f8bf5] [formerly 7a2cde76d5 [formerly b5332f3eb5]]
Former-commit-id: 7a2cde76d5
Former-commit-id: 451acac93b
|
2013-08-09 13:00:18 -05:00 |
|
David Gillingham
|
916c2b790a
|
Issue #1856: Fix HazardRecovery to work in SimulatedTime mode.
Change-Id: I811f9a87ac57c3682f282c45f5b380d7773c805b
Former-commit-id: 484aa6500b [formerly b498e52510] [formerly beb78ae48d] [formerly beb78ae48d [formerly 5743aebcbe]] [formerly 484aa6500b [formerly b498e52510] [formerly beb78ae48d] [formerly beb78ae48d [formerly 5743aebcbe]] [formerly 640452837c [formerly beb78ae48d [formerly 5743aebcbe] [formerly 640452837c [formerly db77c4ea478fbaaf9a9e1b64d9df008874a71548]]]]]
Former-commit-id: 640452837c
Former-commit-id: dc0533ff54 [formerly eb1b2bda8b] [formerly d42ae1701d] [formerly 032e8cd1c48472d1cfc3423d11252fd3c67b3c0b [formerly a67e0e6bd7abdc943eb4fe37a1a2d56de8d62a8c] [formerly d42ae1701d [formerly f0fbc3766d]]]
Former-commit-id: 91f04c881dac2be9f0c74b469ea2bb858f815ab8 [formerly 3bf5fb1bfb20daf44758c48db5b90f963e042f48] [formerly 969ae1bcf0 [formerly feb37bc4f1]]
Former-commit-id: 969ae1bcf0
Former-commit-id: 09c19d25ea
|
2013-08-09 10:48:13 -05:00 |
|
Bryan Kowal
|
e32180f21c
|
Issue #2252 - remove file accidentally re-added by the merge.
Former-commit-id: d0395ba930 [formerly 09546736f2] [formerly 0ba5c54688] [formerly 0ba5c54688 [formerly 3bdbf6d0cc]] [formerly d0395ba930 [formerly 09546736f2] [formerly 0ba5c54688] [formerly 0ba5c54688 [formerly 3bdbf6d0cc]] [formerly 5c6258e8c1 [formerly 0ba5c54688 [formerly 3bdbf6d0cc] [formerly 5c6258e8c1 [formerly 0462ccb18fdd17b2d25a2c22b547d052ffe33aca]]]]]
Former-commit-id: 5c6258e8c1
Former-commit-id: a4f1188451 [formerly 0d1cf60269] [formerly 4f0b9b4cf3] [formerly 2d51c3fdaf472ef85e2fd34b39b85ae30168f339 [formerly e0a4220ad22d5843e5444411defaa80103a9ae61] [formerly 4f0b9b4cf3 [formerly a35cbbf85c]]]
Former-commit-id: 07b2868bd7866e783888e40f7730f6165902d428 [formerly 2b66ee842553f164c837f755752a8a1ecc75a155] [formerly 6a24eb7f9a [formerly e5727ed745]]
Former-commit-id: 6a24eb7f9a
Former-commit-id: ab7b25bd69
|
2013-08-08 18:38:21 -05:00 |
|