Commit graph

4449 commits

Author SHA1 Message Date
Ron Anderson
f33f5aec85 Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe [formerly dca7f21f7b] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f]
Former-commit-id: 77c132f706
2014-01-13 17:45:20 -06:00
Steve Harris
e44faa7943 14.1.1-15 baseline
Former-commit-id: c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly c6cb11a5f4 [formerly f88ff2bde9] [formerly 8bbd803ace] [formerly d8e5799328 [formerly 8bbd803ace [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]]
Former-commit-id: d8e5799328
Former-commit-id: 188b12a1b0 [formerly 282d10fe6d] [formerly 390c383ede3823f4b855f6230e3fad20d31e0e07 [formerly 35d8f5a281]]
Former-commit-id: 86d049732a94fe967ea42eb6fadaec484ef0117f [formerly cd4a09623c]
Former-commit-id: 1ca553385c
2014-01-06 14:08:08 -05:00
Steve Harris
f8f17037ca 14.1.1-14 baseline
Former-commit-id: 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 4a516444b6 [formerly 0989c17710] [formerly 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d]]
Former-commit-id: a6acd13ea8d0052cec52c8cee5a726953d78e66e [formerly a2bdee5cc1]
Former-commit-id: 5862555160
2014-01-06 14:02:30 -05:00
Richard Peter
08d2290f97 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 cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 73f12bf669 [formerly 5c0cf804f1] [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]]
Former-commit-id: 3e8093536581ac6595438ca5eb497ae394fe30e8 [formerly 4059813742]
Former-commit-id: 1c743d4d44
2013-12-17 21:04:53 -06:00
Nate Jensen
edec29453c 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 72621bcf14 [formerly 29425906ba] [formerly 66f5000243] [formerly 84e3cf0988 [formerly 66f5000243 [formerly 69cbbcc3c88565c35c1453412f031669306adf0f]]]]
Former-commit-id: 84e3cf0988
Former-commit-id: 68909c095c [formerly eee649c9b1] [formerly 2d09d28c746d8705ac32468202e80b2c778e0ef6 [formerly 42bd8ccde4]]
Former-commit-id: def329c30b90522d385bb738bac8a14453b5496c [formerly 3141f76bff]
Former-commit-id: cd9dec3e57
2013-12-17 12:20:37 -06:00
Brad Gonzales
2fd6d50617 Issue #2636 fixes for the scheduling gaps in the middle of subscription schedules.
Amend: Added max checks to prevent negative bucket sizes in RetrievalPlan remove methods.  Wrapped debug logging in is debug on checks.

Change-Id: I5ab6d3c103e82bf2b1aa0eaf167f0993e5778c90

Former-commit-id: 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly b2b352a5ae [formerly cc75442fa3 [formerly 3db5d79b914436b8d0feed600fc586d7d3884706]]]]
Former-commit-id: b2b352a5ae
Former-commit-id: 38198d379b [formerly 6e78d3a521] [formerly b11a7f8006104e7102802aa4735db3bf8c3aaff8 [formerly 0df42dacfd]]
Former-commit-id: d94d9163be833c49e9da0c0ffbb86ce778b60899 [formerly 4f6b8a79bb]
Former-commit-id: f71ea9eeb4
2013-12-17 11:57:06 -06:00
Richard Peter
b713bc7fa3 Merge "Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo." into omaha_14.2.1
Former-commit-id: 3c206aecd2 [formerly 123fa3a850] [formerly d233a5161a] [formerly 3c206aecd2 [formerly 123fa3a850] [formerly d233a5161a] [formerly 253aab3dde [formerly d233a5161a [formerly adb1a2efc0e5d0389047b79e2bbb95de16f69a0c]]]]
Former-commit-id: 253aab3dde
Former-commit-id: 20ef2a8997 [formerly d3c4c1d9fa] [formerly 66ff5d56aa5f6a52c905cd0c7e0d3897bc073d4d [formerly d78cbc8222]]
Former-commit-id: 99a701fd96b99cbec96c8d3f673bf3a35ad8867d [formerly ac39c12815]
Former-commit-id: a43d417fb2
2013-12-17 11:00:44 -06:00
Brad Gonzales
af8b8cf0f5 Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168

