Commit graph

4644 commits

Author SHA1 Message Date
Brad Gonzales
6868d8d12d Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to
RecurringSubscription.  Add environment configuration files to unit tests setup.  Changed the
devRegistry debug port to the same port as registry.

Amend: Updates from peer review.

Change-Id: I4f5a25d4667dc949804b86541a9d9428728b779a

Former-commit-id: 2c0c6fbcc7 [formerly 8eeb3dc412] [formerly 4537513df7] [formerly 343a2495e5 [formerly 4537513df7 [formerly 33a3dead503276926af71d7355f87242f5250e54]]]
Former-commit-id: 343a2495e5
Former-commit-id: 1b6fea4b1e1ad9152e19bb26118b1df57cd9ade0 [formerly 4049af9630]
Former-commit-id: f57529be9b
2014-01-10 16:37:09 -06:00
Richard Peter
1e10acc664 Merge "Issue #2452 - Add label stating all lat/lons will be converted to easting." into omaha_14.2.1
Former-commit-id: 434c05b458 [formerly bc4ad18fe9] [formerly 7bbefddcc1] [formerly e6d7acb609 [formerly 7bbefddcc1 [formerly 1855c0e2d601fd3c5b20d8ba58d157e9fb993b8b]]]
Former-commit-id: e6d7acb609
Former-commit-id: 08b064f5627b0585a3df75b960a722fde7817d6f [formerly 527408ddd4]
Former-commit-id: 5b687c7bd5
2014-01-10 15:42:48 -06:00
Richard Peter
3ba91590bc Merge "Issue #2642 - Update header comment" into omaha_14.2.1
Former-commit-id: 36feeef940 [formerly 9e0827e8b0] [formerly 7976713662] [formerly e841723f1c [formerly 7976713662 [formerly dd2716d0f2541d300a81edcdb604bdb151cecb40]]]
Former-commit-id: e841723f1c
Former-commit-id: af136cfa606ce56f14f973561d55be09fe06ffaf [formerly f3c30e7369]
Former-commit-id: 1d4a0ae816
2014-01-10 15:42:24 -06:00
Richard Peter
b3059957bc Merge "Issue #2636 - change log statements, add missing copyright headers" into omaha_14.2.1
Former-commit-id: 550b40a4bf [formerly 60f22e2d4c] [formerly 48184fe695] [formerly 51c8919ea7 [formerly 48184fe695 [formerly 974e2fb98c17fe843025346954d727fb9d72a408]]]
Former-commit-id: 51c8919ea7
Former-commit-id: dc61c2e1e5f79882b6b9ca4a2f583310cd1d52df [formerly cf2c9c530c]
Former-commit-id: b15476b43e
2014-01-10 15:42:08 -06:00
Richard Peter
acd5ef7973 Merge "Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean" into omaha_14.2.1
Former-commit-id: 3d4ee9f0a3 [formerly 44f02d072e] [formerly 2580f289e9] [formerly 757e8d2c4b [formerly 2580f289e9 [formerly 362e90dcf918893137cd8fe0eaddd1fcbfb86538]]]
Former-commit-id: 757e8d2c4b
Former-commit-id: 7f8dc6b05899865dc8e1d89db9988cd53d0705f6 [formerly b1a2d3183f]
Former-commit-id: 9cfb816557
2014-01-10 15:41:28 -06:00
Ron Anderson
2e9d07a0cf Issue #2044 Fix some error handling in GFE to eliminate exceptions in edex logs.
Change-Id: Iad8edf92318d6c9277648396ba450a3fc6eb5c5a

