xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4663 commits 31 branches 40 tags 3.8 GiB
Commit graph

2174 commits

Author SHA1 Message Date
Brad Gonzales
ac050068d5 Issue #2386 fixed spatial overlap rule application. 
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: 39afe190e0 [formerly b6e2ce4b74] [formerly 783afb1585] [formerly 39afe190e0 [formerly b6e2ce4b74] [formerly 783afb1585] [formerly 8b2b50baaf [formerly 783afb1585 [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: c364269fae [formerly f57f472f6a] [formerly 0b393405d83191a17ccf6537e803d672cbc79eae [formerly 5ce1939d01]]
Former-commit-id: 4945cd39a9cc275d1c7a6df8d10b99e4aea2962c [formerly f4513d0e64]
Former-commit-id: aa2d8b76a1
 2014-02-25 09:22:08 -06:00
Ron Anderson
5eb76e8ed6 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: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]]
Former-commit-id: 2db5f26840
Former-commit-id: 5831f8d79e [formerly 7d3af157f8] [formerly a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]]
Former-commit-id: 50ec6dfad53c87f1ad4174e64fdb142803fcaf62 [formerly f2b0cc20e8]
Former-commit-id: 3c673caec2
 2014-02-24 13:46:48 -06:00
Nate Jensen
0d8cd5360a Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1 
Former-commit-id: 4af8a7f326 [formerly 98a6101cd3] [formerly 2111109ce2] [formerly 4af8a7f326 [formerly 98a6101cd3] [formerly 2111109ce2] [formerly b1586f8603 [formerly 2111109ce2 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]]
Former-commit-id: b1586f8603
Former-commit-id: 1837a83743 [formerly d6e9cb73f5] [formerly 9d8fe1a0158253d440a5c43e42535da472859450 [formerly bf8bb95f51]]
Former-commit-id: 6f49258d52063f413dae43a0a944ac2785e75d66 [formerly 6979321635]
Former-commit-id: da2a363550
 2014-02-24 13:25:35 -06:00
Ben Steffensmeier
762a32fab9 Issue #2762 Use UCUM to format units so IRPixel formats correctly. 
Former-commit-id: 669b580920 [formerly f7c48b24bb] [formerly 9e5f7d90a0] [formerly 669b580920 [formerly f7c48b24bb] [formerly 9e5f7d90a0] [formerly f8cc0e3d95 [formerly 9e5f7d90a0 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 59c34458ff [formerly 3c7e578000] [formerly 8c6b48d405e8efd0e175f4ea9f8f0320fd5743ea [formerly a510abdb22]]
Former-commit-id: 0e5366ec874b8f9ecca31d3710cb6e5de118326b [formerly 358e7d3b1d]
Former-commit-id: 831bb0b021
 2014-02-24 10:27:30 -06:00
Dave Hladky
15edb8e522 Issue #2636 Try Catch around the MaintTask 
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: cd7934e12f [formerly 542ba7e504] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerly c4bed432da]] [formerly cd7934e12f [formerly 542ba7e504] [formerly 853a2d40ef0728def40ef035b20235c1973a76a6 [formerly c4bed432da]] [formerly 49f6c31256 [formerly c4bed432da [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]]
Former-commit-id: 49f6c31256
Former-commit-id: e15d2f50f9 [formerly 3b9f80d03e] [formerly de3f95e5f61e7ea15849603d3138b155fe401280 [formerly 445b55f796]]
Former-commit-id: 1b4853e591b02029ef646ca2512a6fb8faddce26 [formerly c545368839]
Former-commit-id: c4e70210fd
 2014-02-21 16:01:20 -06:00
David Gillingham
da665e15b0 Issue #2783: Rewrite run_report_alarm script into EDEX service. 
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: 43733c77eb [formerly 607ce13c19] [formerly 32719432ff] [formerly 43733c77eb [formerly 607ce13c19] [formerly 32719432ff] [formerly de12904c7a [formerly 32719432ff [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]]
Former-commit-id: de12904c7a
Former-commit-id: b373d71852 [formerly a83191356d] [formerly d751bcbb04dc8d77626c940f99e5f7ad3f73874d [formerly 1520317c24]]
Former-commit-id: dccf95a720d831ceee3c0b64bcf95676cd281af5 [formerly 474dda75de]
Former-commit-id: 5911f4b2d4
 2014-02-18 13:24:37 -06:00
Richard Peter
fac7168aac 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: 4dcb9b321d [formerly c666adb530] [formerly 3ed6ad64ce] [formerly 4dcb9b321d [formerly c666adb530] [formerly 3ed6ad64ce] [formerly d19e464a1a [formerly 3ed6ad64ce [formerly 5bf461753675af961c484d022cec4006fabfeba8]]]]
Former-commit-id: d19e464a1a
Former-commit-id: ba1cb2a9cf [formerly f7e43bdabd] [formerly 342727148b90c7cfc603e2659e805e35a76103ca [formerly 3c4e188037]]
Former-commit-id: 0946878bb5aee9e4ba8c1d55fee28dd46686ac45 [formerly ccd90f2d86]
Former-commit-id: bbce2567a7
 2014-02-18 12:44:57 -06:00
Lee Venable
80ef62e8fd Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1 
Former-commit-id: f81d0d88b8 [formerly e9226e7140] [formerly 0cf2dba731] [formerly f81d0d88b8 [formerly e9226e7140] [formerly 0cf2dba731] [formerly 4e7c3c0cbe [formerly 0cf2dba731 [formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]]]
Former-commit-id: 4e7c3c0cbe
Former-commit-id: ab57d3efe7 [formerly 46dbd967a5] [formerly acd1e7e5cccd9c772e69add2efbbd68d034964ff [formerly 6fc9dcb3b1]]
Former-commit-id: 999e96801ebb27fa8bfb43cbde945a0c58ce1874 [formerly 28b0809a1c]
Former-commit-id: 0bd01db3cc
 2014-02-18 12:19:41 -06:00
Brad Gonzales
d899777a6d 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: b0f71efecc [formerly 49ddffc99b] [formerly 36a24c1cb5] [formerly b0f71efecc [formerly 49ddffc99b] [formerly 36a24c1cb5] [formerly 794bbc3c9b [formerly 36a24c1cb5 [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 2330bf10b2 [formerly 3bb9975728] [formerly 156a80d9ff219de8a2827577a58910cefd208d71 [formerly 90d34f7386]]
Former-commit-id: f42b463f576142d80cc6c0dbb6de2708378d5614 [formerly b99b5d9373]
Former-commit-id: d50a8cd7a5
 2014-02-18 12:11:02 -06:00
Mike Duff
08bd755af0 Issue #2636 - Change how retrieval plan is updated over time. 
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: c125b9d044 [formerly 33f81d8822] [formerly 89bd047283] [formerly c125b9d044 [formerly 33f81d8822] [formerly 89bd047283] [formerly 911789b910 [formerly 89bd047283 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]]]
Former-commit-id: 911789b910
Former-commit-id: cddd263edc [formerly 42e6591bc8] [formerly 63198d978b2d9ab9f18c26071e586f7a38cac365 [formerly 5f9d913c6d]]
Former-commit-id: f2a50ed00c3b42b132cd818df4e07da12380595e [formerly d277c1caf1]
Former-commit-id: 2467a11a7e
 2014-02-18 12:05:26 -06:00
Brad Gonzales
e906d71ac4 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: 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly 1d57e9f5f7 [formerly 379c0fb46c] [formerly 19460ed0d7] [formerly ba4e308328 [formerly 19460ed0d7 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]]
Former-commit-id: ba4e308328
Former-commit-id: ae35320dd6 [formerly 1b76488111] [formerly eab08c6056f77a408245754e016c16a1db9d08f4 [formerly 3be3380944]]
Former-commit-id: 367c8f66061868a52d255ea46c57bb8c2dc11b5f [formerly 9aa1cb299e]
Former-commit-id: b0421675ff
 2014-02-18 11:10:44 -06:00
Ron Anderson
c3b687b9a5 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: 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f]
Former-commit-id: 8a7af092f2
 2014-02-18 10:45:20 -06:00
Dave Hladky
2708c918de Issue #2786 Pending subscriptions don't work. 
Former-commit-id: c8711269fa [formerly 24a4fab603] [formerly 5c11dd09bb] [formerly c8711269fa [formerly 24a4fab603] [formerly 5c11dd09bb] [formerly 7ee101d7c7 [formerly 5c11dd09bb [formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]]]]
Former-commit-id: 7ee101d7c7
Former-commit-id: b0849517aa [formerly 012619f05f] [formerly 8cc48c2dd72749fa9b1d02eaf6673400410fa283 [formerly 78d41d01bb]]
Former-commit-id: ef97cd1ab357557ce1ca31b9265c978f0586073f [formerly 9ccf06c4f4]
Former-commit-id: 51b644bf0c
 2014-02-18 09:14:38 -06:00
Nate Jensen
0bca06ef1a Issue #2813 fix xml serialization of subscriptions 
Former-commit-id: e42eb1940d [formerly 4583814741] [formerly 81da42a36a6b3a653ef59de2dc4ec5fb3158386f [formerly be75cc3731]] [formerly e42eb1940d [formerly 4583814741] [formerly 81da42a36a6b3a653ef59de2dc4ec5fb3158386f [formerly be75cc3731]] [formerly 83e9226419 [formerly be75cc3731 [formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]]]
Former-commit-id: 83e9226419
Former-commit-id: fd8e2126b1 [formerly e9bbdfdf89] [formerly 814fc7ae6232206fb29b52f95a6d3c32f51b62c5 [formerly 30bbc788ce]]
Former-commit-id: 97227c6baf4c9b880f984a88d56c645160f85e93 [formerly 39b3824ae3]
Former-commit-id: c6b270f084
 2014-02-17 11:37:48 -06:00
Steve Harris
a5d78a7f44 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 1b7e02636d [formerly d0352c69d4] [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly 267cc881a4 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 1fbbb6e73f [formerly 146412a8bd] [formerly 4c759335f64413680ab7d7fe1fc420d460dacc98 [formerly e115197bb7]]
Former-commit-id: 3a7d7a0e21b09081b233b6aa8dcf49e018ef8486 [formerly 28aa3dd195]
Former-commit-id: 7805eac857
 2014-02-17 08:54:34 -06:00
Ben Steffensmeier
f686048ddc Issue #2528 Fix display of data on somewhat identical projections. 
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26

Former-commit-id: 94f0b52344 [formerly 2b30269ac9] [formerly 54a17c012d] [formerly 94f0b52344 [formerly 2b30269ac9] [formerly 54a17c012d] [formerly 23694f5e0c [formerly 54a17c012d [formerly dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa]]]]
Former-commit-id: 23694f5e0c
Former-commit-id: bc38342841 [formerly be00537d6d] [formerly 9216d693916f99cccb2708677c47ef641c0cf7d1 [formerly bedf3cf45d]]
Former-commit-id: d7ddd5a4a6a966a25cee41eb29c97f5337897152 [formerly c8feeebbbd]
Former-commit-id: 1e96945cb8
 2014-02-13 13:27:32 -06:00
Ron Anderson
86f067bac9 Issue #2788 Fix topo for large areas. 
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 69ee4792ad [formerly 3e78908bb5] [formerly fcf45916f4] [formerly 2f067699f2 [formerly fcf45916f4 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]]
Former-commit-id: 2f067699f2
Former-commit-id: 4d8ebf6712 [formerly d9b82b4ebe] [formerly 3ebfa79176cc7f3e52da6c61f6bee73013042f0c [formerly 2d7c87ac84]]
Former-commit-id: d0c2bdea1752a1aeb905c70a45c12e3d9bda80dc [formerly d298aabe40]
Former-commit-id: 7447a71c10
 2014-02-13 10:10:34 -06:00
Ron Anderson
303a1b1786 Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1 
Former-commit-id: cf7281ba3c [formerly 8ba331e7fb] [formerly af4f8de839] [formerly cf7281ba3c [formerly 8ba331e7fb] [formerly af4f8de839] [formerly d906b780e8 [formerly af4f8de839 [formerly caf31f2a88227c7ed9141676feb937822f4d03ce]]]]
Former-commit-id: d906b780e8
Former-commit-id: e0403fd81d [formerly 2fdcef7338] [formerly 33d7dc6d66fee245851700ef94b840f31e915bc0 [formerly 361881dfda]]
Former-commit-id: 64ebb3c14ee6f0c360a86bff0fcf037a49b4d01a [formerly 2e1f7c8199]
Former-commit-id: 79a635bc9e
 2014-02-11 17:16:07 -06:00
Ron Anderson
3d1cd70b57 Issue #2719 Update NHA GFE domain 
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: 0b73d0703e [formerly 0f9b44ff94] [formerly a665530831] [formerly 0b73d0703e [formerly 0f9b44ff94] [formerly a665530831] [formerly ee89463d27 [formerly a665530831 [formerly 28008b46b5d68e544dace5f721b283c222701699]]]]
Former-commit-id: ee89463d27
Former-commit-id: 07fdb410c6 [formerly 1ca9c95567] [formerly 92ba98108868529a68af7962661c0c08a1eade14 [formerly bfa65ed39e]]
Former-commit-id: 738332a4bfc2ad7f86c63c6827a2be4e66627c41 [formerly dd597e8349]
Former-commit-id: 454ce0268d
 2014-02-11 17:07:01 -06:00
Brian.Dyke
fc21d2dee4 14.1.1-18 baseline 
Former-commit-id: 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1f27652aa3 [formerly f05a2220cd] [formerly 575e328123] [formerly 1d6a9456b7 [formerly 575e328123 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: 1c7bf39f73 [formerly d61ae6c5f4] [formerly 57fbd21c8831f46d66fe301b77916657b0ab9f05 [formerly c5857c30f2]]
Former-commit-id: 48b7eeaa6cb834b10db17643ac629aaa112f6878 [formerly d1db845406]
Former-commit-id: f47dd3ef59
 2014-02-11 15:52:50 -05:00
Ben Steffensmeier
ee421748c3 Issue #2765 Fix aliases for probability parameters. 
Former-commit-id: 89d47e3243 [formerly 2952ae37a6] [formerly 43a8b80ef2] [formerly 89d47e3243 [formerly 2952ae37a6] [formerly 43a8b80ef2] [formerly 0bb18f2cd7 [formerly 43a8b80ef2 [formerly 11bbfb8275cfafb411d1d5d9732b021f0011712a]]]]
Former-commit-id: 0bb18f2cd7
Former-commit-id: be4d0f1c88 [formerly c0dbdb9906] [formerly 63b3cde2a263f269c8044495d613aae2f31b7980 [formerly eb9c4ef999]]
Former-commit-id: fa23535348a4984a61c61d93acbf80e9954fa499 [formerly 8a4c3686f8]
Former-commit-id: d69ac764db
 2014-02-11 11:35:03 -06:00
Nate Jensen
aba5c50bfe Issue #2704 smarter thin client connectivity dialog and connection 
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly 24bbf4949d [formerly c28085118f] [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]]
Former-commit-id: fd43d9e095
Former-commit-id: 1dcb3a77c3 [formerly c0256ac19e] [formerly d828ad996a7bd8eb159d4cd60c7b851fc8ac8486 [formerly 2111989497]]
Former-commit-id: 65cd03344892f0b8870a3dcdc9e97aa695e0a8e5 [formerly 9e09da8bb6]
Former-commit-id: 93a740106d
 2014-02-10 16:48:29 -06:00
Brad Gonzales
304704a39d Issue #2636 Changed EdexBandwidthManager startup scheduling to use the 
in-memory bandwidth manager to setup initial scheduling because it
is much faster.

Amend: updated log statement.
       fix for rescheduling of already scheduled BandwidthAllocations.

Change-Id: I5c6d6543bce8222cb746fde2951caf6439db5fa3

Former-commit-id: c275da6725 [formerly 9529c1d191] [formerly 0524d3ea53181abcebe32d0fb47e14ba77359c86 [formerly 9c50fb29fd]] [formerly c275da6725 [formerly 9529c1d191] [formerly 0524d3ea53181abcebe32d0fb47e14ba77359c86 [formerly 9c50fb29fd]] [formerly 704e466f28 [formerly 9c50fb29fd [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]]]
Former-commit-id: 704e466f28
Former-commit-id: e57abad188 [formerly b59278f73f] [formerly fce69a5a63e582579ba583e885690b5aed2ab58f [formerly 0b211e8036]]
Former-commit-id: ce3bd1dae0d4336304304ae2262d659cba06e09c [formerly 104625b66d]
Former-commit-id: a8256a5202
 2014-02-07 09:35:36 -06:00
Ben Steffensmeier
58cdbe5b37 Issue #2762 Fix Satellite Data Access. 
Former-commit-id: 89105e1257 [formerly a26a150a69] [formerly 2166b5b696] [formerly 89105e1257 [formerly a26a150a69] [formerly 2166b5b696] [formerly ed2c1a0329 [formerly 2166b5b696 [formerly 4016e9366e8917225777b079da4b94dd1e6fde4a]]]]
Former-commit-id: ed2c1a0329
Former-commit-id: 7954587c40 [formerly 270433f5f3] [formerly 7fbc07009858ae2446c648b08c7b4a17103a905c [formerly e7662de8db]]
Former-commit-id: 4bfd34ac775c1575790378406f289cb7e821653f [formerly ad709c9692]
Former-commit-id: b6a5148b42
 2014-02-06 13:53:44 -06:00
Mike Duff
e5a2e9c6d2 Issue #2636 - Fix for ncf spring config 
Former-commit-id: e69e8c4615 [formerly 3707a4eabd] [formerly 3f7defe563] [formerly e69e8c4615 [formerly 3707a4eabd] [formerly 3f7defe563] [formerly e84ae26421 [formerly 3f7defe563 [formerly 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6]]]]
Former-commit-id: e84ae26421
Former-commit-id: a63fdead0c [formerly 9ec273fdcc] [formerly d951ae7e0460f11e17e732248e01e37ce6a521fa [formerly 6210a6aa18]]
Former-commit-id: 4baf28cf015acd819e9c7ef99bf29aae41b460c7 [formerly af8013baa7]
Former-commit-id: c9f53e2346
 2014-02-06 09:29:20 -06:00
Richard Peter
1956e06576 Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1 
Former-commit-id: 8ad3c5857b [formerly 82fc0a2ed3] [formerly 64f0cabaef] [formerly 8ad3c5857b [formerly 82fc0a2ed3] [formerly 64f0cabaef] [formerly 36d3d21b57 [formerly 64f0cabaef [formerly daacb19de029a15f94338c84a85116d0435f79be]]]]
Former-commit-id: 36d3d21b57
Former-commit-id: 5a7e7af23b [formerly c3c1205848] [formerly 15e05c73cb80bc97c2edc96c60ee1065b9f736b4 [formerly c965993d17]]
Former-commit-id: 34784310173da5accc225bf38ea0abccf3c639e4 [formerly 15c2f761be]
Former-commit-id: 8471e5dd46
 2014-02-05 18:20:36 -06:00
Mike Duff
6f00321a11 Issue #2677 - Don't do overlap checks when updating subs to deactivated. 
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: 3691146e34 [formerly bafe19bbd5] [formerly 101c08818d] [formerly 3691146e34 [formerly bafe19bbd5] [formerly 101c08818d] [formerly 6b01c2957f [formerly 101c08818d [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]]
Former-commit-id: 6b01c2957f
Former-commit-id: 229efa7c5b [formerly 9edf591218] [formerly c5c924842a196e06e1a50bd0c39e0bc05f4fb139 [formerly 6a2f75e8d5]]
Former-commit-id: 48997d15c589f0dd6cb352af2ea838edf7a6e2dd [formerly bb43ec00b1]
Former-commit-id: 377beb33a8
 2014-02-05 16:08:01 -06:00
Dave Hladky
36bc408bc2 Issue #2686 Refactor of retrieval 
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 1c8f6fb36d [formerly 7fb7e10cda] [formerly 6172c83afc] [formerly 39f97723d6 [formerly 6172c83afc [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]]
Former-commit-id: 39f97723d6
Former-commit-id: 14f2c99e46 [formerly 39f5579103] [formerly d5d37d7b55d86fa82a363075d901e0a1583e45de [formerly 2b998409f5]]
Former-commit-id: d275e71a9e574bd23d396da26d9a5eaa6435dea7 [formerly 8e2eb4d255]
Former-commit-id: 59590fdf36
 2014-02-05 14:49:26 -06:00
Richard Peter
793aabd17e Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1 
Former-commit-id: 176bee122b [formerly 21b0a87d78] [formerly 8f844bc9ce] [formerly 176bee122b [formerly 21b0a87d78] [formerly 8f844bc9ce] [formerly e5af004993 [formerly 8f844bc9ce [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]]]
Former-commit-id: e5af004993
Former-commit-id: 0c66686f19 [formerly d3f13fc4c7] [formerly 221df5c8f19958cdb7f96c8c47eb4903283decbe [formerly 4309c55a5f]]
Former-commit-id: cd20d2699e4537618b026ece7d62e0cb6723221f [formerly 1b8aacc92f]
Former-commit-id: 1aaeaf0037
 2014-02-04 18:12:48 -06:00
Brian.Dyke
90edefdb00 Issue #224 
Former-commit-id: cd80c22b5c [formerly ed476a583f] [formerly 3f86a80d7e] [formerly cd80c22b5c [formerly ed476a583f] [formerly 3f86a80d7e] [formerly dad6f2896b [formerly 3f86a80d7e [formerly 043faa447b4fc15a996dfe6108093bed5f1b6497]]]]
Former-commit-id: dad6f2896b
Former-commit-id: 896375c47b [formerly 17e3464377] [formerly 70f7b0213878f981680926bd20a81de54dadf205 [formerly 610cf76a29]]
Former-commit-id: 24eddc155397c6806dc89bb2fd48417fee4403c3 [formerly 6e57eae922]
Former-commit-id: a9af4960f0
 2014-02-04 17:05:12 -05:00
Brian.Dyke
aab63d8758 Issue #179 
Former-commit-id: ea0a5bebfd [formerly 6b3ebc4fef] [formerly a0626cdc00] [formerly ea0a5bebfd [formerly 6b3ebc4fef] [formerly a0626cdc00] [formerly b23c6f59f7 [formerly a0626cdc00 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]]]]
Former-commit-id: b23c6f59f7
Former-commit-id: 9ec4a820d2 [formerly 2955d5c9f0] [formerly 8058c8a62e584fe650039e4e4c28cf04d7762dbc [formerly 6d58d8c016]]
Former-commit-id: b05a7a4faaca4fe7c20692df3b825b74112613e7 [formerly 5ac5774552]
Former-commit-id: cc4a735533
 2014-02-04 16:53:34 -05:00
Brian.Dyke
f1e47c71e6 Issue #131 
Former-commit-id: fc1aa5076a [formerly dea5f087d3] [formerly bd5db64b5b] [formerly fc1aa5076a [formerly dea5f087d3] [formerly bd5db64b5b] [formerly 35b25ee2a9 [formerly bd5db64b5b [formerly 4167f33801ee2450502231438955e72c4428fbcc]]]]
Former-commit-id: 35b25ee2a9
Former-commit-id: 62b86ef345 [formerly 6882fc8d52] [formerly d654aee4c9b0ffe10c4a2fc5e721d01175827f46 [formerly 4701088670]]
Former-commit-id: fd1f65e5f7267bcd6fc2575e9769fb6fd7418b7d [formerly 41b079e7fe]
Former-commit-id: d099529ef7
 2014-02-04 16:36:11 -05:00
Brian.Dyke
97bf17521e Issue #88 
Former-commit-id: 6510e6da5a [formerly d56bdce6ff] [formerly 643ef1a1a6] [formerly 6510e6da5a [formerly d56bdce6ff] [formerly 643ef1a1a6] [formerly edccef5569 [formerly 643ef1a1a6 [formerly 66a1b2ba9933754b0d6d0324108268563e6381bc]]]]
Former-commit-id: edccef5569
Former-commit-id: 9cf763cd13 [formerly cdb408daf8] [formerly 99d3c8608feda52225fe2dd85b896e03bfe99a30 [formerly a5606c86c7]]
Former-commit-id: 4ab0b8424f27ebdbb06be07987bd8f71c6cdee8a [formerly 83ebe8826f]
Former-commit-id: 904ffbd83e
 2014-02-04 16:34:40 -05:00
Mike Duff
451406c3c5 Issue #2636 - Scheduling refactor. Single scheduling method now. 
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: 75faeae7e4 [formerly 2ca26aaa39] [formerly eee642ac9b] [formerly 75faeae7e4 [formerly 2ca26aaa39] [formerly eee642ac9b] [formerly eb46191ba9 [formerly eee642ac9b [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]]]
Former-commit-id: eb46191ba9
Former-commit-id: b7b0bdbfdd [formerly 38aeb23274] [formerly faacb82cc4cbe77a20073a957c9af17454152fba [formerly 684390e599]]
Former-commit-id: 9ebb64c46709c9a6c6431598e44ae990be200fb2 [formerly e8dea0d0dc]
Former-commit-id: bd52f67e0c
 2014-02-04 14:01:29 -06:00
Richard Peter
40d238a75d Merge "Issue #2769 Removed aggressive Hibernate session flushes" into omaha_14.2.1 
Former-commit-id: 57402adccf [formerly fe3963680d] [formerly 844f05e1ef] [formerly 57402adccf [formerly fe3963680d] [formerly 844f05e1ef] [formerly fb8d982ede [formerly 844f05e1ef [formerly b2edf70f6d9404ed4963ee874c3e03d13bf49303]]]]
Former-commit-id: fb8d982ede
Former-commit-id: ce1a2a4d41 [formerly 99a7c7afd7] [formerly 0677f3bc83b286eb0c5ade27ab8b03f8176edc41 [formerly 4c361f2cff]]
Former-commit-id: 627167a7cf4faec7404367f5342c4483c5b26526 [formerly 05a1e52357]
Former-commit-id: a7b90d781a
 2014-02-04 12:22:19 -06:00
Brian.Dyke
e0236cc20a 14.1.1-17 baseline 
Former-commit-id: 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 4c6eb0c001 [formerly f3d34b0c38] [formerly 180d1356cd] [formerly 23280af290 [formerly 180d1356cd [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]]
Former-commit-id: 23280af290
Former-commit-id: 6e66bb7b6e [formerly f1cc9d6ee2] [formerly 50e190ed8cb3b89c055f33e543707eeb6346818a [formerly 947ec5fd96]]
Former-commit-id: b5864c63c56c26489ecbcefc3b1a67b8472182a1 [formerly 948fffa361]
Former-commit-id: b8f7317b9d
 2014-02-04 12:33:46 -05:00
Benjamin Phillippe
af03234dcc Issue #2769 Removed aggressive Hibernate session flushes 
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216

Former-commit-id: 5de996ac4a [formerly 3f4b92fffb] [formerly 1691c5a3ff] [formerly 5de996ac4a [formerly 3f4b92fffb] [formerly 1691c5a3ff] [formerly fc589ed84d [formerly 1691c5a3ff [formerly 0440395a596d13bf8b4f1dda4857c185c6c8afa5]]]]
Former-commit-id: fc589ed84d
Former-commit-id: 1e0a1a6df8 [formerly 20d26dc5a0] [formerly b3183ec5423ee6e72bab494f9fa0adc8a517ca47 [formerly cdaa7e32b4]]
Former-commit-id: f65125400771d978a456076f39fe1ff9b3529402 [formerly 01def4be4a]
Former-commit-id: d4adefdad8
 2014-02-04 10:24:11 -06:00
Mike Duff
f7f6516da2 Issue #2745 - Don't display fulfilled or cancelled allocations 
Former-commit-id: 9c70fb3261 [formerly 4d529f5051] [formerly f81772f4be] [formerly 9c70fb3261 [formerly 4d529f5051] [formerly f81772f4be] [formerly c9b98868d2 [formerly f81772f4be [formerly 7b7f294622e886d7457d7abe0451d3e819568677]]]]
Former-commit-id: c9b98868d2
Former-commit-id: c9aa63c3c8 [formerly 8b3b5a688f] [formerly 444d2596405cc6142a1dc0b4b806d00c570225c6 [formerly 4a07f6fb4c]]
Former-commit-id: f563b418bf49a1b36f27d31b1c9de60b6b56ab31 [formerly 1065c56bde]
Former-commit-id: a33c96d8fc
 2014-02-03 16:57:03 -06:00
Steve Harris
b016112b8f Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: ab0609007c [formerly 131af8538e] [formerly b2032880ac] [formerly ab0609007c [formerly 131af8538e] [formerly b2032880ac] [formerly eb9d4319dc [formerly b2032880ac [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]]
Former-commit-id: eb9d4319dc
Former-commit-id: ae4332665e [formerly 6883c64744] [formerly 66f652cd9d2fbc7c64872d432745217d602f2015 [formerly 33aea09906]]
Former-commit-id: 538ff84c8a7daabd62a35c1ea90e3f4c3651fc70 [formerly d8989145ac]
Former-commit-id: 08700a77b1
 2014-02-03 10:26:11 -06:00
Brian.Dyke
4deb06cc50 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: 8b06bfd2f9 [formerly 89b824b846] [formerly 4e7b1b207f] [formerly 8b06bfd2f9 [formerly 89b824b846] [formerly 4e7b1b207f] [formerly 40ce5ccc2a [formerly 4e7b1b207f [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]]]
Former-commit-id: 40ce5ccc2a
Former-commit-id: 1f222c489d [formerly 3fd2ef82ab] [formerly f0782f5fb1a9ed0a419e5942875e692fbf816d81 [formerly dd183bc0e9]]
Former-commit-id: 7e826c4c3fd87de1a5c5fc4057ef18e6c2819ffe [formerly df55ab5503]
Former-commit-id: a540be3064
 2014-01-31 08:28:09 -05:00
Greg Armendariz
24740cdf4c Merge "Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN events while in there" into omaha_14.2.1 
Former-commit-id: 37a226378d [formerly 7fbfe85478] [formerly ed0c724860] [formerly 37a226378d [formerly 7fbfe85478] [formerly ed0c724860] [formerly 5ad9cca7a3 [formerly ed0c724860 [formerly 4df9504e742c2807676521b10e56797fb3a24a68]]]]
Former-commit-id: 5ad9cca7a3
Former-commit-id: 022ed11f9a [formerly b4d9ec0e46] [formerly f18871c65719e369747a6d8b7e2bd4891f8916f2 [formerly 66e79f459e]]
Former-commit-id: bf798c587cc569efb1973356eed83d50492151bc [formerly 677e6ac584]
Former-commit-id: af0af0920b
 2014-01-30 13:04:40 -06:00
Nate Jensen
ab58b2f973 Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN 
events while in there

Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619

Former-commit-id: 9ff86044a2 [formerly c18e66cc45] [formerly 327c588c9e] [formerly 9ff86044a2 [formerly c18e66cc45] [formerly 327c588c9e] [formerly 906c679b4e [formerly 327c588c9e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]]]
Former-commit-id: 906c679b4e
Former-commit-id: 53afb531fa [formerly af0ac40f47] [formerly a60314b3783b7851cffad12a2adc0d68ac6ecdb3 [formerly 7bd1d802be]]
Former-commit-id: 21c2189b9de73879ebb7e4c047f7d7c980d4918a [formerly ed91c1d6f5]
Former-commit-id: cfb4bdbb21
 2014-01-30 12:02:42 -06:00
Ben Steffensmeier
9f58441a68 Issue #2537 Fix modelsounding registration. 
Former-commit-id: e5a72cf008 [formerly 12b989a34b] [formerly 819369747e] [formerly e5a72cf008 [formerly 12b989a34b] [formerly 819369747e] [formerly 1db0291792 [formerly 819369747e [formerly e4e476afc2063211523840eaa6f845a4c2264774]]]]
Former-commit-id: 1db0291792
Former-commit-id: 72b05d3cf9 [formerly 17ed6c9664] [formerly bc119a3cae474746e0debcdb5e25680e4dc2f3f3 [formerly 501aec2537]]
Former-commit-id: b88be879742e212d21b088fc3ba1967b730d6073 [formerly d06eb22524]
Former-commit-id: a00d385f2e
 2014-01-29 15:36:05 -06:00
Ron Anderson
a967ebbe67 Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1 
Former-commit-id: c717b6d805 [formerly 81f9709ae7] [formerly fb262fdad2] [formerly c717b6d805 [formerly 81f9709ae7] [formerly fb262fdad2] [formerly 7c06f0b011 [formerly fb262fdad2 [formerly 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e]]]]
Former-commit-id: 7c06f0b011
Former-commit-id: 70e1a066d4 [formerly 25123bdeb0] [formerly a3818c2ef69b516c0e2514d6b82f2afc46368905 [formerly 64f55c6b02]]
Former-commit-id: e95cf485b4181e0315e0ab7317375623e930e02c [formerly d2d7920575]
Former-commit-id: 7e541f2f77
 2014-01-29 14:16:31 -06:00
Ron Anderson
6c7d4c2b4a Issue #2719 Add NHA domain to serverConfig.py 
Change-Id: Ia7c5026ab5b8ae4c9c00adaf90b01d9fa527a044

Former-commit-id: 9215ca8f82 [formerly ea12cecc04] [formerly ce28c6c47f] [formerly 9215ca8f82 [formerly ea12cecc04] [formerly ce28c6c47f] [formerly 0f6e082769 [formerly ce28c6c47f [formerly 2c8d067a3a4c4848bc2eb313c4e901507844074d]]]]
Former-commit-id: 0f6e082769
Former-commit-id: ba249df313 [formerly 09335f5372] [formerly ee24887886668d70e0e574bfe841a1f6d4aa3cec [formerly 5427d15150]]
Former-commit-id: 3e899872dc8686e49208b77ba9de94a800567a7c [formerly 280434a03f]
Former-commit-id: 2086f03c28
 2014-01-29 13:55:54 -06:00
David Gillingham
ea868da200 Issue #2170: Fix SPCWatchSrv and TPCWatchSrv spring routes, add exception handling for WCLWatchSrv route. 
Former-commit-id: 304eaa9f29 [formerly fc25bbe1e9] [formerly 5edfbaa4a5] [formerly 304eaa9f29 [formerly fc25bbe1e9] [formerly 5edfbaa4a5] [formerly c802315ddc [formerly 5edfbaa4a5 [formerly 3dfffb5f49a84a6ed82481d08c809e1217750f70]]]]
Former-commit-id: c802315ddc
Former-commit-id: 009e8c553d [formerly 04d6bc5a42] [formerly 6efd1e8e262f0905b42ba0a2df62a1b5c000be88 [formerly 17d38b4974]]
Former-commit-id: e9128c3f59d7240b2b0d840be6a80f40df8effd2 [formerly 38333b45a7]
Former-commit-id: 14326b8c8d
 2014-01-29 11:56:05 -06:00
Ron Anderson
913b0eea31 Merge "Issue #2504 Fix ingestAT" into omaha_14.2.1 
Former-commit-id: 93e675a762 [formerly 6d33a83771] [formerly b7c10ddebf] [formerly 93e675a762 [formerly 6d33a83771] [formerly b7c10ddebf] [formerly 20259f3554 [formerly b7c10ddebf [formerly 8040e4cad015d5725ed3b08bc9ae5e4d97b21749]]]]
Former-commit-id: 20259f3554
Former-commit-id: 9a8f062482 [formerly 5f9706019e] [formerly 15c64ac0d7a728903f5782d4d2fa0ee40e05ad41 [formerly 604a4363a3]]
Former-commit-id: 1674f8b9dc875bc13ac06dd6bafad1b5eaf84e41 [formerly 3a55c53d5b]
Former-commit-id: 4512aadb1c
 2014-01-29 08:39:41 -06:00
Mike Duff
80bc52c4e7 Issue #2636 - Changed subscription code to use gmt calendar. 
Former-commit-id: 6be7c7f19d [formerly 4440c27ff6] [formerly 6e01cdb78e] [formerly 6be7c7f19d [formerly 4440c27ff6] [formerly 6e01cdb78e] [formerly 1caacacfe3 [formerly 6e01cdb78e [formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]]]]
Former-commit-id: 1caacacfe3
Former-commit-id: 72add752c4 [formerly a76507e04f] [formerly 90eb5dfcc392c5bf771336615dc907357a6e0670 [formerly f4da152d87]]
Former-commit-id: 9da424eeb82f536b9d2ca78ee2c3cd261b97de50 [formerly 1f4cc8681d]
Former-commit-id: 3495a67c27
 2014-01-28 11:09:33 -06:00
Ron Anderson
a49428f868 Issue #2504 Fix ingestAT 
Change-Id: Ic77b0c5b82face45578272edca1dd613dd9509b8

Former-commit-id: e2360f4e7b [formerly a78d1fcd6b] [formerly bb2ef86d14] [formerly e2360f4e7b [formerly a78d1fcd6b] [formerly bb2ef86d14] [formerly 045ebfe967 [formerly bb2ef86d14 [formerly ccf63372764f767af99d93b4d0299f9b8d066ee6]]]]
Former-commit-id: 045ebfe967
Former-commit-id: 90ea66d216 [formerly cca9be6e65] [formerly 5b1684cd73f5480be745189f6df94efef116b12f [formerly 89246e17c5]]
Former-commit-id: e34aa2aea55bad2b25a09b7ed6d9e6a2de191510 [formerly 9dfa819625]
Former-commit-id: b6624cf7ca
 2014-01-27 18:16:46 -06:00
Stephen Gilbert
ea7563f109 Merge "VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1" into ncep_14.2.1 
Former-commit-id: 7383aa8502 [formerly 53fa8822e0] [formerly 6785474b17] [formerly 7383aa8502 [formerly 53fa8822e0] [formerly 6785474b17] [formerly b64adbed81 [formerly 6785474b17 [formerly 57ce64e6119d2bf540da80c1161b88b04474d53c]]]]
Former-commit-id: b64adbed81
Former-commit-id: 023ac1960f [formerly 511123b38c] [formerly 9726e54239f843bd384b3ad71761a58541ba9389 [formerly d947a0e7c1]]
Former-commit-id: cfa23f5e70f04398b69beec17e564d605fac6509 [formerly 4cd6847849]
Former-commit-id: f7c1bee352
 2014-01-27 14:20:47 -05:00