Former-commit-id: b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly d0ae47d053 [formerly d324400d65 [formerly f4c1739687685a22847a09490724e84825032146]]]]
Former-commit-id: d0ae47d053
Former-commit-id: 413d6e83d3 [formerly 729ab5d41e] [formerly 230f64f02e7a5999b7f549e68cba93e994622dda [formerly 8476a13e41]]
Former-commit-id: 71ca5ec5cbf790259ccbbf23ade4ec069ca5e700 [formerly f0f1abea6b]
Former-commit-id: b12fc921a5
2013-12-17 09:43:12 -06:00
Mike Duff
8d04d1c8e9 Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph
Former-commit-id: c5dbf9536d [formerly e26bea423e] [formerly 66f5585774] [formerly c5dbf9536d [formerly e26bea423e] [formerly 66f5585774] [formerly 6406bcdd05 [formerly 66f5585774 [formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]]]
Former-commit-id: 6406bcdd05
Former-commit-id: ca4bb45e94 [formerly 0232f16e7a] [formerly dc31710b1c3cf0e82793c4e06ce4b433634d350a [formerly 54f7feef03]]
Former-commit-id: 8772cea891664095b1629a3cbe927489ed48e4c5 [formerly b54ab4df6a]
Former-commit-id: 707ac59a98
2013-12-17 09:41:30 -06:00
Greg Armendariz
0f56d01ce6 Issue #2182 - Change release number
Former-commit-id: 7219a81337 [formerly 00fd9a7bc5] [formerly 85703b9919] [formerly 7219a81337 [formerly 00fd9a7bc5] [formerly 85703b9919] [formerly e994e19877 [formerly 85703b9919 [formerly f9b49df162e36376f96897db77e0504cba87f28a]]]]
Former-commit-id: e994e19877
Former-commit-id: e2da5b7daa [formerly e190469fc1] [formerly 02329498e90a03be29ba695e53af3906d56dfb9d [formerly fad73466a7]]
Former-commit-id: 96a63d3425ad88c3313a0b252fcbfe855966c019 [formerly d2e4a4a504]
Former-commit-id: ba43b7e1c9
2013-12-17 08:46:15 -06:00
Bryan Kowal
c8e49142f2 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]]
Former-commit-id: 120ebd045a
Former-commit-id: a63bda59b4 [formerly 68181d3f62] [formerly 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8]]
Former-commit-id: ea54fc6cf0eb39a2eb253d886a1e3180ccf382a0 [formerly 9e0e6662c8]
Former-commit-id: fad82481c1
2013-12-16 16:39:10 -06:00
Ben Steffensmeier
f497c0198c Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309

Former-commit-id: 89de68386a [formerly fb1480b30d] [formerly 7e5349bbff] [formerly 89de68386a [formerly fb1480b30d] [formerly 7e5349bbff] [formerly cc5d9edc92 [formerly 7e5349bbff [formerly 33033c354a783ab58d89599eb78355c6b354594f]]]]
Former-commit-id: cc5d9edc92
Former-commit-id: e6606cb28b [formerly 8a3bbbca50] [formerly 5acc5053cf8a5d78052a11afbf56473f1be1d712 [formerly 23a26f5d4a]]
Former-commit-id: 70565b5d18d4d2e7488c047a72edd91b385f7fb3 [formerly 9f30c14fca]
Former-commit-id: ca5fb7e3fa
2013-12-16 14:31:44 -06:00
Richard Peter
bb8784aab4 Merge "Issue #2170: Fix PluginNotifier direct-vm endpoints" into omaha_14.2.1
Former-commit-id: 66adb4939a [formerly 42d277364b] [formerly 3758a9532c] [formerly 66adb4939a [formerly 42d277364b] [formerly 3758a9532c] [formerly 84b64dac81 [formerly 3758a9532c [formerly 840448d17e58f7d98ebe09b7df17d2d5d4bb4a6f]]]]
Former-commit-id: 84b64dac81
Former-commit-id: 609d5ca4b6 [formerly 9230c9de2a] [formerly 87863d83afd45bf114f60dd6dfd2aa25f33d37f8 [formerly f4ba1cac8c]]
Former-commit-id: 1b65bfe43f2a94fb8f93f2027f756bce65abffc0 [formerly fcd5955a0f]
Former-commit-id: 4bd12a5840
2013-12-16 13:43:37 -06:00
Richard Peter
a4e73bf509 Merge "Issue #2613 Replication subscription start time correctly set" into omaha_14.2.1
Former-commit-id: 38d9d2fc40 [formerly 8b18800b95] [formerly 35299e917d] [formerly 38d9d2fc40 [formerly 8b18800b95] [formerly 35299e917d] [formerly 624c51e393 [formerly 35299e917d [formerly b21de50d989fa341b99c0632e908c6c1f7b6853f]]]]
Former-commit-id: 624c51e393
Former-commit-id: bcc4b0226d [formerly d0ef49d66c] [formerly bae8a12ce5cd2ad2ea2a1b4df29fdb25a1896deb [formerly c05162ed1a]]
Former-commit-id: 62106f422d134d8679ee3a2fbb171e3d3871817c [formerly 7125f2eca0]
Former-commit-id: 27716cb2fe
2013-12-13 16:09:13 -06:00
Mike Duff
7fb8d4e9b4 Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
Former-commit-id: 4a34562b6d [formerly 685c07cde0] [formerly b310cf0388] [formerly 4a34562b6d [formerly 685c07cde0] [formerly b310cf0388] [formerly eb591030d8 [formerly b310cf0388 [formerly f68aaea220b8ad7dcc886bb3bdeab362b977061e]]]]
Former-commit-id: eb591030d8
Former-commit-id: d4008334a7 [formerly ee5788ae5f] [formerly 9481ed3c4c2ed1bd3c5d860228b7afb95c3be678 [formerly 0deef9b6dd]]
Former-commit-id: 106a3ad6aefe02408a13e23349f5401e61cb3900 [formerly 4127267b78]
Former-commit-id: d8787f7eba
2013-12-13 16:03:36 -06:00
Benjamin Phillippe
c9d18d57eb Issue #2613 Replication subscription start time correctly set
Change-Id: I3d00be2b82282a339c7d13a085abe82ee36850d5