Former-commit-id: 41354cddf7 [formerly 7cae1b981d] [formerly 89f07fe932] [formerly 1c520b8cd1 [formerly 89f07fe932 [formerly 3f9f254229066cfe12501aacd14e68937764fadb]]]
Former-commit-id: 1c520b8cd1
Former-commit-id: 0a9b4434bf29a1eed5671f4ab66b9040010b48e6 [formerly bbac6df77d]
Former-commit-id: 9df631248d
2014-01-10 15:01:10 -06:00
Ron Anderson
ab5ab0ebe3 Merge "Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic." into omaha_14.2.1
Former-commit-id: dacdddf403 [formerly 90a2c83c8e] [formerly b8a33ecdf8] [formerly 41b081307c [formerly b8a33ecdf8 [formerly dded4c12d27baede94b789d288d6bcb39e777f9f]]]
Former-commit-id: 41b081307c
Former-commit-id: 093ac09bf206a0017a0e5d3a730bba837dde43a2 [formerly a35a46de1b]
Former-commit-id: 76965c12dd
2014-01-10 13:29:59 -06:00
Ron Anderson
7b369af525 Issue #2508 Restore DiscreteGridSlice.setKey method used by iscMosaic.
Change-Id: I503cf82ce896e8cdf39c238eda0f31453d8510a5

Former-commit-id: 4e479cf9bd [formerly 17ed8a6e75] [formerly 3017260991] [formerly d80ce4a19e [formerly 3017260991 [formerly 142f68c426c4e2fbeb1e0b97cbb7b47c38e3b90d]]]
Former-commit-id: d80ce4a19e
Former-commit-id: aa04179c7e3f5387a4ead15786aaad0bb4f86872 [formerly 57d3503ed6]
Former-commit-id: d70701cc6e
2014-01-10 13:17:44 -06:00
Mike Duff
6440aa8375 Issue #2684 - BandwidthUtil bean now depends on registerDataDeliveryHandlers bean
Change-Id: I6f491e7e14e445b59e93f5896eedde3062246034

Former-commit-id: 696003d463 [formerly 26e34bb4d1] [formerly b50ea7b162] [formerly 744d7367dc [formerly b50ea7b162 [formerly 12500574ade0eced65454ff981b83f8f729cd125]]]
Former-commit-id: 744d7367dc
Former-commit-id: bbcc98303dcc89e98466e092b86268e5c8a053c9 [formerly 0e5332e8cd]
Former-commit-id: 3274c591bf
2014-01-10 12:14:27 -06:00
Mike Duff
c8885b34f1 Issue #2452 - Add label stating all lat/lons will be converted to easting.
Former-commit-id: 2e6173b619 [formerly 67f6311354] [formerly 69ca0dd0d2] [formerly 7081c26823 [formerly 69ca0dd0d2 [formerly 84bff804bc089aefcf126a586539eab590e1d04a]]]
Former-commit-id: 7081c26823
Former-commit-id: e5367b16239e543229d0aace6c8f70b5970faf5e [formerly 17d19cc0bb]
Former-commit-id: b616f34af2
2014-01-10 12:05:30 -06:00
Mike Duff
5f19ccc46e Issue #2642 - Update header comment
Former-commit-id: b70c96297f [formerly 5d669a97af] [formerly 101d9939d6] [formerly 28114764a5 [formerly 101d9939d6 [formerly 389426adddf3a78d9859f704ecc2241e453b5dc2]]]
Former-commit-id: 28114764a5
Former-commit-id: 32bb19308f502de6a22ca9009876c463c872be8c [formerly 7d25b33cb6]
Former-commit-id: 12c47ea375
2014-01-10 10:57:18 -06:00
Mike Duff
ae88e49e26 Issue #2636 - change log statements, add missing copyright headers
Former-commit-id: 8fe7d83f6f [formerly 8993103c45] [formerly 12a8618c42] [formerly 3be3a8ac0d [formerly 12a8618c42 [formerly 8bf5a8185c09e9d368afc8e8e7409222164159aa]]]
Former-commit-id: 3be3a8ac0d
Former-commit-id: 7b4e8fc0dd59dffc07172aea3397179483206f25 [formerly e121eb5dbd]
Former-commit-id: ea07460e3e
2014-01-10 10:55:17 -06:00
Nate Jensen
e63bac199d Issue #2359 log exceptions in FFTI processing
Change-Id: Iec1c743352187de071f4b9840f1672bff531ba94

