Commit graph

5085 commits

Author SHA1 Message Date
Nate Jensen
ffc65bdbb0 Merge "Issue #2667 delta scripts for lightning source name change in xml files" into development
Former-commit-id: 36f5a3e788 [formerly b9e4d40066] [formerly 36f5a3e788 [formerly b9e4d40066] [formerly 315b7abf28 [formerly 2376124f601e97cf46ee8cb3281c326e178aab4d]]]
Former-commit-id: 315b7abf28
Former-commit-id: 64c9de836d [formerly 5cc5a59f2e]
Former-commit-id: a69546725c
2014-03-03 17:25:34 -06:00
Nate Jensen
aeb07db59f Merge "Issue #2792 enforce getDensity() will not return above max" into development
Former-commit-id: f38b4e42ba [formerly bb9993e580] [formerly f38b4e42ba [formerly bb9993e580] [formerly 2009972a2c [formerly 7c04864c902d3928165ea0bc107902b094209ed6]]]
Former-commit-id: 2009972a2c
Former-commit-id: 4df4a2361f [formerly cf960bace3]
Former-commit-id: 8045bbfc16
2014-03-03 16:30:49 -06:00
Brian Clements
9a8ad193c2 Issue #2667 delta scripts for lightning source name change in xml files
handles stored procedures/bundles in localization


Former-commit-id: cc50637346 [formerly 0811b0580f] [formerly cc50637346 [formerly 0811b0580f] [formerly ddcb1011bb [formerly 8e3e3be372d5db6dfc5897407074bc250fbef294]]]
Former-commit-id: ddcb1011bb
Former-commit-id: bf67bd0a33 [formerly 0292707f9d]
Former-commit-id: c700bba545
2014-03-03 16:30:45 -06:00
Nate Jensen
226f506a0e Merge "Issue #2756 install script for collaboration http server" into development
Former-commit-id: e74625dcca [formerly 2a83780be8] [formerly e74625dcca [formerly 2a83780be8] [formerly 352a884b26 [formerly d3d0173f7b5353256c1592b2b16cccd04ee98eff]]]
Former-commit-id: 352a884b26
Former-commit-id: 18cd324d92 [formerly d9cfafa4cd]
Former-commit-id: 6e18253972
2014-03-03 15:50:35 -06:00
Nate Jensen
224fd09dab Issue #2792 enforce getDensity() will not return above max
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1

Former-commit-id: 7f31e34dc9 [formerly 384b531d26] [formerly 7f31e34dc9 [formerly 384b531d26] [formerly 22153d43bb [formerly a502a64219e869401b1bff82fbb73e67565a6dae]]]
Former-commit-id: 22153d43bb
Former-commit-id: e40fbf0ba0 [formerly 58c9dc0c69]
Former-commit-id: 6f488f855f
2014-03-03 14:44:16 -06:00
Brian Clements
861716341a Issue #2756 install script for collaboration http server
added check for non-edex deployment in plugin-methods.xml
added dataserver feature to use feature-based deployment scripts
moved start/stop scripts to subdirectory
reworked start script to work with external classpath jars


Former-commit-id: a738448825 [formerly 3b6121b9fa] [formerly a738448825 [formerly 3b6121b9fa] [formerly 934ce73e4b [formerly 7d476e67ad00cc8e9c494ed04c7ce0ecc691059a]]]
Former-commit-id: 934ce73e4b
Former-commit-id: 75c179b06f [formerly a44c5f8d48]
Former-commit-id: a36f303646
2014-03-03 14:07:01 -06:00
Brian Clements
44fdea985e Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed


Former-commit-id: 5d21675a91 [formerly 91936beadf] [formerly 5d21675a91 [formerly 91936beadf] [formerly 7a7d476899 [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]
Former-commit-id: 7a7d476899
Former-commit-id: bf4c119278 [formerly 724bafd44f]
Former-commit-id: dc8667011b
2014-03-03 13:17:05 -06:00
Benjamin Phillippe
719b90e1e7 Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: d339e232f4 [formerly ed050996a2] [formerly d339e232f4 [formerly ed050996a2] [formerly 5483d6d7ae [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]]]
Former-commit-id: 5483d6d7ae
Former-commit-id: 603e433054 [formerly 15a5e7c4a4]
Former-commit-id: 090dbe3918
2014-03-03 10:57:16 -06:00
Nate Jensen
6ec6ce6b17 Merge "Issue #2756 implemented HTTP public key auth scheme" into development
Former-commit-id: c15f9950a1 [formerly 99fd81f105] [formerly c15f9950a1 [formerly 99fd81f105] [formerly 869909cc66 [formerly 21d22f790f71941797a23926be5ed77c6d72353b]]]
Former-commit-id: 869909cc66
Former-commit-id: a035269bb3 [formerly 19a252d820]
Former-commit-id: 76318d62e8
2014-03-03 09:44:26 -06:00
Dave Hladky
f03f0f9092 Issue #2713 Update path for MADIS-Harvester.xml
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788

Former-commit-id: fb2cfff4d2 [formerly 92d677141f] [formerly fb2cfff4d2 [formerly 92d677141f] [formerly d40107e530 [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]]
Former-commit-id: d40107e530
Former-commit-id: dd3501ae41 [formerly 06d41ccafa]
Former-commit-id: ee818ff96b
2014-03-03 08:46:37 -06:00
Ben Steffensmeier
a19e960342 Issue #2791 Use Data Source for all grid data access.
Former-commit-id: 02cef4ddaa [formerly 6fa441396f] [formerly 02cef4ddaa [formerly 6fa441396f] [formerly 05770129c1 [formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]
Former-commit-id: 05770129c1
Former-commit-id: 72b117cf42 [formerly 4094ef6170]
Former-commit-id: c6f1b922b2
2014-02-28 17:06:33 -06:00
Brian Clements
f00f8eb1d9 Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: 9d0b02e0a4 [formerly ce24bd1018] [formerly 9d0b02e0a4 [formerly ce24bd1018] [formerly d8e283e1b4 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]
Former-commit-id: d8e283e1b4
Former-commit-id: f56cbac9fb [formerly edd72cbde4]
Former-commit-id: 6d4abdc37c
2014-02-28 16:15:17 -06:00
Brian Clements
78782d97c2 Issue #2667 fixed microseconds floating point error
time ranges now take any extra microseconds as separate argument


Former-commit-id: b9bab34f7f [formerly 5b4c234b48] [formerly b9bab34f7f [formerly 5b4c234b48] [formerly fdf3e42cb7 [formerly 24d9440e440b74f6b1b907062b10da0fef268aed]]]
Former-commit-id: fdf3e42cb7
Former-commit-id: 0a2dffe600 [formerly cecff40a47]
Former-commit-id: e8e545f05a
2014-02-28 15:47:20 -06:00
Nate Jensen
da3ac6ab07 Merge "Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception" into development
Former-commit-id: 2557ffe8c3 [formerly 47255ea9ad] [formerly 2557ffe8c3 [formerly 47255ea9ad] [formerly 45e8290111 [formerly 4ad72fcdc6cdccfce9f14808bdbcba5fa63d28ac]]]
Former-commit-id: 45e8290111
Former-commit-id: 988249c4d8 [formerly 6d41fc9fd2]
Former-commit-id: aa28135a16
2014-02-28 14:02:33 -06:00
Nate Jensen
58b4cdebad Merge "Issue #2638 wrote java utility for generating list of data URIs and their field names" into development
Former-commit-id: 420a30cddc [formerly 135bb70a38] [formerly 420a30cddc [formerly 135bb70a38] [formerly f21e9eb889 [formerly f7da1e27eca42ff822eeccf5a4a4bb56c77eb868]]]
Former-commit-id: f21e9eb889
Former-commit-id: 403a8611c5 [formerly 67a7197f59]
Former-commit-id: 636cb1b4c1
2014-02-28 14:02:22 -06:00
Lee Venable
1ffa59cf4f Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
Former-commit-id: 40f3df6aff [formerly f171e3adb0] [formerly 40f3df6aff [formerly f171e3adb0] [formerly c77634951c [formerly 1a72af70658f288d43e397d12499de1a08ff2ba8]]]
Former-commit-id: c77634951c
Former-commit-id: 67f7d52f74 [formerly 734f69403a]
Former-commit-id: 7bbedd6edd
2014-02-28 13:50:15 -06:00
Mike Duff
6c60255b75 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 377c1f9998 [formerly 5440ff64d1] [formerly 377c1f9998 [formerly 5440ff64d1] [formerly 5f433b4f6b [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 63fc5f8c66 [formerly ee06fc58b5]
Former-commit-id: 02fa0d3c59
2014-02-28 13:23:34 -06:00
Richard Peter
34e2ab0d43 Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
Former-commit-id: 18ec1e12ae [formerly 5565bc88af] [formerly 18ec1e12ae [formerly 5565bc88af] [formerly d5e09a82a7 [formerly 029efeddc9a20b10f8991976be5640bff2e14cfc]]]
Former-commit-id: d5e09a82a7
Former-commit-id: e4dc3ea6cf [formerly f5c3e5d549]
Former-commit-id: d736455a8a
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
118991ec22 Issue #2791 Switch contouring to use DataSource for data access.
Former-commit-id: fbf6371c8e [formerly 4b7f3b2a5b] [formerly fbf6371c8e [formerly 4b7f3b2a5b] [formerly 23ce77d864 [formerly 6c90be7554bcbbf0aeb363b6e76c455d3896be83]]]
Former-commit-id: 23ce77d864
Former-commit-id: 278ef9f0d4 [formerly a7787a7ff2]
Former-commit-id: c0c017e451
2014-02-28 11:28:02 -06:00
Dave Hladky
5d37ad762d Issue #2836 Added diagnostic info for ArrayIndexOutOfBounds exception
Former-commit-id: 8bddfa77ce [formerly fd85324076] [formerly 8bddfa77ce [formerly fd85324076] [formerly 7399b10778 [formerly 137c6f8848715ee1acaaa2be943c053437902a8c]]]
Former-commit-id: 7399b10778
Former-commit-id: d9a0f99bb5 [formerly 62156a1ba5]
Former-commit-id: b5b9e295fb
2014-02-28 11:07:15 -06:00
Brad Gonzales
b428cf44ca Issue #2821 Removed qpid 0.7 from the baseline.
Amend: Removed build.sh script that builds 0.7 and 0.18.  changed rpms.sh to call 0.18 build.sh script.

Change-Id: Iaf0cc8c0f9c47877f3e0acc02c60f27b25c0fccf

Former-commit-id: f87d4ccf82 [formerly a007ffabf9] [formerly f87d4ccf82 [formerly a007ffabf9] [formerly 50209c2084 [formerly 5ea4e87d10d335d85547b147228244892772a98f]]]
Former-commit-id: 50209c2084
Former-commit-id: b9affa3c02 [formerly bf3a9ef7fe]
Former-commit-id: 6f32b5cc59
2014-02-28 10:15:18 -06:00
Nate Jensen
4e66e5bcc5 Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: b40f5477b4 [formerly 63244f840f] [formerly b40f5477b4 [formerly 63244f840f] [formerly 908d308825 [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]
Former-commit-id: 908d308825
Former-commit-id: fb68c4c07f [formerly 92527f1ffa]
Former-commit-id: f0bb217f04
2014-02-28 09:53:27 -06:00
Richard Peter
1103fb5eff Merge "Issue #2838 Archive binary feeder creation." into development
Former-commit-id: 944ea7936c [formerly 952669fc38] [formerly 944ea7936c [formerly 952669fc38] [formerly 475557d4c8 [formerly c8ab23e68f870a6fc46171b9076e09689bc1b5bb]]]
Former-commit-id: 475557d4c8
Former-commit-id: 67a6ef4bd8 [formerly 1d51a87e86]
Former-commit-id: db1e7f8f48
2014-02-27 17:36:56 -06:00
Nate Jensen
b051dab483 Issue #2638 wrote java utility for generating list of data URIs and
their field names

Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863

Former-commit-id: 5b2f17826e [formerly 7fb97ffad0] [formerly 5b2f17826e [formerly 7fb97ffad0] [formerly 39e167fc76 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]]]
Former-commit-id: 39e167fc76
Former-commit-id: f3de646859 [formerly 8bf8302811]
Former-commit-id: f325498ec3
2014-02-27 17:14:32 -06:00
Nate Jensen
d286ba624c Merge "Issue #2823 deploy install now defaults to x86_64." into development
Former-commit-id: 82817c2cbd [formerly f7b4c75f13] [formerly 82817c2cbd [formerly f7b4c75f13] [formerly d7a8ddbb83 [formerly 75be0d86a588209ff572362f098095beb0b618d2]]]
Former-commit-id: d7a8ddbb83
Former-commit-id: c439ecb2a4 [formerly 35ea5b9eb2]
Former-commit-id: 8b7fecdd99
2014-02-27 16:44:26 -06:00
Brad Gonzales
562245f2af Issue #2823 deploy install now defaults to x86_64.
Change-Id: I06034fd03ab3779d83522134cb8067a64c2dcecc

Former-commit-id: 73ed932660 [formerly 2135663934] [formerly 73ed932660 [formerly 2135663934] [formerly 45160326aa [formerly 9ef72acfce925dfcfc0df07e7ca5fb558b54d934]]]
Former-commit-id: 45160326aa
Former-commit-id: 003f028176 [formerly 90e6558083]
Former-commit-id: b6dbc7f605
2014-02-27 16:34:53 -06:00
Lee Venable
7299c53ba5 Issue #2795 - removed test code.
Former-commit-id: e34e636dc7 [formerly 28fe1e99e2] [formerly e34e636dc7 [formerly 28fe1e99e2] [formerly f94bcc4d3f [formerly 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9]]]
Former-commit-id: f94bcc4d3f
Former-commit-id: 267fa56e32 [formerly 708de93fc4]
Former-commit-id: d026da3632
2014-02-27 15:46:30 -06:00
Richard Peter
5fab51d41b 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: 7bd6a07913 [formerly 0e25ae35c1] [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 50a1b270c5 [formerly f13c86bc3e]
Former-commit-id: 9b3f8f9649
2014-02-27 15:18:26 -06:00
Richard Peter
68eade49a2 Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: c267c5a08f [formerly 86d42ed603] [formerly c267c5a08f [formerly 86d42ed603] [formerly 862069dfd3 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]
Former-commit-id: 862069dfd3
Former-commit-id: 237ada7b8b [formerly c0d495d9c3]
Former-commit-id: 9489565efb
2014-02-27 13:46:47 -06:00
Richard Peter
8d35f1ce5f Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: a23c8f2c27 [formerly 729d608a15] [formerly a23c8f2c27 [formerly 729d608a15] [formerly d54fee5dae [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]
Former-commit-id: d54fee5dae
Former-commit-id: 67093287a0 [formerly 229437773b]
Former-commit-id: 9ca22fce7f
2014-02-27 13:20:49 -06:00
Steve Harris
40e335fdf7 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 182c16067c [formerly 5218a4d1e6] [formerly 182c16067c [formerly 5218a4d1e6] [formerly 99f53876d7 [formerly 2f2339f4c12e1862d27a8dda65264f353aed6ac6]]]
Former-commit-id: 99f53876d7
Former-commit-id: b8afc0e5f7 [formerly 0d9abc724c]
Former-commit-id: 1c547c6a96
2014-02-27 10:02:43 -06:00
Nate Jensen
445fd40303 Merge "Issue #2312 Fix file dialog input on export image dialog." into development
Former-commit-id: 414cc002b1 [formerly 71d494eb34] [formerly 414cc002b1 [formerly 71d494eb34] [formerly d1ec11d932 [formerly 4c4325675377cd170468a0c3dbe4632f5330227e]]]
Former-commit-id: d1ec11d932
Former-commit-id: 80ef0dc055 [formerly 9a39867de4]
Former-commit-id: ee788777ad
2014-02-27 09:10:07 -06:00
Roger Ferrel
1b29ee087f Issue #2838 Archive binary feeder creation.
Change-Id: I4e431d62e3d27565af75d52012fe042a18fd1f9c

Former-commit-id: ac03675880 [formerly 9b7715e5e0] [formerly ac03675880 [formerly 9b7715e5e0] [formerly 995d962a66 [formerly 16c38960863df2f993c6ee7e18de31824cbdbb08]]]
Former-commit-id: 995d962a66
Former-commit-id: dae52ad3a0 [formerly 03843090fa]
Former-commit-id: 40369d124f
2014-02-27 07:45:40 -06:00
Brian.Dyke
f9587d39d1 OB_14.1.1-20 baseline
Former-commit-id: b2401d2f0d [formerly 324696c436] [formerly b2401d2f0d [formerly 324696c436] [formerly 2bad40cfee [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]
Former-commit-id: 2bad40cfee
Former-commit-id: c873f20d04 [formerly 16117255f3]
Former-commit-id: 5feadbe4d9
2014-02-26 17:39:15 -05:00
Lee Venable
54fa6c12b3 Issue #2795 - added code to check for null images.
Former-commit-id: 5546b537cf [formerly 0c7395d423] [formerly 5546b537cf [formerly 0c7395d423] [formerly 49530206f4 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]
Former-commit-id: 49530206f4
Former-commit-id: 35f6f35186 [formerly facc67e6b5]
Former-commit-id: 3932c3f02f
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
0dd62678f2 Issue #2711 Use level factory more.
Former-commit-id: 1069ef8d67 [formerly d7a3ae4fdb] [formerly 1069ef8d67 [formerly d7a3ae4fdb] [formerly 3da086b71f [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]
Former-commit-id: 3da086b71f
Former-commit-id: 29f9a87085 [formerly f45646ae91]
Former-commit-id: 3a5f655ea4
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
5fd6a533b8 Issue #2312 Fix file dialog input on export image dialog.
Former-commit-id: 2fd8351874 [formerly e1dc75f97a] [formerly 2fd8351874 [formerly e1dc75f97a] [formerly 6d0a78e233 [formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]]
Former-commit-id: 6d0a78e233
Former-commit-id: 058652febe [formerly 2d11421854]
Former-commit-id: 542c8ae3a1
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
d899433612 Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: 2425b9665c [formerly d8bfdd1a7e] [formerly 2425b9665c [formerly d8bfdd1a7e] [formerly 07bc9f075f [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 0fde78c595 [formerly 804cbb48e6]
Former-commit-id: 6843396c78
2014-02-26 14:45:19 -06:00
Lee Venable
8d49130542 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: bb4b034375 [formerly 94cede8153] [formerly bb4b034375 [formerly 94cede8153] [formerly e0ee93bab3 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 91d419662c [formerly e0fbc02307]
Former-commit-id: 316ba53e74
2014-02-26 13:21:58 -06:00
Lee Venable
19e67bdb0c Merge "Issue #2652. Fixed issue with edex-text-ingest log." into development
Former-commit-id: f58481dc6a [formerly 72f71bc000] [formerly f58481dc6a [formerly 72f71bc000] [formerly 34191dc3dc [formerly 0d1df7da4612a71195b4850b88b716f0d03acfe8]]]
Former-commit-id: 34191dc3dc
Former-commit-id: f2db331c8e [formerly b4b6cb655e]
Former-commit-id: 23c2014393
2014-02-25 15:53:14 -06:00
Brad Gonzales
d1ef377ec0 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: 40a653867a [formerly 4ccfe4f3c0] [formerly 40a653867a [formerly 4ccfe4f3c0] [formerly cf9c22ac99 [formerly d8c2ebe2ae5180cf074181c162fa5e7f312893df]]]
Former-commit-id: cf9c22ac99
Former-commit-id: 1df77529c3 [formerly a24cbaf683]
Former-commit-id: 3780b24792
2014-02-25 14:42:59 -06:00
Slav Korolev
9dd91d63c1 Issue #2652. Fixed issue with edex-text-ingest log.
Former-commit-id: a34b1196b7 [formerly 5087a0154d] [formerly a34b1196b7 [formerly 5087a0154d] [formerly bfa84e65ec [formerly 728e5b2d7ecad662e0c876533726d4bdd5c265d7]]]
Former-commit-id: bfa84e65ec
Former-commit-id: 0566c86a6c [formerly 40b4bf6e8e]
Former-commit-id: 5e494af996
2014-02-25 15:23:22 -05:00
Richard Peter
e28b3bb5b9 Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1
Former-commit-id: 90b48e0393 [formerly 3735cd3ffe] [formerly 90b48e0393 [formerly 3735cd3ffe] [formerly b4e48698ed [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]
Former-commit-id: b4e48698ed
Former-commit-id: f803d557c2 [formerly 66b271a550]
Former-commit-id: e78e5a15b9
2014-02-25 12:34:38 -06:00
Brad Gonzales
aa2d8b76a1 Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: b6e2ce4b74 [formerly 783afb1585] [formerly b6e2ce4b74 [formerly 783afb1585] [formerly 8b2b50baaf [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: f57f472f6a [formerly 5ce1939d01]
Former-commit-id: f4513d0e64
2014-02-25 09:22:08 -06:00
Brian Clements
1001ef1ec2 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: 3f0e9d7a77 [formerly eef242194a] [formerly 3f0e9d7a77 [formerly eef242194a] [formerly 3d365a4cd2 [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: 1f5d296314 [formerly 473fcda0cf]
Former-commit-id: a102e927b1
2014-02-25 09:17:36 -06:00
Nate Jensen
caaffabda3 Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
Former-commit-id: 8ef957d2f0 [formerly 279f05a1d5] [formerly 8ef957d2f0 [formerly 279f05a1d5] [formerly 060eafc272 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]
Former-commit-id: 060eafc272
Former-commit-id: 2f58408036 [formerly a5477ea272]
Former-commit-id: d9411eb382
2014-02-24 16:17:20 -06:00
Nate Jensen
78c8f1a62c Issue #2830 sort TAF dataTimes so latest are retrieved
Former-commit-id: 230b8bf117 [formerly 8a00a419a1] [formerly 230b8bf117 [formerly 8a00a419a1] [formerly f353c44cc0 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]
Former-commit-id: f353c44cc0
Former-commit-id: a97f5b5ff7 [formerly 74329bcb89]
Former-commit-id: 02d2f0c713
2014-02-24 15:35:13 -06:00
Brian.Dyke
0bcf7c89b8 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 363403fb34 [formerly 2faab606e5] [formerly 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 73a1c238f4 [formerly 227131e5f1]
Former-commit-id: 38829b9014
2014-02-24 14:51:00 -05:00
Ron Anderson
3c673caec2 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: 45ccac0859 [formerly 4364e7497c] [formerly 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: 7d3af157f8 [formerly 3b2ea2d6ac]
Former-commit-id: f2b0cc20e8
2014-02-24 13:46:48 -06:00
Nate Jensen
da2a363550 Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1
Former-commit-id: 98a6101cd3 [formerly 2111109ce2] [formerly 98a6101cd3 [formerly 2111109ce2] [formerly b1586f8603 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]
Former-commit-id: b1586f8603
Former-commit-id: d6e9cb73f5 [formerly bf8bb95f51]
Former-commit-id: 6979321635
2014-02-24 13:25:35 -06:00