Former-commit-id: c793973916 [formerly dd218bb5e3] [formerly 70e6212353] [formerly c793973916 [formerly dd218bb5e3] [formerly 70e6212353] [formerly e0d32db91c [formerly 70e6212353 [formerly 6f3bc8a63cbd5480d65875815de4cdffa63c266c]]]]
Former-commit-id: e0d32db91c
Former-commit-id: 5e71dc4194 [formerly accf148cfd] [formerly 15a4a3cf716b317c2b8a2c64d5fa3e5461da8f2b [formerly 80c01c7117]]
Former-commit-id: 02e9b334555b8081a701b5263580e40c4694c6c6 [formerly 7d1f693fd9]
Former-commit-id: 822603235c
2013-12-13 14:17:11 -06:00
Richard Peter
745525da93 Issue #2170: Fix PluginNotifier direct-vm endpoints
Change-Id: If41bfdadbb4bc6ccda3d53f94d1ee493329f0b0c

Former-commit-id: 756baaefb8 [formerly cfd3810476] [formerly 595a655dfd] [formerly 756baaefb8 [formerly cfd3810476] [formerly 595a655dfd] [formerly 6267bee5d5 [formerly 595a655dfd [formerly b9415039acdc85ee7975e9d6bd27047cce623723]]]]
Former-commit-id: 6267bee5d5
Former-commit-id: 25033b31dc [formerly 21d9a7445d] [formerly b7b7dbef9f70f3c75516d4b5ef6990009c01f694 [formerly 55a21685ea]]
Former-commit-id: 67ba9bb63933aa2a4f10526f3d26766c10ab6062 [formerly 689a74ec89]
Former-commit-id: 84d7393161
2013-12-13 12:32:46 -06:00
Lee Venable
b261eca351 Issue #2583 - Procedure dialog fixes and clean up.
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10

Former-commit-id: 197a8b5508 [formerly d6eb7534f5] [formerly aa0e9121f8] [formerly 197a8b5508 [formerly d6eb7534f5] [formerly aa0e9121f8] [formerly 7ee6053c22 [formerly aa0e9121f8 [formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]]]
Former-commit-id: 7ee6053c22
Former-commit-id: df1150692d [formerly d05d650430] [formerly 0af2a615c742e34adbdfd0a6913eb7d563f108fa [formerly f3c8b69e2e]]
Former-commit-id: fceb656ed374738175ac7491413c6069f1d1b881 [formerly b7d5aa748a]
Former-commit-id: b95b380eb2
2013-12-12 16:15:56 -06:00
Steve Harris
e242b041ad 14.1.1-13 baseline
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]]
Former-commit-id: b0b55a676b
Former-commit-id: 690b177ded [formerly 5368f23247] [formerly afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979]]
Former-commit-id: 0ea21b66b82286c758014c97bc2a1696ff006efb [formerly ff08301890]
Former-commit-id: 800136d61b
2013-12-12 16:59:57 -05:00
Richard Peter
f1f766f028 Issue #2170: Add registration of Router to Notification Framework
Change-Id: Ib2bc29d82395a021cee3a8f98b894010303f06ad

