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
|
ef171c1194
|
Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 19a4a52c38 [formerly 63da19f472] [formerly c267c5a08f] [formerly c267c5a08f [formerly 86d42ed603]] [formerly 19a4a52c38 [formerly 63da19f472] [formerly c267c5a08f] [formerly c267c5a08f [formerly 86d42ed603]] [formerly 862069dfd3 [formerly c267c5a08f [formerly 86d42ed603] [formerly 862069dfd3 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]]]
Former-commit-id: 862069dfd3
Former-commit-id: fb80617f10 [formerly 9f43d8e4b2] [formerly 237ada7b8b] [formerly bb8dbd96713298bfa5ca1f7f75f78402f4999166 [formerly 2ae63270ca0112aca619a0c7564fa8a1154ef4f9] [formerly 237ada7b8b [formerly c0d495d9c3]]]
Former-commit-id: 024371d621f82f08c059909977cba998bed51681 [formerly 1a965b16ce71e4ece17a9ac8efbc506a1d823b59] [formerly 68eade49a2 [formerly 9489565efb]]
Former-commit-id: 68eade49a2
Former-commit-id: 7f36cf564b
|
2014-02-27 13:46:47 -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 |
|
Steve Harris
|
81ee61c7d7
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 53a8735f7c [formerly 26959b4fbb] [formerly 182c16067c] [formerly 182c16067c [formerly 5218a4d1e6]] [formerly 53a8735f7c [formerly 26959b4fbb] [formerly 182c16067c] [formerly 182c16067c [formerly 5218a4d1e6]] [formerly 99f53876d7 [formerly 182c16067c [formerly 5218a4d1e6] [formerly 99f53876d7 [formerly 2f2339f4c12e1862d27a8dda65264f353aed6ac6]]]]]
Former-commit-id: 99f53876d7
Former-commit-id: e6daf25e7a [formerly 01c53daa79] [formerly b8afc0e5f7] [formerly e1d1e77d9b0d88f509119f0d926f7e5651126f3c [formerly c886e6144ad2cced9b56124b623107c6b77c407f] [formerly b8afc0e5f7 [formerly 0d9abc724c]]]
Former-commit-id: 1499102efd21221781e76eb8716f49cc7ff91ea0 [formerly dbca9ddc73bb956eca322153c5567ad2d57caa2b] [formerly 40e335fdf7 [formerly 1c547c6a96]]
Former-commit-id: 40e335fdf7
Former-commit-id: 078b2d659b
|
2014-02-27 10:02:43 -06:00 |
|
Nate Jensen
|
8734833f89
|
Merge "Issue #2312 Fix file dialog input on export image dialog." into development
Former-commit-id: a6cc8f712c [formerly 6e94f1dbbf] [formerly 414cc002b1] [formerly 414cc002b1 [formerly 71d494eb34]] [formerly a6cc8f712c [formerly 6e94f1dbbf] [formerly 414cc002b1] [formerly 414cc002b1 [formerly 71d494eb34]] [formerly d1ec11d932 [formerly 414cc002b1 [formerly 71d494eb34] [formerly d1ec11d932 [formerly 4c4325675377cd170468a0c3dbe4632f5330227e]]]]]
Former-commit-id: d1ec11d932
Former-commit-id: 5bc1ab2c75 [formerly b13f098262] [formerly 80ef0dc055] [formerly 8a79094d010b8ea798e7462c5fd3beaaecb30189 [formerly 91dfb6da3c8d39b1c96ec2b8fcbe4d9047893d20] [formerly 80ef0dc055 [formerly 9a39867de4]]]
Former-commit-id: 7120371b3f9e7de41f3509ad917070ff0c5cb4ba [formerly 89d71e83dded30277253cca70c8d0589ff95d762] [formerly 445fd40303 [formerly ee788777ad]]
Former-commit-id: 445fd40303
Former-commit-id: e00bb786ce
|
2014-02-27 09:10:07 -06:00 |
|
Lee Venable
|
643f0b2ec6
|
Issue #2795 - added code to check for null images.
Former-commit-id: eeab8d5612 [formerly 191ca5f9ca] [formerly 5546b537cf] [formerly 5546b537cf [formerly 0c7395d423]] [formerly eeab8d5612 [formerly 191ca5f9ca] [formerly 5546b537cf] [formerly 5546b537cf [formerly 0c7395d423]] [formerly 49530206f4 [formerly 5546b537cf [formerly 0c7395d423] [formerly 49530206f4 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]]]
Former-commit-id: 49530206f4
Former-commit-id: 3d5ff42212 [formerly da795bce98] [formerly 35f6f35186] [formerly 00dbcb817973cf6acef294e116bfc6161bed182a [formerly 3612dfd65a9bb45c3bd962d6f9fe927cf481321f] [formerly 35f6f35186 [formerly facc67e6b5]]]
Former-commit-id: 66e2b5df5cf23400e6c1cb9050e81c80e9a4d5d5 [formerly c2f13c1ac7e77c67d20701ab555a5c3013497418] [formerly 54fa6c12b3 [formerly 3932c3f02f]]
Former-commit-id: 0062d2e23116e1cf2bb3b18cbff93d27d4854fd9 [formerly 54fa6c12b3]
Former-commit-id: b9455bcd94
|
2014-02-26 15:50:46 -06:00 |
|
Ben Steffensmeier
|
9a158625ee
|
Issue #2711 Use level factory more.
Former-commit-id: ae2eeed05a [formerly 3d9b435262] [formerly 1069ef8d67] [formerly 1069ef8d67 [formerly d7a3ae4fdb]] [formerly ae2eeed05a [formerly 3d9b435262] [formerly 1069ef8d67] [formerly 1069ef8d67 [formerly d7a3ae4fdb]] [formerly 3da086b71f [formerly 1069ef8d67 [formerly d7a3ae4fdb] [formerly 3da086b71f [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]]]
Former-commit-id: 3da086b71f
Former-commit-id: 4254a612a3 [formerly 4d1276def2] [formerly 29f9a87085] [formerly 279b216bac9af203a8a3ac5e355661d270ff4a01 [formerly 81be956862611f9499f1e2716026d69eacf91f27] [formerly 29f9a87085 [formerly f45646ae91]]]
Former-commit-id: ccf87e2c9b0948ca110ac32cb48234059eec3f13 [formerly ac87ec8ef2e20c2296cc8f89005a894dbccc5be1] [formerly 0dd62678f2 [formerly 3a5f655ea4]]
Former-commit-id: 0dd62678f2
Former-commit-id: b4f8468f87
|
2014-02-26 15:10:40 -06:00 |
|
Ben Steffensmeier
|
ea621ce564
|
Issue #2312 Fix file dialog input on export image dialog.
Former-commit-id: d453b1e8e5 [formerly ee8f345cb2] [formerly 2fd8351874] [formerly 2fd8351874 [formerly e1dc75f97a]] [formerly d453b1e8e5 [formerly ee8f345cb2] [formerly 2fd8351874] [formerly 2fd8351874 [formerly e1dc75f97a]] [formerly 6d0a78e233 [formerly 2fd8351874 [formerly e1dc75f97a] [formerly 6d0a78e233 [formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]]]]
Former-commit-id: 6d0a78e233
Former-commit-id: b311c25446 [formerly 88fd930b77] [formerly 058652febe] [formerly accfed78e2b2eabcba243757ae0c4cbbaa65c529 [formerly 33d269bf45b5c7555173d073fc5eeb1dc2b0f237] [formerly 058652febe [formerly 2d11421854]]]
Former-commit-id: a35d8309405026c1fb5da393ea79c35b09c36e78 [formerly 81b2f08a2787faa302dad147e59e1ded781e0f34] [formerly 5fd6a533b8 [formerly 542c8ae3a1]]
Former-commit-id: 5fd6a533b8
Former-commit-id: b830f753bb
|
2014-02-26 14:57:59 -06:00 |
|
Lee Venable
|
e9ec1bf6dd
|
Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: f77d8652e7 [formerly d74b2c0118] [formerly bb4b034375] [formerly bb4b034375 [formerly 94cede8153]] [formerly f77d8652e7 [formerly d74b2c0118] [formerly bb4b034375] [formerly bb4b034375 [formerly 94cede8153]] [formerly e0ee93bab3 [formerly bb4b034375 [formerly 94cede8153] [formerly e0ee93bab3 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 21d0d1cffd [formerly de2bff4d95] [formerly 91d419662c] [formerly 15812de463983f0f564b5ddf6b9b30cb0fe1f171 [formerly 08d8e41d0aefbc0220f2fd973374918a413db9bb] [formerly 91d419662c [formerly e0fbc02307]]]
Former-commit-id: 7f05dd753d2fd6da143053d7779ca00a3c12a70c [formerly 1802d5e972cbe43fc2263ca2317ab3d366a9edb6] [formerly 8d49130542 [formerly 316ba53e74]]
Former-commit-id: 8d49130542
Former-commit-id: b7ad39dab9
|
2014-02-26 13:21:58 -06:00 |
|
Lee Venable
|
d430c26e42
|
Merge "Issue #2652. Fixed issue with edex-text-ingest log." into development
Former-commit-id: 67ce83e3ef [formerly 7bdf0b7396] [formerly f58481dc6a] [formerly f58481dc6a [formerly 72f71bc000]] [formerly 67ce83e3ef [formerly 7bdf0b7396] [formerly f58481dc6a] [formerly f58481dc6a [formerly 72f71bc000]] [formerly 34191dc3dc [formerly f58481dc6a [formerly 72f71bc000] [formerly 34191dc3dc [formerly 0d1df7da4612a71195b4850b88b716f0d03acfe8]]]]]
Former-commit-id: 34191dc3dc
Former-commit-id: 4bdcbaa952 [formerly 715c69bd2a] [formerly f2db331c8e] [formerly 02e80af23853c9c130910a0bc5738544f25f6248 [formerly 256d29e07a25ae3241087bae47151c23f8e56c06] [formerly f2db331c8e [formerly b4b6cb655e]]]
Former-commit-id: 836a6be6e7218fe4b0b6b276328a576fa2eb5d5d [formerly f9b00185019f0cedee890ed8077158507020714a] [formerly 19e67bdb0c [formerly 23c2014393]]
Former-commit-id: 19e67bdb0c
Former-commit-id: 7972b72561
|
2014-02-25 15:53:14 -06:00 |
|
Brad Gonzales
|
26e707c5a7
|
Issue #2683 for java 1.7.0_51, added jdk-7u51-linux-i586.tar.gz and jdk-7u51-linux-x64.tar.gz
and removed jdk-7u40-linux-i586.tar.gz jdk-7u40-linux-x64.tar.gz. Updated the component.spec to the new version number.
Change-Id: I383d78b6b52a2e196aa01f81e157a4d49fd11ba3
Former-commit-id: a1c89ad3e0 [formerly e31b98bb85] [formerly 40a653867a] [formerly 40a653867a [formerly 4ccfe4f3c0]] [formerly a1c89ad3e0 [formerly e31b98bb85] [formerly 40a653867a] [formerly 40a653867a [formerly 4ccfe4f3c0]] [formerly cf9c22ac99 [formerly 40a653867a [formerly 4ccfe4f3c0] [formerly cf9c22ac99 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]]]]
Former-commit-id: cf9c22ac99
Former-commit-id: 46c020f61b [formerly 7c0db7ac7a] [formerly 1df77529c3] [formerly c84891f1fa1ae0c83f364553fe0a1da3f86bcfc0 [formerly ba481e4a842a84fed85e94eea66cb8cabf458c52] [formerly 1df77529c3 [formerly a24cbaf683]]]
Former-commit-id: d595bf0228a523896fe4c8beeb8c93e9c53eed61 [formerly 6b6559f6e56e17a95bf05ea409272e339f0bdebd] [formerly d1ef377ec0 [formerly 3780b24792]]
Former-commit-id: d1ef377ec0
Former-commit-id: a1a34a3558
|
2014-02-25 14:42:59 -06:00 |
|
Slav Korolev
|
8f1e5cad4b
|
Issue #2652. Fixed issue with edex-text-ingest log.
Former-commit-id: 4680f586c5 [formerly 6d4cf7476f] [formerly a34b1196b7] [formerly a34b1196b7 [formerly 5087a0154d]] [formerly 4680f586c5 [formerly 6d4cf7476f] [formerly a34b1196b7] [formerly a34b1196b7 [formerly 5087a0154d]] [formerly bfa84e65ec [formerly a34b1196b7 [formerly 5087a0154d] [formerly bfa84e65ec [formerly 728e5b2d7ecad662e0c876533726d4bdd5c265d7]]]]]
Former-commit-id: bfa84e65ec
Former-commit-id: c2d3ed1df0 [formerly b8e48e1740] [formerly 0566c86a6c] [formerly b208ecbb086db6b8effae5c2d40021f9e2646294 [formerly fa4d07cf875d177a851b8a0990f11bc8ec215736] [formerly 0566c86a6c [formerly 40b4bf6e8e]]]
Former-commit-id: 27d5e98b85f65ba1661b41fe2b2b2f83e669f8e8 [formerly 12d59f30d6e7039021ded78217db65a4b236a048] [formerly 9dd91d63c1 [formerly 5e494af996]]
Former-commit-id: 9dd91d63c1
Former-commit-id: ea9b31b24b
|
2014-02-25 15:23:22 -05:00 |
|
Richard Peter
|
2480effc92
|
Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
Former-commit-id: 2e36a38a8b [formerly 2c433bb05c] [formerly 90b48e0393] [formerly 90b48e0393 [formerly 3735cd3ffe]] [formerly 2e36a38a8b [formerly 2c433bb05c] [formerly 90b48e0393] [formerly 90b48e0393 [formerly 3735cd3ffe]] [formerly b4e48698ed [formerly 90b48e0393 [formerly 3735cd3ffe] [formerly b4e48698ed [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]]]
Former-commit-id: b4e48698ed
Former-commit-id: 71e2d2b419 [formerly 85a16601ed] [formerly f803d557c2] [formerly b0d215d034018d9e9d510c01318ad3ed902e8b4f [formerly d78cc4dd432220d2d29a4c19ab555ecd83067517] [formerly f803d557c2 [formerly 66b271a550]]]
Former-commit-id: 516a199f1e43af010c05f3610d32bef2b9d8bc91 [formerly 5b87edac1a20018c339b438ff189f180ab2dc96a] [formerly e28b3bb5b9 [formerly e78e5a15b9]]
Former-commit-id: e28b3bb5b9
Former-commit-id: aac768e805
|
2014-02-25 12:34:38 -06:00 |
|
Brad Gonzales
|
62bd267aa4
|
Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.
Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22
Former-commit-id: eb26a5fff4 [formerly 39afe190e0] [formerly b6e2ce4b74] [formerly b6e2ce4b74 [formerly 783afb1585]] [formerly eb26a5fff4 [formerly 39afe190e0] [formerly b6e2ce4b74] [formerly b6e2ce4b74 [formerly 783afb1585]] [formerly 8b2b50baaf [formerly b6e2ce4b74 [formerly 783afb1585] [formerly 8b2b50baaf [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: 47caba6828 [formerly c364269fae] [formerly f57f472f6a] [formerly da76109010e2d969c0bb3f0c1daffe7163befcd6 [formerly 0b393405d83191a17ccf6537e803d672cbc79eae] [formerly f57f472f6a [formerly 5ce1939d01]]]
Former-commit-id: 975783355735b7d7b23f0f9936145f02963c3f15 [formerly 4945cd39a9cc275d1c7a6df8d10b99e4aea2962c] [formerly aa2d8b76a1 [formerly f4513d0e64]]
Former-commit-id: aa2d8b76a1
Former-commit-id: ac050068d5
|
2014-02-25 09:22:08 -06:00 |
|
Brian Clements
|
d00cc67ce3
|
Issue #2751 fixed webDAV path issue
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded
Former-commit-id: 1dfb43e9f1 [formerly 9597ce5cd9] [formerly 3f0e9d7a77] [formerly 3f0e9d7a77 [formerly eef242194a]] [formerly 1dfb43e9f1 [formerly 9597ce5cd9] [formerly 3f0e9d7a77] [formerly 3f0e9d7a77 [formerly eef242194a]] [formerly 3d365a4cd2 [formerly 3f0e9d7a77 [formerly eef242194a] [formerly 3d365a4cd2 [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: 3f903de2ea [formerly 408b834fc6] [formerly 1f5d296314] [formerly 758fd2063c231db2202ef62f2ebcb24dc96c3873 [formerly afda13c403f6099ee52fb2149ecc71798cd4f1b6] [formerly 1f5d296314 [formerly 473fcda0cf]]]
Former-commit-id: c35dc74dccd4394882a032f3fbc8adbaf35c4cfa [formerly 9c79444c16264820ee6b7c394c120d181facc068] [formerly 1001ef1ec2 [formerly a102e927b1]]
Former-commit-id: 1001ef1ec2
Former-commit-id: db0299b3e6
|
2014-02-25 09:17:36 -06:00 |
|
Nate Jensen
|
9b0ad516b3
|
Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
Former-commit-id: 1e8f320742 [formerly 055caba2bf] [formerly 8ef957d2f0] [formerly 8ef957d2f0 [formerly 279f05a1d5]] [formerly 1e8f320742 [formerly 055caba2bf] [formerly 8ef957d2f0] [formerly 8ef957d2f0 [formerly 279f05a1d5]] [formerly 060eafc272 [formerly 8ef957d2f0 [formerly 279f05a1d5] [formerly 060eafc272 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]]]
Former-commit-id: 060eafc272
Former-commit-id: eb3f351669 [formerly 308a560602] [formerly 2f58408036] [formerly 8413440f7a7a27f9948462ba4a3f090def238af1 [formerly 558be9d98a06c71a0e559cdc2b834c684467687f] [formerly 2f58408036 [formerly a5477ea272]]]
Former-commit-id: 95e888334af00a199703744801dbc8c92db591c0 [formerly bdc3cd1c4204b73ad5a45d101de019cdb7672ba6] [formerly caaffabda3 [formerly d9411eb382]]
Former-commit-id: caaffabda3
Former-commit-id: 8494f972d7
|
2014-02-24 16:17:20 -06:00 |
|
Nate Jensen
|
1dcbb3afa9
|
Issue #2830 sort TAF dataTimes so latest are retrieved
Former-commit-id: a6cc1d94ea [formerly a201d43d63] [formerly 230b8bf117] [formerly 230b8bf117 [formerly 8a00a419a1]] [formerly a6cc1d94ea [formerly a201d43d63] [formerly 230b8bf117] [formerly 230b8bf117 [formerly 8a00a419a1]] [formerly f353c44cc0 [formerly 230b8bf117 [formerly 8a00a419a1] [formerly f353c44cc0 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]]]
Former-commit-id: f353c44cc0
Former-commit-id: 90ac4ee193 [formerly 4d460d3a26] [formerly a97f5b5ff7] [formerly 2b376b3472dba6575517ad3cf26d30c175097016 [formerly 67f46ed66aeefd71f35b8ac193010ae9e960ed0b] [formerly a97f5b5ff7 [formerly 74329bcb89]]]
Former-commit-id: 758c29fdd69744794729104adfe80860f03243c9 [formerly 31bbfe66d1d6c2a45d0680feb24acf664d2ade63] [formerly 78c8f1a62c [formerly 02d2f0c713]]
Former-commit-id: 78c8f1a62c
Former-commit-id: 012037c1e6
|
2014-02-24 15:35:13 -06:00 |
|
Brian.Dyke
|
55615cdd00
|
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: af1aec8dde [formerly 9158806dd2] [formerly 363403fb34] [formerly 363403fb34 [formerly 2faab606e5]] [formerly af1aec8dde [formerly 9158806dd2] [formerly 363403fb34] [formerly 363403fb34 [formerly 2faab606e5]] [formerly 1a8a0b703e [formerly 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 26b98fb80d [formerly 6b1b6d38e3] [formerly 73a1c238f4] [formerly 42296588ba3dfa4fcd8427134926b0c727849a35 [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c] [formerly 73a1c238f4 [formerly 227131e5f1]]]
Former-commit-id: 2c378e9e28b03ef7052c734a063ef36b991058bb [formerly b22adde77eff6179b00b4c7389d58bbde1684f4b] [formerly 0bcf7c89b8 [formerly 38829b9014]]
Former-commit-id: 0bcf7c89b8
Former-commit-id: 9db7ca881a
|
2014-02-24 14:51:00 -05:00 |
|
Ron Anderson
|
e5ea095cae
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: ae2d13681c [formerly 049424e5f0] [formerly 45ccac0859] [formerly 45ccac0859 [formerly 4364e7497c]] [formerly ae2d13681c [formerly 049424e5f0] [formerly 45ccac0859] [formerly 45ccac0859 [formerly 4364e7497c]] [formerly 2db5f26840 [formerly 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]]]
Former-commit-id: 2db5f26840
Former-commit-id: f8bc18aa5e [formerly 5831f8d79e] [formerly 7d3af157f8] [formerly cfe1bb119cb0279993c54f4220010aa750c7fba5 [formerly a242c09c6983c820aa32c052d7deaed21a0982ec] [formerly 7d3af157f8 [formerly 3b2ea2d6ac]]]
Former-commit-id: b7db9851414c1c86d6612202b3a46a9608e0d31c [formerly 50ec6dfad53c87f1ad4174e64fdb142803fcaf62] [formerly 3c673caec2 [formerly f2b0cc20e8]]
Former-commit-id: 3c673caec2
Former-commit-id: 5eb76e8ed6
|
2014-02-24 13:46:48 -06:00 |
|
Nate Jensen
|
9613a96e71
|
Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
Former-commit-id: dd7b1c3fb2 [formerly 4af8a7f326] [formerly 98a6101cd3] [formerly 98a6101cd3 [formerly 2111109ce2]] [formerly dd7b1c3fb2 [formerly 4af8a7f326] [formerly 98a6101cd3] [formerly 98a6101cd3 [formerly 2111109ce2]] [formerly b1586f8603 [formerly 98a6101cd3 [formerly 2111109ce2] [formerly b1586f8603 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]]]
Former-commit-id: b1586f8603
Former-commit-id: 721e757ba4 [formerly 1837a83743] [formerly d6e9cb73f5] [formerly 998ad7e6b2810af55ce5f66f17134d1dbefaabfd [formerly 9d8fe1a0158253d440a5c43e42535da472859450] [formerly d6e9cb73f5 [formerly bf8bb95f51]]]
Former-commit-id: d8945cd678143540ae473077177d1ab9b37d67b0 [formerly 6f49258d52063f413dae43a0a944ac2785e75d66] [formerly da2a363550 [formerly 6979321635]]
Former-commit-id: da2a363550
Former-commit-id: 0d8cd5360a
|
2014-02-24 13:25:35 -06:00 |
|
Brian Clements
|
57b8d02520
|
Issue #2751 fixed leader transfer infinite loop, added event validation
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed
Former-commit-id: 23bd30f43d [formerly a173972437] [formerly 9217ba24c5] [formerly 9217ba24c5 [formerly 3f362519aa]] [formerly 23bd30f43d [formerly a173972437] [formerly 9217ba24c5] [formerly 9217ba24c5 [formerly 3f362519aa]] [formerly 386e9cc96a [formerly 9217ba24c5 [formerly 3f362519aa] [formerly 386e9cc96a [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 2625867f5f [formerly 743c6cd74b] [formerly 73cb7b7313] [formerly 4bd914b654b47f344aa489108cff94bff97c87ab [formerly 83e8dc39015b780c38746e7cdc688605acdb3a6e] [formerly 73cb7b7313 [formerly b9c9be4c4f]]]
Former-commit-id: acaef4647cd74e3de42310ba1b7b44028487db35 [formerly 65eb8626f8a0c635e873b499175028ece670e6f8] [formerly 48cfc3c933 [formerly 4abf737852]]
Former-commit-id: 48cfc3c933
Former-commit-id: fcc6c7f221
|
2014-02-24 13:19:07 -06:00 |
|
Dave Hladky
|
c10dc2254f
|
Issue #2469 Fixed default rules implementation
Former-commit-id: b81e92e5be [formerly d31708962b] [formerly f9c6a396f0] [formerly f9c6a396f0 [formerly 1d256bfcee]] [formerly b81e92e5be [formerly d31708962b] [formerly f9c6a396f0] [formerly f9c6a396f0 [formerly 1d256bfcee]] [formerly 45413d0db4 [formerly f9c6a396f0 [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]]]
Former-commit-id: 45413d0db4
Former-commit-id: 269e0e89f1 [formerly 05c81677d2] [formerly dc97eb7890] [formerly 0f8d74dd64c00ec1a5b3486e2d8603f3115e26b7 [formerly 3d6c4cab1cd2a6a85a35b82eb0d57119b5630f76] [formerly dc97eb7890 [formerly ff5a5961db]]]
Former-commit-id: 015b1f3ff118b7c4b625ab603434dcd278ff4b2a [formerly ca019feb8178be88e796a82d279fda02bcfa070a] [formerly e030ac65b2 [formerly 8a924bcc2c]]
Former-commit-id: e030ac65b2
Former-commit-id: 2ed6aabcb0
|
2014-02-24 13:06:52 -06:00 |
|
Ben Steffensmeier
|
dc53f8fd8d
|
Issue #2762 Use UCUM to format units so IRPixel formats correctly.
Former-commit-id: 0d30b5c723 [formerly 669b580920] [formerly f7c48b24bb] [formerly f7c48b24bb [formerly 9e5f7d90a0]] [formerly 0d30b5c723 [formerly 669b580920] [formerly f7c48b24bb] [formerly f7c48b24bb [formerly 9e5f7d90a0]] [formerly f8cc0e3d95 [formerly f7c48b24bb [formerly 9e5f7d90a0] [formerly f8cc0e3d95 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 1d90b64d3e [formerly 59c34458ff] [formerly 3c7e578000] [formerly 07e1b40e9623d7b60010b21a0242d026944df2ff [formerly 8c6b48d405e8efd0e175f4ea9f8f0320fd5743ea] [formerly 3c7e578000 [formerly a510abdb22]]]
Former-commit-id: 95e9b9c129ea1a2bad90f3e1bd95231d6e838e4c [formerly 0e5366ec874b8f9ecca31d3710cb6e5de118326b] [formerly 831bb0b021 [formerly 358e7d3b1d]]
Former-commit-id: 831bb0b021
Former-commit-id: 762a32fab9
|
2014-02-24 10:27:30 -06:00 |
|
Ben Steffensmeier
|
15088f21d6
|
Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: e27fc9ce71 [formerly 152980350c] [formerly 780dc19fac] [formerly 780dc19fac [formerly 70ae372303]] [formerly e27fc9ce71 [formerly 152980350c] [formerly 780dc19fac] [formerly 780dc19fac [formerly 70ae372303]] [formerly e08d4f77c3 [formerly 780dc19fac [formerly 70ae372303] [formerly e08d4f77c3 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]]]
Former-commit-id: e08d4f77c3
Former-commit-id: ce3ced38c7 [formerly d27c21b9f6] [formerly 7aca322faa] [formerly 0378a9aa7d884c75fc24fb82c40926b624e443e8 [formerly c293b1124e59af7c01e948de86093eee22fbb5d9] [formerly 7aca322faa [formerly a6bf896593]]]
Former-commit-id: b3c62f911a9a5d01ab13cec6d3fb8031fe170ebb [formerly 38003672caef259cf47e8867a401b32fc9add635] [formerly 07ffe9f711 [formerly 7e29aa25a9]]
Former-commit-id: 332f1ac2307d2affe9e58f27170cf0361fc4b079 [formerly 07ffe9f711]
Former-commit-id: 18980e6a8c
|
2014-02-21 17:37:19 -06:00 |
|
Dave Hladky
|
8c0456ea4d
|
Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285
Former-commit-id: 90df10502b [formerly cd7934e12f] [formerly 542ba7e504] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerly 542ba7e504 [formerly c4bed432da]]] [formerly 90df10502b [formerly cd7934e12f] [formerly 542ba7e504] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerly 542ba7e504 [formerly c4bed432da]]] [formerly 49f6c31256 [formerly 542ba7e504 [formerly c4bed432da] [formerly 49f6c31256 [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]]]
Former-commit-id: 49f6c31256
Former-commit-id: b17d941c6f [formerly e15d2f50f9] [formerly 3b9f80d03e] [formerly 6d949aa8fa3cb199cde640f8f0644f17d38343f1 [formerly de3f95e5f61e7ea15849603d3138b155fe401280] [formerly 3b9f80d03e [formerly 445b55f796]]]
Former-commit-id: 93b88113a44b31489d6dc841a358951518e1701f [formerly 1b4853e591b02029ef646ca2512a6fb8faddce26] [formerly c4e70210fd [formerly c545368839]]
Former-commit-id: c4e70210fd
Former-commit-id: 15edb8e522
|
2014-02-21 16:01:20 -06:00 |
|
Richard Peter
|
17fe823d8e
|
Merge "Issue #2828 Added purge cron to Central SBN Simulator." into development
Former-commit-id: 965647d166 [formerly c06007eb9b] [formerly 66d3fce57d] [formerly 66d3fce57d [formerly e923639fb1]] [formerly 965647d166 [formerly c06007eb9b] [formerly 66d3fce57d] [formerly 66d3fce57d [formerly e923639fb1]] [formerly 58a3aac09d [formerly 66d3fce57d [formerly e923639fb1] [formerly 58a3aac09d [formerly d76c2325618af08be1f20ebec0b2463a49a9b03f]]]]]
Former-commit-id: 58a3aac09d
Former-commit-id: f5a21bb41e [formerly c410157f33] [formerly 9ba35d60bd] [formerly a976f6458880e7322d37c462942093e30363e459 [formerly 55bbab3b33338f9d3e07dce6210db0572c73d106] [formerly 9ba35d60bd [formerly 5937649085]]]
Former-commit-id: 1e593a30b8c3997658c788d27d48f6285f0bcccc [formerly f533dbf9e3f006a343e3d5e90ec2e78725320394] [formerly 972f6a61d6 [formerly 0951bec15c]]
Former-commit-id: 972f6a61d6
Former-commit-id: 13405fc57f
|
2014-02-21 11:26:26 -06:00 |
|
Nate Jensen
|
5a2e91b05f
|
Merge "Issue #2631 - Set preference defaults in the Activator. Removed unused file." into development
Former-commit-id: 0083e5fdc0 [formerly f4b3acbac0] [formerly c1f4fbfbd4] [formerly c1f4fbfbd4 [formerly 9a3f60a216]] [formerly 0083e5fdc0 [formerly f4b3acbac0] [formerly c1f4fbfbd4] [formerly c1f4fbfbd4 [formerly 9a3f60a216]] [formerly dd00fd1445 [formerly c1f4fbfbd4 [formerly 9a3f60a216] [formerly dd00fd1445 [formerly 4399b11d3958de1cf8cce2bc66085aa43efb6519]]]]]
Former-commit-id: dd00fd1445
Former-commit-id: 2e197b51b9 [formerly 7e1f0c83f0] [formerly 62596de046] [formerly 986f3cf6c0661df6b288030b56b3b355fae1bd3d [formerly c42919a9792330f82dd0366f0bf2df51b0bd4270] [formerly 62596de046 [formerly 7b1cf570f4]]]
Former-commit-id: 25905871683af42a349840ae33a1d3ea01c44f40 [formerly 754bf0fc435e75c3a8361d2486b24d67e7070105] [formerly 34a56bc0ce [formerly d75023418b]]
Former-commit-id: 34a56bc0ce
Former-commit-id: 8dabb82010
|
2014-02-20 17:55:35 -06:00 |
|
Brad Gonzales
|
391690443d
|
Issue #2828 Added purge cron to Central SBN Simulator.
Amend: Removed comment accidentally merged from other branch.
Moved logging to outer loop and log count of purged files for each dir.
Change-Id: I7038e7f76d09576903d35a54e733cd6986a4d1c6
Former-commit-id: 53723f6200 [formerly 3052b2d9c7] [formerly 290a381715] [formerly 290a381715 [formerly 12e22752c2]] [formerly 53723f6200 [formerly 3052b2d9c7] [formerly 290a381715] [formerly 290a381715 [formerly 12e22752c2]] [formerly bd25ec4cd9 [formerly 290a381715 [formerly 12e22752c2] [formerly bd25ec4cd9 [formerly 6a42f4162ace5a799df4df0e24bf0199905dcf89]]]]]
Former-commit-id: bd25ec4cd9
Former-commit-id: 3b14079774 [formerly 1b59fc4647] [formerly bef4e8ee53] [formerly 99a6be966f1d5e75910511a5845a7e69c9630d05 [formerly e919fb24b5e5ab419e4dfb1442bf1fa5d1ee68d4] [formerly bef4e8ee53 [formerly 08c4d1afea]]]
Former-commit-id: 8925128cb4266072fb65dedbfc62784978e328bf [formerly 214aa1b94f9b4ce96af324adcfe25c14276c8588] [formerly 7dddf974b8 [formerly 675477ed66]]
Former-commit-id: 7dddf974b8
Former-commit-id: 527eb96112
|
2014-02-20 16:31:16 -06:00 |
|
Mike Duff
|
0ae77549cb
|
Issue #2631 - Set preference defaults in the Activator.
Removed unused file.
Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e
Former-commit-id: c7010cef6e [formerly 9eafacaac2] [formerly a96a833f51] [formerly a96a833f51 [formerly ed5cb91406]] [formerly c7010cef6e [formerly 9eafacaac2] [formerly a96a833f51] [formerly a96a833f51 [formerly ed5cb91406]] [formerly a7b1e79d2d [formerly a96a833f51 [formerly ed5cb91406] [formerly a7b1e79d2d [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: b9ec3a51a9 [formerly 5754117aad] [formerly f98eec12b9] [formerly bb873ee8689e8af126e6f9070649a41326c264af [formerly 054cdc944f74842daa02964eb9d5d80d21f23654] [formerly f98eec12b9 [formerly d90f4495c2]]]
Former-commit-id: f2ca9f0221be02120ff2c132625920832d17ff91 [formerly a5e60f93a5f9480cbb884fd30320154fc0368ef6] [formerly 692830c5c9 [formerly 5014499431]]
Former-commit-id: 692830c5c9
Former-commit-id: b74ed7f1fe
|
2014-02-20 15:09:10 -06:00 |
|
Brian.Dyke
|
fdeafd6666
|
ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev)
Former-commit-id: 4c41a363dc [formerly 45cf129ad7] [formerly 5f3ca0a3f4] [formerly 5f3ca0a3f4 [formerly 2f79cc486e]] [formerly 4c41a363dc [formerly 45cf129ad7] [formerly 5f3ca0a3f4] [formerly 5f3ca0a3f4 [formerly 2f79cc486e]] [formerly 916f657e04 [formerly 5f3ca0a3f4 [formerly 2f79cc486e] [formerly 916f657e04 [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]]]]
Former-commit-id: 916f657e04
Former-commit-id: 601c4644ca [formerly 1fc3b18abb] [formerly 9ce06f52c4] [formerly 3c8881ff68e1b111a9abeb0274379796346e67b4 [formerly b55df208e18a858dd848c1f37a3594d57d916867] [formerly 9ce06f52c4 [formerly e36ae1dd7f]]]
Former-commit-id: 08bd1e738924e0194f9a8fec0a8a21387c1120a5 [formerly 2f25bb8be4842d117064095d696ba2c535e07c96] [formerly 176c56b8ea [formerly f89f664f50]]
Former-commit-id: 176c56b8ea
Former-commit-id: 1882ad8be8
|
2014-02-20 15:50:50 -05:00 |
|
Ron Anderson
|
e973abfe72
|
Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405
Former-commit-id: f52d4957c4 [formerly bb3577ef37] [formerly e4aeaa79f1] [formerly e4aeaa79f1 [formerly 6a7e4a147d]] [formerly f52d4957c4 [formerly bb3577ef37] [formerly e4aeaa79f1] [formerly e4aeaa79f1 [formerly 6a7e4a147d]] [formerly 6ccf6a56e7 [formerly e4aeaa79f1 [formerly 6a7e4a147d] [formerly 6ccf6a56e7 [formerly a2b2a15f1ef8e237058f1760d64021895ae27c35]]]]]
Former-commit-id: 6ccf6a56e7
Former-commit-id: 532ca48a2f [formerly e2bd1327b4] [formerly 1dcaf2b790] [formerly d8b9e104b29453735b17dadcbc25e635fce23d8a [formerly 5022d5c01f2275eac9682199580e2e9a6b2b93e7] [formerly 1dcaf2b790 [formerly d63ad1b1de]]]
Former-commit-id: c13c555c9eacca6fc2938de5846bf26987cd3766 [formerly 5e5b97037cd1e8490c7bc462cbcb300afc123568] [formerly 42048983ce [formerly 2eb6cb45e3]]
Former-commit-id: 42048983ce
Former-commit-id: 9c77ad5ef4
|
2014-02-20 12:32:31 -06:00 |
|
Brian Clements
|
e0d683016d
|
Issue #2751 collab menu icons, fixed NPE
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog
Former-commit-id: 8a28feeaf3 [formerly 8bbf2bb6bd] [formerly a2bdfa25cc] [formerly a2bdfa25cc [formerly aaa2de20f4]] [formerly 8a28feeaf3 [formerly 8bbf2bb6bd] [formerly a2bdfa25cc] [formerly a2bdfa25cc [formerly aaa2de20f4]] [formerly 89a48c3f6b [formerly a2bdfa25cc [formerly aaa2de20f4] [formerly 89a48c3f6b [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: fa2367e935 [formerly e7584f3a49] [formerly 04697836b8] [formerly 63e7657553ec4b681a5c8bb5dd8a3626c3291dd9 [formerly 5cc63f048c2ca2bae92c62e08c20b8a3fc4c7681] [formerly 04697836b8 [formerly 4b7ba54dc3]]]
Former-commit-id: cf32a4d4097fa2e735019a5d442de88e420d7d47 [formerly c4d86142773d02aa243a5b8e729feaf2e433b4bc] [formerly 1d2406e180 [formerly e3973b9fc7]]
Former-commit-id: 1d2406e180
Former-commit-id: 49b39bcaf6
|
2014-02-20 11:50:54 -06:00 |
|
Brian Clements
|
d26332deb4
|
Issue #2751 implemented room/topic ownership transfer
Former-commit-id: 4f7cdd2193 [formerly 4e165aba58] [formerly a8ff1effc1] [formerly a8ff1effc1 [formerly c3cadff705]] [formerly 4f7cdd2193 [formerly 4e165aba58] [formerly a8ff1effc1] [formerly a8ff1effc1 [formerly c3cadff705]] [formerly ab72938246 [formerly a8ff1effc1 [formerly c3cadff705] [formerly ab72938246 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]]]
Former-commit-id: ab72938246
Former-commit-id: e5b4513aed [formerly 08a0e5baf2] [formerly 9d00fe2bab] [formerly 2665ff891848f5722aa0d8302f198724fb6cd1ac [formerly d96f62f0208dbdcb69677a9d6b014fc0a7761a39] [formerly 9d00fe2bab [formerly d9ac2c0037]]]
Former-commit-id: 270eff47404d5c367fd6b5c8d184f2e73fbc374a [formerly e46a572ae9fd237caee1e14f1bd4825f8f3b942b] [formerly 9b0fd74f5b [formerly d218686d1f]]
Former-commit-id: 9b0fd74f5b
Former-commit-id: cbef95a1bb
|
2014-02-20 11:10:14 -06:00 |
|
Nate Jensen
|
7b3fd0fa93
|
Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it
Former-commit-id: 2bf753c853 [formerly 6973755f4e] [formerly 6ef26a636c] [formerly 6ef26a636c [formerly 32bd9fd635]] [formerly 2bf753c853 [formerly 6973755f4e] [formerly 6ef26a636c] [formerly 6ef26a636c [formerly 32bd9fd635]] [formerly 0f81b80467 [formerly 6ef26a636c [formerly 32bd9fd635] [formerly 0f81b80467 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]]]
Former-commit-id: 0f81b80467
Former-commit-id: fc08a23690 [formerly 5d5518e29f] [formerly 6e2150ccd7] [formerly 8e01ac4dbe86c434f1efe1256d301c9854446b8e [formerly bd38074eb147c551318fc588a5101194eae5605b] [formerly 6e2150ccd7 [formerly 9f33e97c1b]]]
Former-commit-id: 9f6069c44ad4e5a3ab5d12c6d97510c3fe422ec2 [formerly 23fb965df8973134f0458b6ea88536419a073d36] [formerly 3955f66213 [formerly 1f5f895dcf]]
Former-commit-id: 3955f66213
Former-commit-id: e2baae15ac
|
2014-02-20 10:53:21 -06:00 |
|
Ron Anderson
|
ed4a8427be
|
Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development
Former-commit-id: 50d6b2d7ce [formerly e1585c58e1] [formerly 810ad594a1] [formerly 810ad594a1 [formerly c13942140a]] [formerly 50d6b2d7ce [formerly e1585c58e1] [formerly 810ad594a1] [formerly 810ad594a1 [formerly c13942140a]] [formerly 6f4a63000d [formerly 810ad594a1 [formerly c13942140a] [formerly 6f4a63000d [formerly 0729266c3f82eccdbf6835789898291ad34451c4]]]]]
Former-commit-id: 6f4a63000d
Former-commit-id: 8c94693e92 [formerly 81b8bf2374] [formerly ee5658f9d9] [formerly 728ad448ea5314c4d2d216fce037b0129dbd09ed [formerly 3eb2456c26e36a840ecec7dab9cc4390d60c3a47] [formerly ee5658f9d9 [formerly c07544b904]]]
Former-commit-id: d0f9195fa71cbd9667ac5fcda4ba475a3e1f4852 [formerly 46d149bd475770264ea464931219c00627746cee] [formerly a5c6428787 [formerly 32b8cc8a8e]]
Former-commit-id: a5c6428787
Former-commit-id: 7dc6619828
|
2014-02-20 09:55:56 -06:00 |
|
Ron Anderson
|
398fbc2540
|
Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7
Former-commit-id: 6507fd219d [formerly 6645688ff4] [formerly 2bfa521e7d] [formerly 2bfa521e7d [formerly 6b6aa14e59]] [formerly 6507fd219d [formerly 6645688ff4] [formerly 2bfa521e7d] [formerly 2bfa521e7d [formerly 6b6aa14e59]] [formerly 08a1be844d [formerly 2bfa521e7d [formerly 6b6aa14e59] [formerly 08a1be844d [formerly 37a420582eea8d3a1b4861e18c20d044c636173f]]]]]
Former-commit-id: 08a1be844d
Former-commit-id: 5044b06f52 [formerly e1a346790e] [formerly 0ee3625c50] [formerly 7c041d278bbf5e65f275134116cf9fe600ca337f [formerly ccd2b797cfa81d3394ddffbff2fae12e18e85480] [formerly 0ee3625c50 [formerly 1571b9a8eb]]]
Former-commit-id: 1b4c731d2efe26e908da281338ba96957db89041 [formerly b143a17afee4d4020a754d4a6c26cfa8398ff32d] [formerly 30d9fec3ae [formerly 7897be61e2]]
Former-commit-id: 30d9fec3ae
Former-commit-id: 13cf523fb0
|
2014-02-20 09:34:18 -06:00 |
|
Nate Jensen
|
af067bd033
|
Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: c3b83786d8 [formerly adb51300d8] [formerly 4563e38db2] [formerly 4563e38db2 [formerly 3078b69273]] [formerly c3b83786d8 [formerly adb51300d8] [formerly 4563e38db2] [formerly 4563e38db2 [formerly 3078b69273]] [formerly 5856957c57 [formerly 4563e38db2 [formerly 3078b69273] [formerly 5856957c57 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]]]]]
Former-commit-id: 5856957c57
Former-commit-id: 912efca372 [formerly 08ede8e9f3] [formerly c936a659a5] [formerly 614fce7f44fff3f3af0ce7a43d928e5eae1c2440 [formerly 1a60933c3ce5c3f2514129d9f7ef73e507bb6d7c] [formerly c936a659a5 [formerly 5412b72c57]]]
Former-commit-id: 1b4e0824c9a3191d477f28c5b884acd90571dfe8 [formerly 3423ea500fae2ba7c5b5f5039edab1f4d969c5e3] [formerly 4628b0c67c [formerly 9e261c9c22]]
Former-commit-id: 4628b0c67c
Former-commit-id: 714a282a4f
|
2014-02-19 17:22:00 -06:00 |
|
Nate Jensen
|
6dac58e4d1
|
Merge "Issue #2761 add region level to localization" into development
Former-commit-id: 8a1994693b [formerly f939d93d7f] [formerly 3782880dac] [formerly 3782880dac [formerly 9011e1b31e]] [formerly 8a1994693b [formerly f939d93d7f] [formerly 3782880dac] [formerly 3782880dac [formerly 9011e1b31e]] [formerly 6e59175ce4 [formerly 3782880dac [formerly 9011e1b31e] [formerly 6e59175ce4 [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]]]
Former-commit-id: 6e59175ce4
Former-commit-id: c86b0e8f6e [formerly 8a564e9987] [formerly 9394879520] [formerly ee90fe62dd6c42c38b973f36428279d5702c5ea3 [formerly 9bf4479e05cb345ab571f6736d903c87cbcab9f4] [formerly 9394879520 [formerly b1e2788958]]]
Former-commit-id: a570d4abb17b6d8e29c4a918f96d1552f70c8e49 [formerly 45ded3c22eb341b860a5a8b1046988c3fb69c275] [formerly 1db1ae5a38 [formerly 8f73511086]]
Former-commit-id: 1db1ae5a38
Former-commit-id: 9cfc792b03
|
2014-02-19 17:18:24 -06:00 |
|
Nate Jensen
|
03252595a2
|
Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: 5a0e714d10 [formerly f545a8a74d] [formerly a241472c34] [formerly a241472c34 [formerly df376abcb7]] [formerly 5a0e714d10 [formerly f545a8a74d] [formerly a241472c34] [formerly a241472c34 [formerly df376abcb7]] [formerly f99cf7df47 [formerly a241472c34 [formerly df376abcb7] [formerly f99cf7df47 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]]]]
Former-commit-id: f99cf7df47
Former-commit-id: e8fea48058 [formerly eeac24c773] [formerly d3ec0da1bb] [formerly 7f3f57a9c317f8ebe71fc0d9e4fc1f58fcff3fa2 [formerly 76b7d9b753824f510f6d112e0bfada581f946906] [formerly d3ec0da1bb [formerly 8b152a8027]]]
Former-commit-id: 46d1aca5ca36c9f3e4126bd5d88c33f21e9c5dba [formerly bcd8e67559fb255fbb3d3d11663bad0ea365591b] [formerly dbdcfa8e41 [formerly dafb323edb]]
Former-commit-id: dbdcfa8e41
Former-commit-id: 8ee4ae7565
|
2014-02-19 16:19:27 -06:00 |
|
Ron Anderson
|
505ea19a12
|
Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: e07f5c13df [formerly dab0ebc99e] [formerly 8703c43937] [formerly 8703c43937 [formerly 98d2417f94]] [formerly e07f5c13df [formerly dab0ebc99e] [formerly 8703c43937] [formerly 8703c43937 [formerly 98d2417f94]] [formerly b8c00d8ead [formerly 8703c43937 [formerly 98d2417f94] [formerly b8c00d8ead [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]]]
Former-commit-id: b8c00d8ead
Former-commit-id: 5cc2214b1c [formerly efbe57d909] [formerly b9904edc3a] [formerly f8b82f1bba79818cadd97add83f67b63f489d005 [formerly 5a4e4666cbcd00018ef121b89b85a78808d680db] [formerly b9904edc3a [formerly 7e7f0abfdc]]]
Former-commit-id: 1d8ad50e3f5c99ccf1e066a2f2792cd447e5f77c [formerly 1e59da19780cb626d96172f2b0f32ab6257e2bba] [formerly 331803d94a [formerly db9cc1e6b5]]
Former-commit-id: 331803d94a
Former-commit-id: 60569c9c0d
|
2014-02-19 15:39:56 -06:00 |
|
Mike Duff
|
e031ba72f9
|
Issue #2631 - Add sound preference for users joining a room.
review comments
Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207
Former-commit-id: 8a79674715 [formerly 659cb1f2a0] [formerly e2a6251a6b] [formerly e2a6251a6b [formerly 663ea8decd]] [formerly 8a79674715 [formerly 659cb1f2a0] [formerly e2a6251a6b] [formerly e2a6251a6b [formerly 663ea8decd]] [formerly 95fcee385a [formerly e2a6251a6b [formerly 663ea8decd] [formerly 95fcee385a [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]]]
Former-commit-id: 95fcee385a
Former-commit-id: efbbed4743 [formerly a723f69ad9] [formerly 89c4a3e04b] [formerly 154ef617520543ec30bf0df59f519c0eb29e4e11 [formerly 280611ef49d0a886c12f13b5471242ae42c55bac] [formerly 89c4a3e04b [formerly 3100a71f34]]]
Former-commit-id: e9dddad781aa2c358930c9b06c93d51be0d9d8c5 [formerly d105e7a0938fbc4a67695d10a5942cb2e4247a07] [formerly 401973b39e [formerly 92d356f4f0]]
Former-commit-id: 6f898f93ed2c80a6298cd22c3208f580dcfbd64b [formerly 401973b39e]
Former-commit-id: 352b114250
|
2014-02-19 15:26:14 -06:00 |
|
Mike Duff
|
24aaa31c82
|
Issue #2628 - Change cast from short to int for MPE colorbar
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c
Former-commit-id: de371ec5a5 [formerly 8a29af4894] [formerly 48a0b34b5f] [formerly 48a0b34b5f [formerly 682c6af456]] [formerly de371ec5a5 [formerly 8a29af4894] [formerly 48a0b34b5f] [formerly 48a0b34b5f [formerly 682c6af456]] [formerly 183657fb33 [formerly 48a0b34b5f [formerly 682c6af456] [formerly 183657fb33 [formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]]]]
Former-commit-id: 183657fb33
Former-commit-id: 594c799cfa [formerly 10765884a3] [formerly 8be2622f85] [formerly 5fca878481687b7745e4786acc7c0548bc5bd14d [formerly 4622ac20555cc93d1c3532eaaaec9b3ab36c4650] [formerly 8be2622f85 [formerly 86fce9d547]]]
Former-commit-id: 5d14d88f30ef29cf7bd324796e110ff2bb7ad88c [formerly 04df26620b97a49afd1fe7a8d0a138f12e8cbebc] [formerly 0494f646ab [formerly 06b243a7fd]]
Former-commit-id: 0494f646ab
Former-commit-id: e24f7edcf7
|
2014-02-19 15:20:29 -06:00 |
|
Nate Jensen
|
f6950404b0
|
Merge "Issue #2751 fixed chat room bugs" into development
Former-commit-id: b8ce797856 [formerly 72acab26c3] [formerly b4ac186728] [formerly b4ac186728 [formerly 4b4cca776f]] [formerly b8ce797856 [formerly 72acab26c3] [formerly b4ac186728] [formerly b4ac186728 [formerly 4b4cca776f]] [formerly c72e2be969 [formerly b4ac186728 [formerly 4b4cca776f] [formerly c72e2be969 [formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]]]]
Former-commit-id: c72e2be969
Former-commit-id: 92650ef7d4 [formerly 7f1665f2eb] [formerly 5ef747c703] [formerly 9e94da1f11c7d1ccd042bf90fcf0169274243dde [formerly b5160733f88b5b22d9395a61e0d9f2dc75ca22a9] [formerly 5ef747c703 [formerly 7099b45023]]]
Former-commit-id: 22ce53cf4f7cd8210262189210b0d6afb85bf218 [formerly 401b13c7b7de12de88ba2b1fdf48ae863ba3981e] [formerly 659bc630be [formerly 696937bfcc]]
Former-commit-id: 659bc630be
Former-commit-id: 7c8349973f
|
2014-02-19 14:52:24 -06:00 |
|
Lee Venable
|
5fc852225f
|
Merge "Issue #2734 - default time range to 24 hours." into development
Former-commit-id: 2dc08c76f8 [formerly 5582282777] [formerly de102f4e94] [formerly de102f4e94 [formerly 8e967e8e59]] [formerly 2dc08c76f8 [formerly 5582282777] [formerly de102f4e94] [formerly de102f4e94 [formerly 8e967e8e59]] [formerly e204b350ee [formerly de102f4e94 [formerly 8e967e8e59] [formerly e204b350ee [formerly 4604b591b1f15621fcf4cd0e93143435cccfe43b]]]]]
Former-commit-id: e204b350ee
Former-commit-id: 512bee40a4 [formerly a0d9fe6f20] [formerly 404a4c3149] [formerly 1805ed42fc83668aa55a79bb90731586e45f945f [formerly 12a7b36c051b01f74e46b576dd6b8390be7ddea1] [formerly 404a4c3149 [formerly 9cb8925e51]]]
Former-commit-id: 5c7d5dee01a0ec87d75eaf8fad41b607effc7928 [formerly 4b1f6c5b734f4ff202d292870314bb22e63a5b01] [formerly f645277518 [formerly 67f6df9784]]
Former-commit-id: f645277518
Former-commit-id: 27defcbe42
|
2014-02-19 12:33:46 -06:00 |
|
Ron Anderson
|
2eaf6d3473
|
Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: c8160c6840 [formerly 5f3248574f] [formerly 663cb4cb62] [formerly 663cb4cb62 [formerly 5258aecf45]] [formerly c8160c6840 [formerly 5f3248574f] [formerly 663cb4cb62] [formerly 663cb4cb62 [formerly 5258aecf45]] [formerly 419e9d0b8d [formerly 663cb4cb62 [formerly 5258aecf45] [formerly 419e9d0b8d [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 93d61d1483 [formerly 84bea14340] [formerly 908e43039e] [formerly bc94e6cf081cc02f30f8d2e3a2dc60a3127a4272 [formerly ba993f1f22c77f61f4ea6ed8c28039e69d6a34b2] [formerly 908e43039e [formerly 8a41723ba6]]]
Former-commit-id: 1c45ac391c5ef69ace035147388e53a6ed24e5ce [formerly a122ae5f46b63941580c026c45106c52001929d6] [formerly e91fd1d683 [formerly b0a4b63689]]
Former-commit-id: e91fd1d683
Former-commit-id: 41a6f52eff
|
2014-02-19 11:55:11 -06:00 |
|
Slav Korolev
|
23e48bb410
|
Issue #2652. Fixed issue with edex-text-ingest log. Deleted unused code.
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b
Former-commit-id: 88abec245e [formerly 39e49448ba] [formerly f7a6a6c613] [formerly f7a6a6c613 [formerly a597ac0989]] [formerly 88abec245e [formerly 39e49448ba] [formerly f7a6a6c613] [formerly f7a6a6c613 [formerly a597ac0989]] [formerly 3b1ea13cb1 [formerly f7a6a6c613 [formerly a597ac0989] [formerly 3b1ea13cb1 [formerly 7b666c5fb7a1cb459a90bb295e58491a9a21063c]]]]]
Former-commit-id: 3b1ea13cb1
Former-commit-id: 54e848a629 [formerly 164665bbac] [formerly 06d55c28f4] [formerly 374a21fda8032b2d5dff03667cf2c4899e7cf97d [formerly eb29cf1af1a77f7e96c773b8304d91c618f49609] [formerly 06d55c28f4 [formerly 8ec2d02f52]]]
Former-commit-id: 9035bf11a86f74f33465159759235f351075aa3c [formerly ee8fc481497fe0a2b7908dacd5bcff00be54bc43] [formerly 8ab22e3559 [formerly f09add5f92]]
Former-commit-id: 8ab22e3559
Former-commit-id: ed33d3c27a
|
2014-02-19 12:01:06 -05:00 |
|
Mike Duff
|
2ef12143a6
|
Issue #2734 - default time range to 24 hours.
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d
Former-commit-id: 8a87239ecc [formerly c7e22b7b3b] [formerly bc180503b1] [formerly bc180503b1 [formerly 19033601bf]] [formerly 8a87239ecc [formerly c7e22b7b3b] [formerly bc180503b1] [formerly bc180503b1 [formerly 19033601bf]] [formerly 0b316f7bd9 [formerly bc180503b1 [formerly 19033601bf] [formerly 0b316f7bd9 [formerly 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5]]]]]
Former-commit-id: 0b316f7bd9
Former-commit-id: e5255a0bf4 [formerly bac3c86658] [formerly 06ed3db690] [formerly 8a61b9f3ed267fba7cd5cea9e427d6b6df5b9321 [formerly 0bf0f051070755b17c7ecbd3f200deb688e5152a] [formerly 06ed3db690 [formerly 7710724c5a]]]
Former-commit-id: be0cd7cf2815c9b4b21c9dcc4fde2670f6ba79de [formerly de95bb7f4552356a8f38055610f319fc4ca4ae8e] [formerly 304a9dc507 [formerly e6fb8413b9]]
Former-commit-id: 304a9dc507
Former-commit-id: 02fa72b0d0
|
2014-02-19 10:23:48 -06:00 |
|
Matt Nash
|
f359cf7834
|
Issue #2761 add region level to localization
Amend : Change comment now that we do not get file from localization
Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2
Former-commit-id: 63e5255aed [formerly 1d6e1d443c] [formerly 3f67324d7c] [formerly 3f67324d7c [formerly 2d20e84f6a]] [formerly 63e5255aed [formerly 1d6e1d443c] [formerly 3f67324d7c] [formerly 3f67324d7c [formerly 2d20e84f6a]] [formerly 1835019567 [formerly 3f67324d7c [formerly 2d20e84f6a] [formerly 1835019567 [formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]]]
Former-commit-id: 1835019567
Former-commit-id: 35d73b0d4b [formerly 9cb0b6d530] [formerly ae1d36b6d0] [formerly 527d7d3ed6aae7f276e2798e7331f69a2f95c09b [formerly 82cdf604370def6ebacc4f1cbb2ebeaa41b75898] [formerly ae1d36b6d0 [formerly bb10484bd0]]]
Former-commit-id: cbd2cdfb8f080e552109dee421bcb9ab11dc5153 [formerly 936c1375ad966bfb52b19b40f76a2bb6fa4628d3] [formerly 1814b1448e [formerly 3b39e1d2bc]]
Former-commit-id: 1814b1448e
Former-commit-id: fbe80195e5
|
2014-02-19 10:01:25 -06:00 |
|
Brian Clements
|
355048214f
|
Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client
Former-commit-id: 382d98bfbe [formerly abc01f5475] [formerly 06c16118e1] [formerly 06c16118e1 [formerly dc074a9650]] [formerly 382d98bfbe [formerly abc01f5475] [formerly 06c16118e1] [formerly 06c16118e1 [formerly dc074a9650]] [formerly 3a135b8eac [formerly 06c16118e1 [formerly dc074a9650] [formerly 3a135b8eac [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]]]
Former-commit-id: 3a135b8eac
Former-commit-id: c70baebf38 [formerly 30027665ac] [formerly 77bb396c9a] [formerly 24c5204089aa3197c0957cca1fb41faf1b32e85c [formerly 7c130f893c124249133b51cb750375f7ea62663d] [formerly 77bb396c9a [formerly bee7cdb71a]]]
Former-commit-id: f1e9553ae4f8652dc78a7be38a97ae56758b537b [formerly 2bd4a38066d755ff2faaae6125ca4744d0e08564] [formerly b47b194564 [formerly ddc0945e40]]
Former-commit-id: bb2e238fe56b9efef877ce6f270926b36697c0ad [formerly b47b194564]
Former-commit-id: c420979556
|
2014-02-19 08:32:26 -06:00 |
|
Lee Venable
|
e1ef4422ca
|
Merge "Issue #2596 - Add check for null coordinates." into development
Former-commit-id: 483b5c0530 [formerly 0db46dd5fb] [formerly 1620d0fb22] [formerly 1620d0fb22 [formerly 6e60748b41]] [formerly 483b5c0530 [formerly 0db46dd5fb] [formerly 1620d0fb22] [formerly 1620d0fb22 [formerly 6e60748b41]] [formerly c871e4c872 [formerly 1620d0fb22 [formerly 6e60748b41] [formerly c871e4c872 [formerly e3517f5144c386038c4d535d79e62ec02d504f9f]]]]]
Former-commit-id: c871e4c872
Former-commit-id: f713138a74 [formerly 32141b0655] [formerly 110557f42c] [formerly e0683eadee319ed92152635a8cedcc7964d3cfac [formerly 11bc06e458f731c1f368a4935187371bf65560e2] [formerly 110557f42c [formerly d62b4e7621]]]
Former-commit-id: 3dfaee1637195c4a1832d7b64c49466103d65675 [formerly 050dbd73eb4b1d6608e257bd0f349b10268f4679] [formerly 7dca9cdace [formerly 875ebbd2e1]]
Former-commit-id: 69d9aa26760fc2efc75b1debb7474fcb40c1184c [formerly 7dca9cdace]
Former-commit-id: 423f0dc2d7
|
2014-02-18 18:08:10 -06:00 |
|