Former-commit-id: 8a469f686a [formerly 1d9229a4a6] [formerly d289eb1b55] [formerly 43b75928e4 [formerly d289eb1b55 [formerly 2abd0cc65b6fe98dc95e11b5b8d53a325c0f2074]]]
Former-commit-id: 43b75928e4
Former-commit-id: 46539e0877f8c37fe79c6bcc26836d7cf6855c9f [formerly daba59930d]
Former-commit-id: 8b5ce7c07f
2014-01-10 08:57:18 -06:00
Richard Peter
a25ad86347 Merge "Issue #2642 - Make shared sub deletions remove the site from the list" into omaha_14.2.1
Former-commit-id: 102bbe3e15 [formerly b37d6e9c91] [formerly 8ca1217f03] [formerly 52850fe95a [formerly 8ca1217f03 [formerly f5e5e1e66bf7264408e31b95ebf73d083b3cff0f]]]
Former-commit-id: 52850fe95a
Former-commit-id: 766dc3d39c99f73f010de1c29095aef2b852645e [formerly 690f1b15dd]
Former-commit-id: b833c4333c
2014-01-09 16:58:39 -06:00
Richard Peter
5cf3d3349c Merge "Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches" into omaha_14.2.1
Former-commit-id: 6227cb9e3c [formerly c32d55f3fc] [formerly 36ed029f0a] [formerly 0f3175bd77 [formerly 36ed029f0a [formerly b53137d1af67ff95a91b4bf4d2aa78ef4c43b80a]]]
Former-commit-id: 0f3175bd77
Former-commit-id: 3d87934664370f4c41ebd107b46989b9bcbb1cff [formerly c95d310568]
Former-commit-id: 78313bec85
2014-01-09 16:58:31 -06:00
Richard Peter
a2eef48cfb Merge "Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible." into omaha_14.2.1
Former-commit-id: a39f2bff20 [formerly 0bd52b65e7] [formerly b711c35c68] [formerly f45a281935 [formerly b711c35c68 [formerly 8f3f97302417e256cd110feb4ed56ca366cb1db8]]]
Former-commit-id: f45a281935
Former-commit-id: 8e88f0da68170bd6d7f37b03b43ebe72c7b0e3e4 [formerly 0459cd237e]
Former-commit-id: f4108b8be2
2014-01-09 16:53:52 -06:00
Mike Duff
2a94a50ec8 Issue #2633 - Keep graph data visible while resizing. Keep bottom of graph visible.
Former-commit-id: 41ac6a70dd [formerly e4f56affd3] [formerly 16a8f16ee4] [formerly 9b5adfaba2 [formerly 16a8f16ee4 [formerly 87dd0df07a9ef0e7881ed0cf7b8aa1d41f0c9d4d]]]
Former-commit-id: 9b5adfaba2
Former-commit-id: c5a413c1f93f4b03121d44e01630e558a6904c48 [formerly 7a1712acd6]
Former-commit-id: d2f74b6238
2014-01-09 13:02:08 -06:00
Mike Duff
f6d58f7615 Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
Former-commit-id: 99d7e51456 [formerly 30b65a4fe7] [formerly 183ca614df] [formerly a264cb06a1 [formerly 183ca614df [formerly b841e795f2a18bf902ec373c9f79b191db177fde]]]
Former-commit-id: a264cb06a1
Former-commit-id: 1723170c25ee5bf976e58a1096d080a768d79925 [formerly 4620b69f08]
Former-commit-id: 05b6508299
2014-01-09 10:29:21 -06:00
Mike Duff
ff76fa081c Issue #2643 - Fixed the mouse checking on DD maps
Former-commit-id: 3d962a5425 [formerly 7b8964d9b2] [formerly 4fe2dc76af] [formerly 56499a77c3 [formerly 4fe2dc76af [formerly 775e99924e098387e4ca5042823ef20d1a0d2afe]]]
Former-commit-id: 56499a77c3
Former-commit-id: 276825c6d8c7a85fe6b1be0854404a47fc47b5c8 [formerly 09c5f29395]
Former-commit-id: 1c3b700563
2014-01-09 10:18:34 -06:00
Mike Duff
1c60e6e7cc Issue #2642 - Make shared sub deletions remove the site from the list
Former-commit-id: 7720852347 [formerly 0cb61d4d50] [formerly 6cff7aaf0c] [formerly 4e6b4eaa4c [formerly 6cff7aaf0c [formerly a8f57c338a8a06c6d40842f56c329fd9f215bc5b]]]
Former-commit-id: 4e6b4eaa4c
Former-commit-id: 87757eade8f87fee23058c260317eed10f66609c [formerly fdef5e97e2]
Former-commit-id: 0e081e8ee2
2014-01-09 10:15:48 -06:00
Ron Anderson
b37209e9f5 Merge "Issue #2657: Update convertCDL2XML for unified grid." into omaha_14.2.1
Former-commit-id: 5d56dfe4f5 [formerly be370fe7d6] [formerly 6febe84651] [formerly ad824dcf9f [formerly 6febe84651 [formerly 7fcc9e660049074c4c1e6a918d371182b40278ba]]]
Former-commit-id: ad824dcf9f
Former-commit-id: d21b6ac36f41e5c6e6bfcb3175698aad829f2392 [formerly 7163de49e5]
Former-commit-id: dd2e82a135
2014-01-08 15:02:26 -06:00
Richard Peter
a1121ab34b Merge "Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception thrown from run. Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation when the db value status was updated. Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit. Updates to hibernate.cfg.xml for Richard." into omaha_14.2.1
Former-commit-id: e0388d76cf [formerly b0479dfdc6] [formerly 5f65479ba1] [formerly 5fa03e7352 [formerly 5f65479ba1 [formerly 3cd86c518839710768c9a0552749fa96f936f2c4]]]
Former-commit-id: 5fa03e7352
Former-commit-id: c7dcc03215c8979da68de0120dfaad26214e39c3 [formerly 029bbb8fc2]
Former-commit-id: f06b4aba13
2014-01-08 14:30:38 -06:00
Nate Jensen
a8b46a337f Merge "Issue #2359 change some log statements to debug" into omaha_14.2.1
Former-commit-id: fc3a61518d [formerly 6585b79144] [formerly 415c5f224a] [formerly 9a5630f5bb [formerly 415c5f224a [formerly b226f3ebfd3932d51d38982ae5c13364aaec2f5b]]]
Former-commit-id: 9a5630f5bb
Former-commit-id: 496fb0eb9e6f5c0a409f8534dd512391066ea75f [formerly 56d932ee56]
Former-commit-id: 7dcae0a1be
2014-01-08 13:56:54 -06:00
Brad Gonzales
ad3da98af6 Issue #2645 Prevent the recurring time in SubscriptionNotifyTask from being killed by an exception
thrown from run.  Fix issue where the InMemoryBandwidthBucketAllocationAssociator was not updating the in memory allocation
when the db value status was updated.  Added RegistryBandwidthRecord to the list of classes to init by HibernateBandwidthDbInit.
Updates to hibernate.cfg.xml for Richard.

