Commit graph

2180 commits

Author SHA1 Message Date
Benjamin Phillippe
d0999c05e8 Issue #2769: Added batching to registry sync
Change-Id: I69e05ee148ea8bec6a5d21bd562349a9e2d557db

Former-commit-id: 7bf51d507e [formerly 59323be87e] [formerly 7bf51d507e [formerly 59323be87e] [formerly 9fd35140f0 [formerly a265027cacde7690171d30455227c5a843e0d397]]]
Former-commit-id: 9fd35140f0
Former-commit-id: daeb8bec5f [formerly cd04d7dcbe]
Former-commit-id: 6b6a5b0e4f
2014-03-04 13:31:41 -06:00
Richard Peter
0219b80555 Merge "Issue #2769: Registry database deadlocking fixes/performance improvements" into omaha_14.2.1
Former-commit-id: 5280398130 [formerly aa8e1a3625] [formerly 5280398130 [formerly aa8e1a3625] [formerly f9bd27c061 [formerly 26cbe68f0a86660968016da88a4b51d1735e8227]]]
Former-commit-id: f9bd27c061
Former-commit-id: a81447f434 [formerly 3b800bcc09]
Former-commit-id: 9ce19b16cc
2014-03-04 12:54:23 -06:00
Nate Jensen
5132a0f8cb Issue #2813 fix subscription package names
Former-commit-id: af76b58b27 [formerly 0ec866f1d2] [formerly af76b58b27 [formerly 0ec866f1d2] [formerly d7d0803ee9 [formerly 081b621b5932d77c03117840e887ed7017f1d48b]]]
Former-commit-id: d7d0803ee9
Former-commit-id: 78b2b50370 [formerly df44f8246e]
Former-commit-id: e22b486f25
2014-03-04 10:53:58 -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
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
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
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
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
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
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
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
Nate Jensen
93a740106d Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: c28085118f [formerly 75ca70fba6] [formerly c28085118f [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]
Former-commit-id: fd43d9e095
Former-commit-id: c0256ac19e [formerly 2111989497]
Former-commit-id: 9e09da8bb6
2014-02-10 16:48:29 -06:00
Brad Gonzales
a8256a5202 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: 9529c1d191 [formerly 9c50fb29fd] [formerly 9529c1d191 [formerly 9c50fb29fd] [formerly 704e466f28 [formerly f1a4a7b24290b6e85380668563793ac529fc5b31]]]
Former-commit-id: 704e466f28
Former-commit-id: b59278f73f [formerly 0b211e8036]
Former-commit-id: 104625b66d
2014-02-07 09:35:36 -06:00
Ben Steffensmeier
b6a5148b42 Issue #2762 Fix Satellite Data Access.
Former-commit-id: a26a150a69 [formerly 2166b5b696] [formerly a26a150a69 [formerly 2166b5b696] [formerly ed2c1a0329 [formerly 4016e9366e8917225777b079da4b94dd1e6fde4a]]]
Former-commit-id: ed2c1a0329
Former-commit-id: 270433f5f3 [formerly e7662de8db]
Former-commit-id: ad709c9692
2014-02-06 13:53:44 -06:00
Mike Duff
c9f53e2346 Issue #2636 - Fix for ncf spring config
Former-commit-id: 3707a4eabd [formerly 3f7defe563] [formerly 3707a4eabd [formerly 3f7defe563] [formerly e84ae26421 [formerly 4308e8a45d61e9d6a67b6036e98ff1b8886d86f6]]]
Former-commit-id: e84ae26421
Former-commit-id: 9ec273fdcc [formerly 6210a6aa18]
Former-commit-id: af8013baa7
2014-02-06 09:29:20 -06:00
Richard Peter
8471e5dd46 Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
Former-commit-id: 82fc0a2ed3 [formerly 64f0cabaef] [formerly 82fc0a2ed3 [formerly 64f0cabaef] [formerly 36d3d21b57 [formerly daacb19de029a15f94338c84a85116d0435f79be]]]
Former-commit-id: 36d3d21b57
Former-commit-id: c3c1205848 [formerly c965993d17]
Former-commit-id: 15c2f761be
2014-02-05 18:20:36 -06:00
Mike Duff
377beb33a8 Issue #2677 - Don't do overlap checks when updating subs to deactivated.
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd

Former-commit-id: bafe19bbd5 [formerly 101c08818d] [formerly bafe19bbd5 [formerly 101c08818d] [formerly 6b01c2957f [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]
Former-commit-id: 6b01c2957f
Former-commit-id: 9edf591218 [formerly 6a2f75e8d5]
Former-commit-id: bb43ec00b1
2014-02-05 16:08:01 -06:00
Dave Hladky
59590fdf36 Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 7fb7e10cda [formerly 6172c83afc] [formerly 7fb7e10cda [formerly 6172c83afc] [formerly 39f97723d6 [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]]
Former-commit-id: 39f97723d6
Former-commit-id: 39f5579103 [formerly 2b998409f5]
Former-commit-id: 8e2eb4d255
2014-02-05 14:49:26 -06:00
Richard Peter
1aaeaf0037 Merge "Issue #2636 - Scheduling refactor. Single scheduling method now. Review comments" into omaha_14.2.1
Former-commit-id: 21b0a87d78 [formerly 8f844bc9ce] [formerly 21b0a87d78 [formerly 8f844bc9ce] [formerly e5af004993 [formerly a2536c180f68e5ea970e3406e3ef1f899650f3e2]]]
Former-commit-id: e5af004993
Former-commit-id: d3f13fc4c7 [formerly 4309c55a5f]
Former-commit-id: 1b8aacc92f
2014-02-04 18:12:48 -06:00
Brian.Dyke
a9af4960f0 Issue #224
Former-commit-id: ed476a583f [formerly 3f86a80d7e] [formerly ed476a583f [formerly 3f86a80d7e] [formerly dad6f2896b [formerly 043faa447b4fc15a996dfe6108093bed5f1b6497]]]
Former-commit-id: dad6f2896b
Former-commit-id: 17e3464377 [formerly 610cf76a29]
Former-commit-id: 6e57eae922
2014-02-04 17:05:12 -05:00
Brian.Dyke
cc4a735533 Issue #179
Former-commit-id: 6b3ebc4fef [formerly a0626cdc00] [formerly 6b3ebc4fef [formerly a0626cdc00] [formerly b23c6f59f7 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]]]
Former-commit-id: b23c6f59f7
Former-commit-id: 2955d5c9f0 [formerly 6d58d8c016]
Former-commit-id: 5ac5774552
2014-02-04 16:53:34 -05:00
Brian.Dyke
d099529ef7 Issue #131
Former-commit-id: dea5f087d3 [formerly bd5db64b5b] [formerly dea5f087d3 [formerly bd5db64b5b] [formerly 35b25ee2a9 [formerly 4167f33801ee2450502231438955e72c4428fbcc]]]
Former-commit-id: 35b25ee2a9
Former-commit-id: 6882fc8d52 [formerly 4701088670]
Former-commit-id: 41b079e7fe
2014-02-04 16:36:11 -05:00
Brian.Dyke
904ffbd83e Issue #88
Former-commit-id: d56bdce6ff [formerly 643ef1a1a6] [formerly d56bdce6ff [formerly 643ef1a1a6] [formerly edccef5569 [formerly 66a1b2ba9933754b0d6d0324108268563e6381bc]]]
Former-commit-id: edccef5569
Former-commit-id: cdb408daf8 [formerly a5606c86c7]
Former-commit-id: 83ebe8826f
2014-02-04 16:34:40 -05:00
Mike Duff
bd52f67e0c Issue #2636 - Scheduling refactor. Single scheduling method now.
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: 2ca26aaa39 [formerly eee642ac9b] [formerly 2ca26aaa39 [formerly eee642ac9b] [formerly eb46191ba9 [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]]
Former-commit-id: eb46191ba9
Former-commit-id: 38aeb23274 [formerly 684390e599]
Former-commit-id: e8dea0d0dc
2014-02-04 14:01:29 -06:00
Richard Peter
a7b90d781a Merge "Issue #2769 Removed aggressive Hibernate session flushes" into omaha_14.2.1
Former-commit-id: fe3963680d [formerly 844f05e1ef] [formerly fe3963680d [formerly 844f05e1ef] [formerly fb8d982ede [formerly b2edf70f6d9404ed4963ee874c3e03d13bf49303]]]
Former-commit-id: fb8d982ede
Former-commit-id: 99a7c7afd7 [formerly 4c361f2cff]
Former-commit-id: 05a1e52357
2014-02-04 12:22:19 -06:00
Brian.Dyke
b8f7317b9d 14.1.1-17 baseline
Former-commit-id: f3d34b0c38 [formerly 180d1356cd] [formerly f3d34b0c38 [formerly 180d1356cd] [formerly 23280af290 [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]]
Former-commit-id: 23280af290
Former-commit-id: f1cc9d6ee2 [formerly 947ec5fd96]
Former-commit-id: 948fffa361
2014-02-04 12:33:46 -05:00
Benjamin Phillippe
d4adefdad8 Issue #2769 Removed aggressive Hibernate session flushes
Change-Id: Idaeb3ecf0a62cc586ed34525260034cd89e96216

Former-commit-id: 3f4b92fffb [formerly 1691c5a3ff] [formerly 3f4b92fffb [formerly 1691c5a3ff] [formerly fc589ed84d [formerly 0440395a596d13bf8b4f1dda4857c185c6c8afa5]]]
Former-commit-id: fc589ed84d
Former-commit-id: 20d26dc5a0 [formerly cdaa7e32b4]
Former-commit-id: 01def4be4a
2014-02-04 10:24:11 -06:00
Mike Duff
a33c96d8fc Issue #2745 - Don't display fulfilled or cancelled allocations
Former-commit-id: 4d529f5051 [formerly f81772f4be] [formerly 4d529f5051 [formerly f81772f4be] [formerly c9b98868d2 [formerly 7b7f294622e886d7457d7abe0451d3e819568677]]]
Former-commit-id: c9b98868d2
Former-commit-id: 8b3b5a688f [formerly 4a07f6fb4c]
Former-commit-id: 1065c56bde
2014-02-03 16:57:03 -06:00
Steve Harris
08700a77b1 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 131af8538e [formerly b2032880ac] [formerly 131af8538e [formerly b2032880ac] [formerly eb9d4319dc [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]
Former-commit-id: eb9d4319dc
Former-commit-id: 6883c64744 [formerly 33aea09906]
Former-commit-id: d8989145ac
2014-02-03 10:26:11 -06:00
Brian.Dyke
a540be3064 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 89b824b846 [formerly 4e7b1b207f] [formerly 89b824b846 [formerly 4e7b1b207f] [formerly 40ce5ccc2a [formerly 0409f7045a797c8c051a353d69de1991b8c8b681]]]
Former-commit-id: 40ce5ccc2a
Former-commit-id: 3fd2ef82ab [formerly dd183bc0e9]
Former-commit-id: df55ab5503
2014-01-31 08:28:09 -05:00
Greg Armendariz
af0af0920b 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: 7fbfe85478 [formerly ed0c724860] [formerly 7fbfe85478 [formerly ed0c724860] [formerly 5ad9cca7a3 [formerly 4df9504e742c2807676521b10e56797fb3a24a68]]]
Former-commit-id: 5ad9cca7a3
Former-commit-id: b4d9ec0e46 [formerly 66e79f459e]
Former-commit-id: 677e6ac584
2014-01-30 13:04:40 -06:00
Nate Jensen
cfb4bdbb21 Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN
events while in there

Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619

Former-commit-id: c18e66cc45 [formerly 327c588c9e] [formerly c18e66cc45 [formerly 327c588c9e] [formerly 906c679b4e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]]
Former-commit-id: 906c679b4e
Former-commit-id: af0ac40f47 [formerly 7bd1d802be]
Former-commit-id: ed91c1d6f5
2014-01-30 12:02:42 -06:00
Ben Steffensmeier
a00d385f2e Issue #2537 Fix modelsounding registration.
Former-commit-id: 12b989a34b [formerly 819369747e] [formerly 12b989a34b [formerly 819369747e] [formerly 1db0291792 [formerly e4e476afc2063211523840eaa6f845a4c2264774]]]
Former-commit-id: 1db0291792
Former-commit-id: 17ed6c9664 [formerly 501aec2537]
Former-commit-id: d06eb22524
2014-01-29 15:36:05 -06:00
Ron Anderson
7e541f2f77 Merge "Issue #2719 Add NHA domain to serverConfig.py" into omaha_14.2.1
Former-commit-id: 81f9709ae7 [formerly fb262fdad2] [formerly 81f9709ae7 [formerly fb262fdad2] [formerly 7c06f0b011 [formerly 2c3e2b9bf8bf01065d79221febe9e95a8efaa46e]]]
Former-commit-id: 7c06f0b011
Former-commit-id: 25123bdeb0 [formerly 64f55c6b02]
Former-commit-id: d2d7920575
2014-01-29 14:16:31 -06:00