Commit graph

2233 commits

Author SHA1 Message Date
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
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
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
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
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
Dave Hladky
e030ac65b2 Issue #2469 Fixed default rules implementation
Former-commit-id: f9c6a396f0 [formerly 1d256bfcee] [formerly f9c6a396f0 [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]
Former-commit-id: 45413d0db4
Former-commit-id: dc97eb7890 [formerly ff5a5961db]
Former-commit-id: 8a924bcc2c
2014-02-24 13:06:52 -06:00
Ben Steffensmeier
831bb0b021 Issue #2762 Use UCUM to format units so IRPixel formats correctly.
Former-commit-id: f7c48b24bb [formerly 9e5f7d90a0] [formerly f7c48b24bb [formerly 9e5f7d90a0] [formerly f8cc0e3d95 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 3c7e578000 [formerly a510abdb22]
Former-commit-id: 358e7d3b1d
2014-02-24 10:27:30 -06:00
Dave Hladky
c4e70210fd Issue #2636 Try Catch around the MaintTask
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: 542ba7e504 [formerly c4bed432da] [formerly 542ba7e504 [formerly c4bed432da] [formerly 49f6c31256 [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]
Former-commit-id: 49f6c31256
Former-commit-id: 3b9f80d03e [formerly 445b55f796]
Former-commit-id: c545368839
2014-02-21 16:01:20 -06:00
Brad Gonzales
7dddf974b8 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: 290a381715 [formerly 12e22752c2] [formerly 290a381715 [formerly 12e22752c2] [formerly bd25ec4cd9 [formerly 6a42f4162ace5a799df4df0e24bf0199905dcf89]]]
Former-commit-id: bd25ec4cd9
Former-commit-id: bef4e8ee53 [formerly 08c4d1afea]
Former-commit-id: 675477ed66
2014-02-20 16:31:16 -06:00
Ron Anderson
42048983ce Issue #2824 Registered with SiteAwareRegistry so we can stop fetching when site is deactivated.
Change-Id: I4e277656a971e7927aa2321e91ba7304351f9405

Former-commit-id: e4aeaa79f1 [formerly 6a7e4a147d] [formerly e4aeaa79f1 [formerly 6a7e4a147d] [formerly 6ccf6a56e7 [formerly a2b2a15f1ef8e237058f1760d64021895ae27c35]]]
Former-commit-id: 6ccf6a56e7
Former-commit-id: 1dcaf2b790 [formerly d63ad1b1de]
Former-commit-id: 2eb6cb45e3
2014-02-20 12:32:31 -06:00
Ron Anderson
a5c6428787 Merge "Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used" into development
Former-commit-id: 810ad594a1 [formerly c13942140a] [formerly 810ad594a1 [formerly c13942140a] [formerly 6f4a63000d [formerly 0729266c3f82eccdbf6835789898291ad34451c4]]]
Former-commit-id: 6f4a63000d
Former-commit-id: ee5658f9d9 [formerly c07544b904]
Former-commit-id: 32b8cc8a8e
2014-02-20 09:55:56 -06:00
Ron Anderson
30d9fec3ae Issue #2824 Fix localVTECpartners include directory. Add logging to help determine when local overrides are not being used
Change-Id: I9a100fe3b1a9c8dc94639029d6380f36f5ba4da7

Former-commit-id: 2bfa521e7d [formerly 6b6aa14e59] [formerly 2bfa521e7d [formerly 6b6aa14e59] [formerly 08a1be844d [formerly 37a420582eea8d3a1b4861e18c20d044c636173f]]]
Former-commit-id: 08a1be844d
Former-commit-id: 0ee3625c50 [formerly 1571b9a8eb]
Former-commit-id: 7897be61e2
2014-02-20 09:34:18 -06:00
Nate Jensen
1db1ae5a38 Merge "Issue #2761 add region level to localization" into development
Former-commit-id: 3782880dac [formerly 9011e1b31e] [formerly 3782880dac [formerly 9011e1b31e] [formerly 6e59175ce4 [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]
Former-commit-id: 6e59175ce4
Former-commit-id: 9394879520 [formerly b1e2788958]
Former-commit-id: 8f73511086
2014-02-19 17:18:24 -06:00
Nate Jensen
dbdcfa8e41 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: a241472c34 [formerly df376abcb7] [formerly a241472c34 [formerly df376abcb7] [formerly f99cf7df47 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]]
Former-commit-id: f99cf7df47
Former-commit-id: d3ec0da1bb [formerly 8b152a8027]
Former-commit-id: dafb323edb
2014-02-19 16:19:27 -06:00
Ron Anderson
331803d94a Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: 8703c43937 [formerly 98d2417f94] [formerly 8703c43937 [formerly 98d2417f94] [formerly b8c00d8ead [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]
Former-commit-id: b8c00d8ead
Former-commit-id: b9904edc3a [formerly 7e7f0abfdc]
Former-commit-id: db9cc1e6b5
2014-02-19 15:39:56 -06:00
Mike Duff
401973b39e Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: e2a6251a6b [formerly 663ea8decd] [formerly e2a6251a6b [formerly 663ea8decd] [formerly 95fcee385a [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]
Former-commit-id: 95fcee385a
Former-commit-id: 89c4a3e04b [formerly 3100a71f34]
Former-commit-id: 92d356f4f0
2014-02-19 15:26:14 -06:00
Ron Anderson
e91fd1d683 Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617

Former-commit-id: 663cb4cb62 [formerly 5258aecf45] [formerly 663cb4cb62 [formerly 5258aecf45] [formerly 419e9d0b8d [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 908e43039e [formerly 8a41723ba6]
Former-commit-id: b0a4b63689
2014-02-19 11:55:11 -06:00
Slav Korolev
8ab22e3559 Issue #2652. Fixed issue with edex-text-ingest log. Deleted unused code.
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b

Former-commit-id: f7a6a6c613 [formerly a597ac0989] [formerly f7a6a6c613 [formerly a597ac0989] [formerly 3b1ea13cb1 [formerly 7b666c5fb7a1cb459a90bb295e58491a9a21063c]]]
Former-commit-id: 3b1ea13cb1
Former-commit-id: 06d55c28f4 [formerly 8ec2d02f52]
Former-commit-id: f09add5f92
2014-02-19 12:01:06 -05:00
Matt Nash
1814b1448e 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: 3f67324d7c [formerly 2d20e84f6a] [formerly 3f67324d7c [formerly 2d20e84f6a] [formerly 1835019567 [formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]
Former-commit-id: 1835019567
Former-commit-id: ae1d36b6d0 [formerly bb10484bd0]
Former-commit-id: 3b39e1d2bc
2014-02-19 10:01:25 -06:00
Nate Jensen
51e9dec1c0 Merge "Issue #2672 Fix radar dataaccess from pure python." into development
Former-commit-id: 82fde2011c [formerly 698a4f827d] [formerly 82fde2011c [formerly 698a4f827d] [formerly 713ec598c3 [formerly 6c8fba6afd4b5e28b425b6058e40130a1dd0b518]]]
Former-commit-id: 713ec598c3
Former-commit-id: 05edfb90d5 [formerly 79cbb8d79a]
Former-commit-id: 93458ab911
2014-02-18 17:35:39 -06:00
Nate Jensen
337aa2f312 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: ac0a10678b [formerly 020d54c48a] [formerly ac0a10678b [formerly 020d54c48a] [formerly b08d96b1e8 [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]
Former-commit-id: b08d96b1e8
Former-commit-id: 4bb0997749 [formerly a6bb05f2e3]
Former-commit-id: 3c9ebe52d3
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
4a4ff1e02d Issue #2672 Fix radar dataaccess from pure python.
Former-commit-id: add98f22b1 [formerly 3e0cba04c0] [formerly add98f22b1 [formerly 3e0cba04c0] [formerly e19b4518ef [formerly 8beef8db2ffe599c9167dbd61aed8243d3a0af0e]]]
Former-commit-id: e19b4518ef
Former-commit-id: 2be385e6b8 [formerly 399e3d3f07]
Former-commit-id: 4e57fcf1f2
2014-02-18 13:57:28 -06:00
David Gillingham
5911f4b2d4 Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: 607ce13c19 [formerly 32719432ff] [formerly 607ce13c19 [formerly 32719432ff] [formerly de12904c7a [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]
Former-commit-id: de12904c7a
Former-commit-id: a83191356d [formerly 1520317c24]
Former-commit-id: 474dda75de
2014-02-18 13:24:37 -06:00
Richard Peter
bbce2567a7 Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1
Former-commit-id: c666adb530 [formerly 3ed6ad64ce] [formerly c666adb530 [formerly 3ed6ad64ce] [formerly d19e464a1a [formerly 5bf461753675af961c484d022cec4006fabfeba8]]]
Former-commit-id: d19e464a1a
Former-commit-id: f7e43bdabd [formerly 3c4e188037]
Former-commit-id: ccd90f2d86
2014-02-18 12:44:57 -06:00
Lee Venable
0bd01db3cc Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1
Former-commit-id: e9226e7140 [formerly 0cf2dba731] [formerly e9226e7140 [formerly 0cf2dba731] [formerly 4e7c3c0cbe [formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]]
Former-commit-id: 4e7c3c0cbe
Former-commit-id: 46dbd967a5 [formerly 6fc9dcb3b1]
Former-commit-id: 28b0809a1c
2014-02-18 12:19:41 -06:00
Brad Gonzales
d50a8cd7a5 Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
Amend: updated test envlope sizes.
       fixed ticket numbers in software history.

Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5

Former-commit-id: 49ddffc99b [formerly 36a24c1cb5] [formerly 49ddffc99b [formerly 36a24c1cb5] [formerly 794bbc3c9b [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 3bb9975728 [formerly 90d34f7386]
Former-commit-id: b99b5d9373
2014-02-18 12:11:02 -06:00
Mike Duff
2467a11a7e Issue #2636 - Change how retrieval plan is updated over time.
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: 33f81d8822 [formerly 89bd047283] [formerly 33f81d8822 [formerly 89bd047283] [formerly 911789b910 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]]
Former-commit-id: 911789b910
Former-commit-id: 42e6591bc8 [formerly 5f9d913c6d]
Former-commit-id: d277c1caf1
2014-02-18 12:05:26 -06:00
Brad Gonzales
b0421675ff Issue #2771 For Data Delivery CAVE now request current id from
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: 379c0fb46c [formerly 19460ed0d7] [formerly 379c0fb46c [formerly 19460ed0d7] [formerly ba4e308328 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]
Former-commit-id: ba4e308328
Former-commit-id: 1b76488111 [formerly 3be3380944]
Former-commit-id: 9aa1cb299e
2014-02-18 11:10:44 -06:00
Ron Anderson
8a7af092f2 Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: e7f2b6883d [formerly 32bcf9d0d0] [formerly e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 0135771eec [formerly d4ba9eba94]
Former-commit-id: 68e03bf02f
2014-02-18 10:45:20 -06:00
Brian Clements
f866ac4365 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: f0c89ef6c6 [formerly f6b2827434] [formerly f0c89ef6c6 [formerly f6b2827434] [formerly 5b4f1e8288 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 02319f36e4 [formerly a1d9e40bd4]
Former-commit-id: 5889341612
2014-02-18 10:03:12 -06:00
Dave Hladky
51b644bf0c Issue #2786 Pending subscriptions don't work.
Former-commit-id: 24a4fab603 [formerly 5c11dd09bb] [formerly 24a4fab603 [formerly 5c11dd09bb] [formerly 7ee101d7c7 [formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]]]
Former-commit-id: 7ee101d7c7
Former-commit-id: 012619f05f [formerly 78d41d01bb]
Former-commit-id: 9ccf06c4f4
2014-02-18 09:14:38 -06:00
Bryan Kowal
14488904e5 Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now.
Amend: add a default value for localization site in the pure overrider.

Change-Id: I6056c274a10def96ba69786b58ba284146e49160

Former-commit-id: bb3a067f93 [formerly f5afe830a7] [formerly bb3a067f93 [formerly f5afe830a7] [formerly e0b0d88e46 [formerly 71c960bfc67fd78d3ffee8a14005d4391f4bc2aa]]]
Former-commit-id: e0b0d88e46
Former-commit-id: b5d4574294 [formerly d4ce52459e]
Former-commit-id: f5e65b5e56
2014-02-17 14:41:10 -06:00
Nate Jensen
c6b270f084 Issue #2813 fix xml serialization of subscriptions
Former-commit-id: 4583814741 [formerly be75cc3731] [formerly 4583814741 [formerly be75cc3731] [formerly 83e9226419 [formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]]
Former-commit-id: 83e9226419
Former-commit-id: e9bbdfdf89 [formerly 30bbc788ce]
Former-commit-id: 39b3824ae3
2014-02-17 11:37:48 -06:00
Steve Harris
7805eac857 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: d0352c69d4 [formerly 267cc881a4] [formerly d0352c69d4 [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 146412a8bd [formerly e115197bb7]
Former-commit-id: 28aa3dd195
2014-02-17 08:54:34 -06:00
Max Schenkelberg
316e7ca511 Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df

Former-commit-id: 4d656b5d06 [formerly 6309f9b34b] [formerly 4d656b5d06 [formerly 6309f9b34b] [formerly c8e93190f2 [formerly 8b3deac27c76c6827ad2ad7863f91a3b8fbe7fa4]]]
Former-commit-id: c8e93190f2
Former-commit-id: b311aba5d5 [formerly 3571135645]
Former-commit-id: d374fc9f5d
2014-02-14 10:47:42 -06:00
Ben Steffensmeier
1e96945cb8 Issue #2528 Fix display of data on somewhat identical projections.
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26

Former-commit-id: 2b30269ac9 [formerly 54a17c012d] [formerly 2b30269ac9 [formerly 54a17c012d] [formerly 23694f5e0c [formerly dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa]]]
Former-commit-id: 23694f5e0c
Former-commit-id: be00537d6d [formerly bedf3cf45d]
Former-commit-id: c8feeebbbd
2014-02-13 13:27:32 -06:00
Ron Anderson
7447a71c10 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 3e78908bb5 [formerly fcf45916f4] [formerly 3e78908bb5 [formerly fcf45916f4] [formerly 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]
Former-commit-id: 2f067699f2
Former-commit-id: d9b82b4ebe [formerly 2d7c87ac84]
Former-commit-id: d298aabe40
2014-02-13 10:10:34 -06:00
Ben Steffensmeier
3a49bb1a90 Issue #2672 Fix problems encountered in data access layer.
Former-commit-id: d663567b36 [formerly 41983df7a0] [formerly d663567b36 [formerly 41983df7a0] [formerly 835bcc695d [formerly ec95d1af0696b1f9b0b105143e26ea40937b28a8]]]
Former-commit-id: 835bcc695d
Former-commit-id: 8fb8ea57d5 [formerly d85014e363]
Former-commit-id: 9cc950cf06
2014-02-12 18:37:02 -06:00
Richard Peter
c810bf2555 Merge "Issue #2655 fix textlightning distribution regex" into development
Former-commit-id: 172f0a9fa4 [formerly 70e9bef750] [formerly 172f0a9fa4 [formerly 70e9bef750] [formerly 3feee2cf50 [formerly b1ba10c3b69187b762c962801a937adeb6ef5867]]]
Former-commit-id: 3feee2cf50
Former-commit-id: 9d183aaa97 [formerly ca851b6d2e]
Former-commit-id: 06e025de7d
2014-02-12 15:34:43 -06:00
Nate Jensen
7f3016b679 Issue #2655 fix textlightning distribution regex
Change-Id: Ia8900e8baa05d831c984fbf355034ca189364d99

Former-commit-id: cf1dcae597 [formerly a6c562d3f0] [formerly cf1dcae597 [formerly a6c562d3f0] [formerly 16d6a29bb9 [formerly 48825cb03da5bde6f8b1252fe2e366119535f8f3]]]
Former-commit-id: 16d6a29bb9
Former-commit-id: 929d683210 [formerly 3b918cee5f]
Former-commit-id: 72330e9b62
2014-02-12 15:03:45 -06:00
Ron Anderson
79a635bc9e Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
Former-commit-id: 8ba331e7fb [formerly af4f8de839] [formerly 8ba331e7fb [formerly af4f8de839] [formerly d906b780e8 [formerly caf31f2a88227c7ed9141676feb937822f4d03ce]]]
Former-commit-id: d906b780e8
Former-commit-id: 2fdcef7338 [formerly 361881dfda]
Former-commit-id: 2e1f7c8199
2014-02-11 17:16:07 -06:00
Ron Anderson
454ce0268d Issue #2719 Update NHA GFE domain
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: 0f9b44ff94 [formerly a665530831] [formerly 0f9b44ff94 [formerly a665530831] [formerly ee89463d27 [formerly 28008b46b5d68e544dace5f721b283c222701699]]]
Former-commit-id: ee89463d27
Former-commit-id: 1ca9c95567 [formerly bfa65ed39e]
Former-commit-id: dd597e8349
2014-02-11 17:07:01 -06:00
Brian.Dyke
f47dd3ef59 14.1.1-18 baseline
Former-commit-id: f05a2220cd [formerly 575e328123] [formerly f05a2220cd [formerly 575e328123] [formerly 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: d61ae6c5f4 [formerly c5857c30f2]
Former-commit-id: d1db845406
2014-02-11 15:52:50 -05:00
Slav Korolev
93db746127 Issue #2763. Made LFCR correction of input data.
Former-commit-id: 633a33dd21 [formerly 43802c3a5f] [formerly 633a33dd21 [formerly 43802c3a5f] [formerly 47fc09a684 [formerly ea2d524767ea5eef74cda5fa5fbff886da1d3bc9]]]
Former-commit-id: 47fc09a684
Former-commit-id: 293af25a13 [formerly 239f37f467]
Former-commit-id: a7d8cfb651
2014-02-11 14:48:07 -05:00
Ben Steffensmeier
d69ac764db Issue #2765 Fix aliases for probability parameters.
Former-commit-id: 2952ae37a6 [formerly 43a8b80ef2] [formerly 2952ae37a6 [formerly 43a8b80ef2] [formerly 0bb18f2cd7 [formerly 11bbfb8275cfafb411d1d5d9732b021f0011712a]]]
Former-commit-id: 0bb18f2cd7
Former-commit-id: c0dbdb9906 [formerly eb9c4ef999]
Former-commit-id: 8a4c3686f8
2014-02-11 11:35:03 -06:00
Ben Steffensmeier
cf1d48f888 Issue #2672 Allow One extra null byte in RemoteRequestRouteWrapper.
Former-commit-id: 3bc210a1f1 [formerly 3d08979eee] [formerly 3bc210a1f1 [formerly 3d08979eee] [formerly 40bc9df420 [formerly 7463bf7c3efbdf8eb184f24bfc9c6a12c57d5006]]]
Former-commit-id: 40bc9df420
Former-commit-id: 01c4ce8e29 [formerly a0227d2c4e]
Former-commit-id: 38c9773f38
2014-02-10 17:39:32 -06:00