Change-Id: I0eb7b0a34e48f6b8db8065dee45966c48ef38617

Former-commit-id: c05358aac5 [formerly 02910c2a8c] [formerly 07a4420596] [formerly 12860c79f9 [formerly 07a4420596 [formerly e0dbe59a7dc418e3b8ed62396b6ef2047b5990fd]]]
Former-commit-id: 12860c79f9
Former-commit-id: 53dd09e9f01677738d8bb7bceaf559f45f59115c [formerly be6f12e9c2]
Former-commit-id: 5c85734e02
2014-01-08 13:37:17 -06:00
Nate Jensen
5168eefb50 Merge "Issue #2581 fix yet another LSR decoding error" into omaha_14.2.1
Former-commit-id: 136cfae0a5 [formerly 5bd0aa68d9] [formerly ee3c118cb0] [formerly ce24723a68 [formerly ee3c118cb0 [formerly b025f9ff3b1ecbe485418b3d19312777f5af8775]]]
Former-commit-id: ce24723a68
Former-commit-id: 85e94dd1992438356a7a3f1afa2711bb313caf35 [formerly f47773c451]
Former-commit-id: b273eb58a6
2014-01-08 11:30:05 -06:00
David Gillingham
0012cf9134 Issue #2657: Update convertCDL2XML for unified grid.
Former-commit-id: 4925478a0b [formerly 476fcb7980] [formerly ed22a86d9f] [formerly d6397522c4 [formerly ed22a86d9f [formerly 247536f4d83c7f7de449707916d2950ae74be551]]]
Former-commit-id: d6397522c4
Former-commit-id: cf78b85e4b8682c0ad54f461f0024241114e38bb [formerly 777c1fba86]
Former-commit-id: 3e0ef451a1
2014-01-08 11:02:30 -06:00
Nate Jensen
945671fdc4 Issue #2581 fix yet another LSR decoding error
Change-Id: I74e6d8c3d5c6bf71ebbc3fe32ea93ea688c6bcb5