Former-commit-id: 6b2c2ac57c [formerly db0e9d40ec] [formerly 312fcc2b2f] [formerly 6b2c2ac57c [formerly db0e9d40ec] [formerly 312fcc2b2f] [formerly ded9c782fc [formerly 312fcc2b2f [formerly 6ea46281b904c99c9b6c9f364293bec96be16f7d]]]]
Former-commit-id: ded9c782fc
Former-commit-id: c137c98511 [formerly 3b4507cbe5] [formerly 8c2b99ce5979cc67fe016129fe2f3a8f2ec3736d [formerly b4fc76c03a]]
Former-commit-id: 302828b82ac098e1033aa3ca4d42c0d128d7f76b [formerly 3543625506]
Former-commit-id: d357b534c4
2013-12-12 13:47:37 -06:00
Ben Steffensmeier
c41c64ce5b Issue #2619 Fix rare dateline bug.
Former-commit-id: 1b99b5aca0 [formerly 45e4b4bbad] [formerly 399c579671] [formerly 1b99b5aca0 [formerly 45e4b4bbad] [formerly 399c579671] [formerly 607b5edb69 [formerly 399c579671 [formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]]]
Former-commit-id: 607b5edb69
Former-commit-id: 6a35407957 [formerly 58dabbfc87] [formerly fc52d111900f81c3257ff7f1b3c079e152fb00d3 [formerly d0f4b18b78]]
Former-commit-id: 9fc0459f3f576463d2cc040689f06ba824bcec45 [formerly a92f15a8fa]
Former-commit-id: 463ad8e8fa
2013-12-12 10:30:22 -06:00
Richard Peter
b53a3d614d Merge "Issue #2613 Fixed build" into omaha_14.2.1
Former-commit-id: 920fc0cd6c [formerly 55047d6807] [formerly ffab0f1669] [formerly 920fc0cd6c [formerly 55047d6807] [formerly ffab0f1669] [formerly 2f2f755110 [formerly ffab0f1669 [formerly c1630accf918363334c4d558cda8810341d0a2b7]]]]
Former-commit-id: 2f2f755110
Former-commit-id: 0980aa3328 [formerly 875d6570ee] [formerly 1381038e1b08db21600d309ac1f9900e2fe8c78c [formerly 4e5cd81df9]]
Former-commit-id: 94e446c096c620d0acfcf833214d1bbe8195b8ff [formerly d0fbf8df6b]
Former-commit-id: 455dfbcdeb
2013-12-12 09:54:19 -06:00
Benjamin Phillippe
07f1ed1f1f Issue #2613 Fixed build
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14

Former-commit-id: edc39cafac [formerly 5f3e8a5436] [formerly 7529f5bbe8] [formerly edc39cafac [formerly 5f3e8a5436] [formerly 7529f5bbe8] [formerly 2e909bc207 [formerly 7529f5bbe8 [formerly ce2bffa120b722cb3337658584a83c5161f07a51]]]]
Former-commit-id: 2e909bc207
Former-commit-id: 9d3c42381b [formerly 60d141c6a4] [formerly 68b4e030b4ac73f474d7331cc758905d41a0b7bd [formerly 620e838f59]]
Former-commit-id: 8e3c7c8114bf3e467630c9e645018bf27bf516c8 [formerly b960d13fd8]
Former-commit-id: e54629a36e
2013-12-12 09:44:05 -06:00
Richard Peter
12480dba1b Merge "Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations." into omaha_14.2.1
Former-commit-id: 71d88ca431 [formerly 247eb683e5] [formerly 91dc7825ce] [formerly 71d88ca431 [formerly 247eb683e5] [formerly 91dc7825ce] [formerly 3cc5ebc43e [formerly 91dc7825ce [formerly 08a46b28d5fb5f2e5d28a5f4138ee4fea3fad05d]]]]
Former-commit-id: 3cc5ebc43e
Former-commit-id: 8c0e800811 [formerly 7462693157] [formerly f3be58dab7723ab7f480a5a91a797293f8455ece [formerly 74c73c8ee1]]
Former-commit-id: f8fe8fd85b932bf64f73a4388d51efc7bd03ebdd [formerly e4af4c8b58]
Former-commit-id: ff074484f5
2013-12-11 18:00:10 -06:00
Richard Peter
24acb66362 Merge "Issue #2625 - fix no data errors in bandwidth utilization graph remove datauri from RetrievalGeneratorUtilities Set queries for DPA data to query by insertTime rather than obsTime" into omaha_14.2.1
Former-commit-id: d4b5572775 [formerly e41adf1ee9] [formerly 49def8a4b2] [formerly d4b5572775 [formerly e41adf1ee9] [formerly 49def8a4b2] [formerly a0f59f2059 [formerly 49def8a4b2 [formerly 4da283cae33cca8264007e246fa3d02b9809a114]]]]
Former-commit-id: a0f59f2059
Former-commit-id: 1a34cd0d66 [formerly 9a02a5cf39] [formerly 16027467a25225e85df14eb9f42c3327ad009c45 [formerly 7673b97152]]
Former-commit-id: 5aadb339fb8aa618706a52f13beb01fb1a34c3fc [formerly 022ee8929e]
Former-commit-id: 59ee3a6432
2013-12-11 17:59:43 -06:00
Brad Gonzales
fdcc2662ed Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c

Former-commit-id: 1c027db49b [formerly 6515d6a9e5] [formerly 112649eff2] [formerly 1c027db49b [formerly 6515d6a9e5] [formerly 112649eff2] [formerly 96dc3b65b1 [formerly 112649eff2 [formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]]]]
Former-commit-id: 96dc3b65b1
Former-commit-id: d81e245314 [formerly 3f5c25ff46] [formerly 0737955a8aef371ea08edc7e3c56b368da7ef030 [formerly 79efc3b53a]]
Former-commit-id: e67bd70c6a9e5e09b6487895962e3b3c7f1b2bd3 [formerly 133918fba6]
Former-commit-id: 7d479d8a73
2013-12-11 17:06:41 -06:00
Richard Peter
149de2e415 Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1
Former-commit-id: ce63ee408b [formerly f278dad7cc] [formerly 63bd2b26eb] [formerly ce63ee408b [formerly f278dad7cc] [formerly 63bd2b26eb] [formerly 6f57e14406 [formerly 63bd2b26eb [formerly 3d887a288459b786718a59d0c4a368408c3419f0]]]]
Former-commit-id: 6f57e14406
Former-commit-id: eb2ae25b0b [formerly cdf86e65ec] [formerly 4d3fe53b50bbff6dffd235bf492f67ac729eea24 [formerly 2f0e43e5a4]]
Former-commit-id: f379b9c9ae210f65afd2682f70d34ca47614b7cd [formerly fb3ccd066c]
Former-commit-id: b3074e9215
2013-12-11 16:19:02 -06:00
Richard Peter
83b09c235b Merge "Issue #2613 Registry performance enhancements" into omaha_14.2.1
Former-commit-id: cfd32aee5f [formerly 4ec080e015] [formerly 375c532376] [formerly cfd32aee5f [formerly 4ec080e015] [formerly 375c532376] [formerly 0ed2ba8024 [formerly 375c532376 [formerly 6a3b2d31829b4f6d39a6a06ec06c901b58506deb]]]]
Former-commit-id: 0ed2ba8024
Former-commit-id: 34f55d6132 [formerly 1d339f16f5] [formerly 19bf66da69dde6bc681fece6d897e713df539fe5 [formerly 890f038a54]]
Former-commit-id: d944181e0a14ef777ae04ff9a150e269cd897968 [formerly 1c5dc1b952]
Former-commit-id: ff66c6d1e5
2013-12-11 16:11:26 -06:00
Richard Peter
b4bd7c9ff3 Merge "Issue #2566 fix bandwidthmanager spring file resource resolution." into omaha_14.2.1
Former-commit-id: 02e6e33eb8 [formerly d720fbbd63] [formerly d9d19a1515] [formerly 02e6e33eb8 [formerly d720fbbd63] [formerly d9d19a1515] [formerly 51e46e08c5 [formerly d9d19a1515 [formerly 4ea822a22d2b21b4b3172a1f93773f01c2af20de]]]]
Former-commit-id: 51e46e08c5
Former-commit-id: c2bb4039df [formerly 6dbcd6677c] [formerly ff7f24a830fce1b40cd26b8492b11dff33299fce [formerly 561706ef1e]]
Former-commit-id: 3ef0067379aabb11f9bde11ad38fdeddcb7ca970 [formerly 7788a51f89]
Former-commit-id: 333ee2bbab
2013-12-11 16:08:06 -06:00
Mike Duff
0275c2b3a3 Issue #2616 - Set overwrite allowed flag on madis records when decoded
Added delta script for table MADIS with the hibernate generated key name

Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519

Former-commit-id: fa87393135 [formerly 1a0893d70e] [formerly 9a02ae7d68] [formerly fa87393135 [formerly 1a0893d70e] [formerly 9a02ae7d68] [formerly 5a42580c2b [formerly 9a02ae7d68 [formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]]]
Former-commit-id: 5a42580c2b
Former-commit-id: 1504d28ac8 [formerly d65b7c1cf5] [formerly 66d528190928112341ed3f56645df5e6a90b4a1e [formerly dc6ab027b5]]
Former-commit-id: 9180a12adb33997ae9fb803dd7ecab5a82c85206 [formerly 3f98d329c9]
Former-commit-id: 00e00796ae
2013-12-11 14:12:05 -06:00
Richard Peter
fa7463c402 Merge "Issue #2581 remove LSR dataURI column" into omaha_14.2.1
Former-commit-id: 453a1072eb [formerly fcbf2ff270] [formerly e441b548cc] [formerly 453a1072eb [formerly fcbf2ff270] [formerly e441b548cc] [formerly 6e86c98c04 [formerly e441b548cc [formerly e1e34142baebc23917a975a60f9f45aab750a775]]]]
Former-commit-id: 6e86c98c04
Former-commit-id: c8a84d6701 [formerly a9e4ee030d] [formerly 499298b5962fa570c04a3e8342f7aa0dc9b0934d [formerly 3ebbced489]]
Former-commit-id: 3d5c777b5d66f99a07ff6101febb67b87b5c18ea [formerly 3204af5ce8]
Former-commit-id: 6a6462331c
2013-12-11 13:56:38 -06:00
Greg Armendariz
b865dbd4fe Merge "Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change" into omaha_14.2.1
Former-commit-id: 6dcfee182a [formerly 78e1e9d78f] [formerly 45c9f7352e] [formerly 6dcfee182a [formerly 78e1e9d78f] [formerly 45c9f7352e] [formerly 4c1eb198d2 [formerly 45c9f7352e [formerly 00ef95580fa8ad1fe64694b1bc0a6cdf4ffe6823]]]]
Former-commit-id: 4c1eb198d2
Former-commit-id: e734c1ea68 [formerly 5171847cdf] [formerly fdad5044546b55c2852a6891aec138cca46ce41c [formerly 0e0bfc0521]]
Former-commit-id: f8bf1f5651bfe821c53621c0aacb20008f93d94a [formerly 23f6e3ecdf]
Former-commit-id: 276b7586bf
2013-12-11 13:54:17 -06:00
Greg Armendariz
74c45e19aa Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change
Change-Id: I831681915d2e214cf8111faeaabb3176eb3fc3c3

Former-commit-id: 74c49f1eee [formerly 57c98d4343] [formerly cb952cdb13] [formerly 74c49f1eee [formerly 57c98d4343] [formerly cb952cdb13] [formerly 2d2641ea7e [formerly cb952cdb13 [formerly 584c543fbab59889769570330e7d83529a6b733f]]]]
Former-commit-id: 2d2641ea7e
Former-commit-id: 07211ccd00 [formerly fce327c001] [formerly 5e9d4ca213ff3e8a2b41e6d180cedfce81e47a93 [formerly f5f21141a4]]
Former-commit-id: 8021fd79f7a48694795066c2335fc0f8dbf17fcd [formerly f9f10703e8]
Former-commit-id: 88437251d7
2013-12-11 13:46:27 -06:00
Ben Steffensmeier
dc1d7cc834 Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: c92b5842ab [formerly bf508b4455] [formerly a37db9d1b4] [formerly c92b5842ab [formerly bf508b4455] [formerly a37db9d1b4] [formerly 922674273e [formerly a37db9d1b4 [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]]
Former-commit-id: 922674273e
Former-commit-id: f62b7011b7 [formerly 0fb85fe4aa] [formerly 7b5206504ecad1e36005120b31bf8d5def0e3bf5 [formerly 4a86c90bfc]]
Former-commit-id: ef2c2b7d0102cc8ede2fad2eb721352ddceb079c [formerly b3ef07794a]
Former-commit-id: df1bc54013
2013-12-11 12:45:11 -06:00
Benjamin Phillippe
c32d76ff6b Issue #2613 Registry performance enhancements
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21

Former-commit-id: fd4e9edb76 [formerly b2c565c173] [formerly 969099d4c4] [formerly fd4e9edb76 [formerly b2c565c173] [formerly 969099d4c4] [formerly 0cb4e61261 [formerly 969099d4c4 [formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]]]]
Former-commit-id: 0cb4e61261
Former-commit-id: d794e8efed [formerly bfa17652ff] [formerly a1014b45f1af11aad2b8627651760da5407df827 [formerly 0d98a48d18]]
Former-commit-id: 4f6bf9cb8f0c4217f987b0987b2c31a8fd57917a [formerly 61b206a82e]
Former-commit-id: c330390a76
2013-12-11 12:20:12 -06:00
Mike Duff
09eea3fe55 Issue #2625 - fix no data errors in bandwidth utilization graph
remove datauri from RetrievalGeneratorUtilities
Set queries for DPA data to query by insertTime rather than obsTime

Change-Id: I67a55ca6898a5f478456d75c9ffd7e24120cade7

Former-commit-id: 9f5cf8e0c8 [formerly 4073f048d2] [formerly d378d9194a] [formerly 9f5cf8e0c8 [formerly 4073f048d2] [formerly d378d9194a] [formerly 3492436907 [formerly d378d9194a [formerly 9e37fa3a052d49830b36e6187280615cb6517d47]]]]
Former-commit-id: 3492436907
Former-commit-id: 4e87904b6f [formerly d83734f883] [formerly 286bba28a76b2a963357edfe7cede7d5247d6b31 [formerly bed189cc7b]]
Former-commit-id: 3f273a6d112f5458e37022b7314bbe06a7470d5e [formerly 35def598bd]
Former-commit-id: 671e43a228
2013-12-11 11:29:38 -06:00
Brad Gonzales
77b9816a0a Issue #2566 fix bandwidthmanager spring file resource resolution.
Change-Id: I533b39782454083411c65c3a1f721ca26a0d9731

Former-commit-id: 31930d262d [formerly 419230d6db] [formerly 5dd466e22a] [formerly 31930d262d [formerly 419230d6db] [formerly 5dd466e22a] [formerly cfa7128be2 [formerly 5dd466e22a [formerly c12676830e66cf8e18f10e835c0f95e25074d992]]]]
Former-commit-id: cfa7128be2
Former-commit-id: 919cea89ce [formerly 71d6ef856a] [formerly 548da1be7aa44a46bdb6fe06ce610a6d4f4e0449 [formerly 531c598e3b]]
Former-commit-id: 3fd1bec52252bdbebc894c0ddae7167d46581eb4 [formerly dbd7f3cc37]
Former-commit-id: ee8cbe414c
2013-12-11 11:19:40 -06:00
Slav Korolev
153d7ad006 Issue #2570. Show All subscriptions in Subscription manager.
Former-commit-id: 51c0f8f92f [formerly 85bc26b5a3] [formerly b59e9499d2] [formerly 51c0f8f92f [formerly 85bc26b5a3] [formerly b59e9499d2] [formerly 67e18055cc [formerly b59e9499d2 [formerly 27e177b2425db0a0241884b18e2501a923d02be4]]]]
Former-commit-id: 67e18055cc
Former-commit-id: c1b72b0e10 [formerly 746157755b] [formerly 9efd61bf39542c3ae92ed81de94a71f51cb52f27 [formerly 6811b0e5c1]]
Former-commit-id: 4d5b106a8fa995a056cf74463eea67301cb2a0db [formerly 04bc1a3052]
Former-commit-id: 65720fea82
2013-12-11 08:57:13 -05:00
Nate Jensen
74476aa385 Issue #2581 remove LSR dataURI column
Change-Id: I9d5ddc8346e6b9ac0ec56d09d50b6b19a5bc682f

Former-commit-id: 1d91d67a5b [formerly 6188356e72] [formerly fa674baf89] [formerly 1d91d67a5b [formerly 6188356e72] [formerly fa674baf89] [formerly e037c179fe [formerly fa674baf89 [formerly 88124207249673c3bf29915b6f6318bd2397ecd5]]]]
Former-commit-id: e037c179fe
Former-commit-id: 61e9833351 [formerly 4478983895] [formerly d4f63bdd454d528603209bfccf323090b3ffb746 [formerly 34c1af18a7]]
Former-commit-id: 7568cea11c2e09ab775871667eabd4d94ff75e40 [formerly b5450572f2]
Former-commit-id: e548e47239
2013-12-10 18:27:33 -06:00
Nate Jensen
04b0c4cec1 Merge "Issue #2581 fix decoding of LSR freezing drizzle and latlon" into omaha_14.2.1
Former-commit-id: 438f02f87d [formerly 50e0f15ec8] [formerly 7d4256d0d6] [formerly 438f02f87d [formerly 50e0f15ec8] [formerly 7d4256d0d6] [formerly fed233aff3 [formerly 7d4256d0d6 [formerly ae4051f529397b7a8b955bfd6ed56d446235e2a4]]]]
Former-commit-id: fed233aff3
Former-commit-id: 35331459c0 [formerly 9cfb911c04] [formerly a498cc41a14dd8a8391736b09aea932d81505907 [formerly befa8a0b9a]]
Former-commit-id: f1bab1e8530a76c3c804c0885549be81c16fe308 [formerly 367c8b73b4]
Former-commit-id: 6928a4ef8c
2013-12-10 15:18:27 -06:00
Nate Jensen
3de02c9d72 Issue #2581 fix decoding of LSR freezing drizzle and latlon
Change-Id: Iec01ce82c1b3104e86a54cd9ec015d699d0703d5

Former-commit-id: 2dc27feedc [formerly c0c17822c2] [formerly 60d395b347] [formerly 2dc27feedc [formerly c0c17822c2] [formerly 60d395b347] [formerly 16b0650f67 [formerly 60d395b347 [formerly f7324d1e9ab164c553f5c62920292fb0487bfcfb]]]]
Former-commit-id: 16b0650f67
Former-commit-id: c1b164d114 [formerly c96678bb3a] [formerly f03b5f2093b96690ad913f932903aae572e64345 [formerly 36845b1c1d]]
Former-commit-id: e2f2b5d700557b8b61af8c4f3090891b7e0691e7 [formerly 6b9ef6eddd]
Former-commit-id: 34319cc97e
2013-12-10 10:10:11 -06:00
Mike Duff
60a3267f91 Issue #2601 - Fix NullPointerException.
Former-commit-id: 8b49b1dea7 [formerly 773e546f62] [formerly 9e9706f55f] [formerly 8b49b1dea7 [formerly 773e546f62] [formerly 9e9706f55f] [formerly d2fe42c27c [formerly 9e9706f55f [formerly fbeeddbf895ec1568452df632c8147c17757bb0c]]]]
Former-commit-id: d2fe42c27c
Former-commit-id: 24ae26ef90 [formerly 02bbd4eaa6] [formerly d6664cc0a8ed267b96caf4d313f4f99d96961e7e [formerly 32b468023d]]
Former-commit-id: 6d4a3d4e5921151b5a888e5bc86daea2a50ee08b [formerly dd1af02457]
Former-commit-id: bddf555eab
2013-12-10 09:03:42 -06:00
Lee Venable
54e6a2966b Merge "Issue #2271 - Fix menu problem with previously selected points being selectable again" into omaha_14.2.1
Former-commit-id: 77f637dff1 [formerly 997c575919] [formerly 249435f17c] [formerly 77f637dff1 [formerly 997c575919] [formerly 249435f17c] [formerly 2c6b4309f0 [formerly 249435f17c [formerly c4cda041169c5fe3f813a71c1b09b5eaeba9e385]]]]
Former-commit-id: 2c6b4309f0
Former-commit-id: b342346474 [formerly 4850830125] [formerly 3186e75460a5b4acb8c484648f1f445e432dee15 [formerly cc7885610d]]
Former-commit-id: e223fbba6ede8a8a7283fdd9d05141d71618788d [formerly 291c7f95c4]
Former-commit-id: 099f3f504a
2013-12-09 09:51:41 -06:00
Richard Peter
b5973d803f Issue #2170: Fix Ensemble notifications
Change-Id: I48cdd8dad18f0e4866f2e150acb37c8f6ada139b

Former-commit-id: ed79e93d00 [formerly 0c5a6af2f3] [formerly b3f90b4e07] [formerly ed79e93d00 [formerly 0c5a6af2f3] [formerly b3f90b4e07] [formerly 0c269d0a7c [formerly b3f90b4e07 [formerly da7c2ba0cdc0e9108d987d9ff7531f657c7c832e]]]]
Former-commit-id: 0c269d0a7c
Former-commit-id: 799df90f7f [formerly 4a6d41871e] [formerly e8dec021bb4665162c922437e35f72eea5dd05e6 [formerly d430167b2c]]
Former-commit-id: 762a10da036e844868c06b6318a24b2ba933478c [formerly 3376002d20]
Former-commit-id: 5283e7c725
2013-12-06 15:41:10 -06:00
Mike Duff
ae342f5a43 Issue #2271 - Fix menu problem with previously selected points being selectable again
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee

Former-commit-id: e91227bad4 [formerly 850e4dfbde] [formerly 0a5f2e3484] [formerly e91227bad4 [formerly 850e4dfbde] [formerly 0a5f2e3484] [formerly ebc730ac2d [formerly 0a5f2e3484 [formerly 959fcd37424b6261606d2ae65663403764be9c39]]]]
Former-commit-id: ebc730ac2d
Former-commit-id: 5299287b65 [formerly 1925177772] [formerly 10eeac71861238a8de2287ad168fcc62e2afd598 [formerly 4d210517bd]]
Former-commit-id: dec6566c173e4f7fff1a056f14a0c7192f0bbc0c [formerly 96de34b2c1]
Former-commit-id: 74b19522a2
2013-12-06 12:58:38 -06:00
Nate Jensen
84c16f84ac Issue #2599 fix constructor
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e

Former-commit-id: 899bc199bb [formerly ec6b5393ef] [formerly 9bff38e0d3] [formerly 899bc199bb [formerly ec6b5393ef] [formerly 9bff38e0d3] [formerly 41014a105d [formerly 9bff38e0d3 [formerly 8b0c799cf132a90211d1344d4e16785895f76263]]]]
Former-commit-id: 41014a105d
Former-commit-id: 71bc390b4f [formerly e8f28c6799] [formerly 8c75e2081d678b06e6390ca47fa30f36b8fcd47a [formerly f3e455d1a3]]
Former-commit-id: 777c0919b634d84c4f042eb949a6e3019c76a259 [formerly eb68a1be85]
Former-commit-id: 907a6e3304
2013-12-06 12:35:22 -06:00
Ben Steffensmeier
e324a43104 Issue #2537 Fix feature for poitndata dependency on dataaccess.
Former-commit-id: 258988c269 [formerly 067c510315] [formerly 59c6a24b68] [formerly 258988c269 [formerly 067c510315] [formerly 59c6a24b68] [formerly d883f8dbb1 [formerly 59c6a24b68 [formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 57de1adb55 [formerly 899cb2628c] [formerly 0119ce6ac19df37c80d8dfefa6dbbff1e8a7d526 [formerly 99afa17fd2]]
Former-commit-id: 48272569ea237bbdd940ff601ceae5ae9469c967 [formerly c27934d7ad]
Former-commit-id: fe53e49cb3
2013-12-06 09:14:01 -06:00
Bryan Kowal
3ab3dde09b Issue #2509 - re-compile grib2.so for RHEL6 64-bit
Former-commit-id: e907393567 [formerly 8f053f9fcd] [formerly 187759698b] [formerly e907393567 [formerly 8f053f9fcd] [formerly 187759698b] [formerly 5b8a8ddbeb [formerly 187759698b [formerly 90958e13e98147130848aad26d077e7a040ddb51]]]]
Former-commit-id: 5b8a8ddbeb
Former-commit-id: 0c43ddc19a [formerly ea0243e5da] [formerly ce6e7989617ea657c038124ee01c2907330c0e40 [formerly eceffc3880]]
Former-commit-id: 670c6c05d0683cd40d129ff44552087cd66d1f04 [formerly 91cdeb8c89]
Former-commit-id: c2273bbf5f
2013-12-05 15:53:51 -06:00
Brad Gonzales
d1fa8c738b Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
       the edex.core.modes package.  Move EdexMode, DefaultEdexMode, and EdexModesContainer
       to the same package.

Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb

Former-commit-id: 310597d856 [formerly 3d34764022] [formerly 410a00c72a] [formerly 310597d856 [formerly 3d34764022] [formerly 410a00c72a] [formerly 72df38075f [formerly 410a00c72a [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]]
Former-commit-id: 72df38075f
Former-commit-id: fa097589d0 [formerly e18f7b2380] [formerly d6d85c281b70c2e07827f44bc42368ab797e8062 [formerly c54fe467a3]]
Former-commit-id: e96fbe2c0a9f49c38dbe9b9eb76448f730afdb58 [formerly 3d592d0b38]
Former-commit-id: 143e160eae
2013-12-05 15:17:14 -06:00
Richard Peter
077ddd9818 Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: da82396995 [formerly df4a4c5121] [formerly d0b50eee3c] [formerly da82396995 [formerly df4a4c5121] [formerly d0b50eee3c] [formerly 6fde307f0a [formerly d0b50eee3c [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]]
Former-commit-id: 6fde307f0a
Former-commit-id: 3088533103 [formerly 45889cb80f] [formerly ab63c3e242c8f489c2b55d427b4ca49dfd7b4657 [formerly 9f4dfc9051]]
Former-commit-id: 714bcfc3b217ba5f4187ec79b31726d5a3bcf4c4 [formerly ef7ba1f1ee]
Former-commit-id: 8cde2b5e9d
2013-12-05 14:54:46 -06:00