Former-commit-id: df3778f7c6 [formerly 79c9792148] [formerly 3ac67a743f] [formerly 968e51040d [formerly 3ac67a743f [formerly 3f2c97439a1dbbbc94285343b3b558dead63a0f6]]]
Former-commit-id: 968e51040d
Former-commit-id: 171f2bf5c41ccd55e091d92fc423bb389db59ba0 [formerly 79836008d7]
Former-commit-id: 59fc27dafb
2014-01-08 08:56:02 -06:00
Ron Anderson
9aae54c713 Issue #2509 Fix merge error in iscMosaic (fix indentation)
Change-Id: I1745af1a51d6fffe221168cc8dca217d2f309007

Former-commit-id: 167ef0a302 [formerly b0fa3c6514] [formerly 4da9799eaf] [formerly 82d3277785 [formerly 4da9799eaf [formerly 94c97fee9c6925ac9e73530bd18ec03d8cab4a40]]]
Former-commit-id: 82d3277785
Former-commit-id: 400aac7d966ddfd5fb28ad35617d4abd86685c39 [formerly 4fe580f47b]
Former-commit-id: 89c27cc683
2014-01-08 08:49:32 -06:00
Nate Jensen
8356b85925 Issue #2359 change some log statements to debug
Change-Id: Ie549917b36268d3f5983f3946701418e7e3b5163

Former-commit-id: 77a8e7f321 [formerly b3d6ba3bc9] [formerly bfa6c60c66] [formerly cb52747de2 [formerly bfa6c60c66 [formerly 146a9cca0ffa68f44068c620a3fa693c46db9031]]]
Former-commit-id: cb52747de2
Former-commit-id: 66c48114fb9f6bf3d321abdbd200ebd96ea88c1c [formerly ded9b32ea1]
Former-commit-id: d477169f0d
2014-01-07 17:53:43 -06:00
Richard Peter
58f8909add Merge "Issue #2658 Changes to ACARSPersistObs to ignore cutoff time when allowing archive." into omaha_14.2.1
Former-commit-id: 1172e81e6b [formerly 0a16411de4] [formerly 9c0d63d841] [formerly 97bde8138d [formerly 9c0d63d841 [formerly e6b1f12dd3a36b76e60d0e90941f94948022813a]]]
Former-commit-id: 97bde8138d
Former-commit-id: a00e1d1aa39cae3b5045f2790d4e5adb9b27eb8c [formerly b899a0591f]
Former-commit-id: 4bebf53fda
2014-01-07 15:40:04 -06:00
Roger Ferrel
fa58e987d3 Issue #2658 Changes to ACARSPersistObs to ignore cutoff time when allowing archive.
Change-Id: I63d6f21ca9fe35b806b321677382460c762c4907

Former-commit-id: 009dfef718 [formerly b49329067a] [formerly 4102c38bc6] [formerly 3528dc0eb0 [formerly 4102c38bc6 [formerly fb4e61235f1bf65a4b3337514277dcbca2d82f8d]]]
Former-commit-id: 3528dc0eb0
Former-commit-id: 61073c6a17a58ea7802e97eaf58765a320412205 [formerly 44af3ecf0a]
Former-commit-id: 0e559a5a66
2014-01-07 14:54:41 -06:00
Nate Jensen
60cad7b8c0 Issue #2359 minor request JVM startup safety
Change-Id: I17a5f3217ac5a2f2d53660bdb45a6009c8f27004

Former-commit-id: 13ec91c615 [formerly 459771f66d] [formerly 24560cf307] [formerly f83a473653 [formerly 24560cf307 [formerly 3916523cd702e367a6d66743b0517872475a0c36]]]
Former-commit-id: f83a473653
Former-commit-id: e65449cb58c98692037c345dad76b1e4316ed7ad [formerly ccfb2504cb]
Former-commit-id: f1e731e857
2014-01-07 13:25:45 -06:00
Nate Jensen
7371990c29 Issue #2359 prevent obnoxious ncep decoder null pointer exceptions
Change-Id: I731614a8a6c9ec38bb6c1b29c4d9f6ca5a7c03d7

Former-commit-id: 79e387fc94 [formerly 52293fd154] [formerly 2c0e3f05ca] [formerly e509a2883f [formerly 2c0e3f05ca [formerly 514d0cfecd3eb8c81a6d2120406225856d964c9e]]]
Former-commit-id: e509a2883f
Former-commit-id: d150fe75866671138e7bd888dc3ce56b60f9a3c4 [formerly 488956a259]
Former-commit-id: de5d7565e2
2014-01-07 12:38:49 -06:00
Nate Jensen
49089bec72 Merge "Issue #2537 Increase efficiency of DAF geometry requests when geometries are reused. Change-Id: Idf0822745cdf3d52668223038f83c76e3de1c55c" into omaha_14.2.1
Former-commit-id: d2dd7437da [formerly 45d19cf37d] [formerly f0169367be] [formerly 6234d3f493 [formerly f0169367be [formerly cb58431f4a4d45a1e7ad32a0db6c30238de361cf]]]
Former-commit-id: 6234d3f493
Former-commit-id: 0b12d206bd37eee2fd80d2eff0c17d9f53e66cc6 [formerly 4546e5e881]
Former-commit-id: 203247b8d7
2014-01-06 16:28:38 -06:00
Ben Steffensmeier
4b43971a78 Issue #2537 Split modelsounding into common/edex plugins.
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8

Former-commit-id: 08c9b54e49 [formerly f516a684d4] [formerly f520a26fbd] [formerly d79f804d4e [formerly f520a26fbd [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]
Former-commit-id: d79f804d4e
Former-commit-id: b2807282541cba1b6dadcac12cda1996f7292656 [formerly fac9fd296f]
Former-commit-id: 9913e51429
2014-01-06 16:02:59 -06:00
Ben Steffensmeier
2f46b15ae6 Issue #2537 Increase efficiency of DAF geometry requests when geometries are reused.
Change-Id: Idf0822745cdf3d52668223038f83c76e3de1c55c

Former-commit-id: 9b3bde3b49 [formerly 3f3f74087a] [formerly fa46a08fec] [formerly ed2e34e5aa [formerly fa46a08fec [formerly 05c62ceb516807719a1649e0559a395ce604aee9]]]
Former-commit-id: ed2e34e5aa
Former-commit-id: b410e6c352a9425f7237b9429b1f965279aadfe7 [formerly 7dd641f5cc]
Former-commit-id: cf385ac2c3
2014-01-06 15:41:49 -06:00
Steve Harris
188b12a1b0 14.1.1-15 baseline
Former-commit-id: c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 390c383ede3823f4b855f6230e3fad20d31e0e07 [formerly 35d8f5a281]
Former-commit-id: 282d10fe6d
2014-01-06 14:08:08 -05:00
Steve Harris
4a516444b6 14.1.1-14 baseline
Former-commit-id: 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d]
Former-commit-id: 0989c17710
2014-01-06 14:02:30 -05:00
Lee Venable
a5bf22cefe Merge "Issue #2580. Fixed FSSObs error." into omaha_14.2.1
Former-commit-id: 266c027104 [formerly 9c2d4a70f1] [formerly 53d440be2e] [formerly 19f2c98622 [formerly 53d440be2e [formerly 9efec6dc7876d7b88c95517fa1baea0e9f5fd593]]]
Former-commit-id: 19f2c98622
Former-commit-id: 63809453bafc76d981fdc3635a7a647a69b5a898 [formerly 68c7a2865c]
Former-commit-id: 5f7d75ef1a
2014-01-06 08:08:07 -06:00
Nate Jensen
fe8e2ebdb5 Issue #2581 fix LocalStormReports with coastal floods
Change-Id: Ifa8bd71e068f5ba1e1b534f00fbcbc59a2e9bf1e

Former-commit-id: f94dcab576 [formerly fda6dea53b] [formerly b5a80b2f1a] [formerly 9729b11a07 [formerly b5a80b2f1a [formerly 852767e0dbf3e6c34de876b550f7f39baf181a2c]]]
Former-commit-id: 9729b11a07
Former-commit-id: d822e15f715ac6993a12d66bc90516a6e91fc0b0 [formerly 0dbaae9855]
Former-commit-id: 8dfcffb4a2
2014-01-03 09:21:49 -06:00
Slav Korolev
5954f60886 Issue #2580. Fixed FSSObs error.
Former-commit-id: 9d87a87a04 [formerly 45d7b28f73] [formerly cab076a9a9] [formerly 05a93ea955 [formerly cab076a9a9 [formerly bb56933cea0f68c18e9cdc352dc6bd53473932ff]]]
Former-commit-id: 05a93ea955
Former-commit-id: b4210dc8af86f3371a3022c98b8a3d66e72a23e0 [formerly 16f66b2c07]
Former-commit-id: 86b77001a7
2014-01-02 15:20:43 -05:00
David Gillingham
f4dfa0efb1 Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: ab3f8b200a [formerly c48c0523ff] [formerly 136265183d] [formerly 09bfdc49e3 [formerly 136265183d [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]]]
Former-commit-id: 09bfdc49e3
Former-commit-id: 54ef06cbf4b4c0bf6f652f24388beb4dfdf1db37 [formerly 8f3802eecf]
Former-commit-id: 6e642b81fe
2013-12-18 16:18:47 -06:00
Richard Peter
9eef793dda Merge "Issue #2636 - Changed delay to offset" into omaha_14.2.1
Former-commit-id: 009c22c72c [formerly c6453e6cc7] [formerly 7d5761111c] [formerly d3aa5189e8 [formerly 7d5761111c [formerly 64598e95a274241197287b3c04e8bd1f9b269179]]]
Former-commit-id: d3aa5189e8
Former-commit-id: 0946391b11817809315b0e2bfb92cbd55c6e5435 [formerly a84f7055fd]
Former-commit-id: ea606df58a
2013-12-18 15:38:19 -06:00
Mike Duff
a3abca76e7 Issue #2636 - Changed delay to offset
Former-commit-id: e1d7f8c0fc [formerly 7fe007d482] [formerly fa314e5eb6] [formerly 14d9978528 [formerly fa314e5eb6 [formerly b5fefc92c0b80613b90acb29f70b96c459167843]]]
Former-commit-id: 14d9978528
Former-commit-id: 00661fb34401180690fcc4ebe48795d27a0fe19a [formerly b9b03657c5]
Former-commit-id: 9f84482bb5
2013-12-18 15:35:47 -06:00
Richard Peter
d26735ba8b Merge "Issue #2636 - Calculate a data set availability delay for each dataset." into omaha_14.2.1
Former-commit-id: 3ca80962f4 [formerly 7ecd59fe4e] [formerly dc1d8fdacb] [formerly bc327ef5ec [formerly dc1d8fdacb [formerly 58b3ddcd7f48f0d4bd2616f0927de21a4c777461]]]
Former-commit-id: bc327ef5ec
Former-commit-id: 4f0bdbd860f46c4801e9d0abee34ed7b334007ea [formerly 73f21cb31d]
Former-commit-id: fe06498040
2013-12-18 15:23:41 -06:00
Mike Duff
6c88d89368 Issue #2636 - Calculate a data set availability delay for each dataset.
Former-commit-id: 45a03a53f2 [formerly a4036f49a9] [formerly f04e249e23] [formerly fb96084864 [formerly f04e249e23 [formerly 6c5fd79bd2a74422053b064d968de3ca440ecec1]]]
Former-commit-id: fb96084864
Former-commit-id: 28e5e91b2b34593ef9a8e79035bf1fe26f2f0456 [formerly a72fa70992]
Former-commit-id: 01a48c9f17
2013-12-18 14:52:11 -06:00
Richard Peter
4aba3d26be Merge "Issue #2579 Make DecisionTree thread safe. Change-Id: I351135189c58ba5a6107de206f8f5dc2d72fc8c0" into omaha_14.2.1
Former-commit-id: 37c43ad625 [formerly 15fb375ac2] [formerly 2453e0dc32] [formerly 0a4c746b85 [formerly 2453e0dc32 [formerly ccef4b597ce787b10b7f2090bd7b430fed5f141c]]]
Former-commit-id: 0a4c746b85
Former-commit-id: 6116d45de3f4bf55fa2c91cc7efd52efc3b903b8 [formerly bb01318ad4]
Former-commit-id: e80c4003e5
2013-12-18 14:43:39 -06:00
Ben Steffensmeier
54a6380895 Issue #2579 Make DecisionTree thread safe.
Change-Id: I351135189c58ba5a6107de206f8f5dc2d72fc8c0

Former-commit-id: dcf68bf3b7 [formerly fea2532ea7] [formerly b92f9efb53] [formerly b096554d97 [formerly b92f9efb53 [formerly 345316581c514136c823692a09ff0d71ce5b7877]]]
Former-commit-id: b096554d97
Former-commit-id: 494cb44de62ee5c255e6754777eb99627d021a1b [formerly 0d1898a070]
Former-commit-id: 1dc5fcd852
2013-12-18 14:06:13 -06:00
Richard Peter
73f12bf669 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]
Former-commit-id: 5c0cf804f1
2013-12-17 21:04:53 -06:00
Nate Jensen
68909c095c Merge "Issue #2574 fix DatabaseQuery conversion of grid coverage objects. Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309" into omaha_14.2.1
Former-commit-id: 72621bcf14 [formerly 29425906ba] [formerly 66f5000243] [formerly 84e3cf0988 [formerly 66f5000243 [formerly 69cbbcc3c88565c35c1453412f031669306adf0f]]]
Former-commit-id: 84e3cf0988
Former-commit-id: 2d09d28c746d8705ac32468202e80b2c778e0ef6 [formerly 42bd8ccde4]
Former-commit-id: eee649c9b1
2013-12-17 12:20:37 -06:00