Commit graph

537 commits

Author SHA1 Message Date
Steve Harris
7d8ae66ddf Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: b0c0e2e7cf [formerly 1e4c538e58] [formerly b0c0e2e7cf [formerly 1e4c538e58] [formerly 56e04554e9 [formerly 2e1e30df32ef00523dbcd995457b854cbcad3d41]]]
Former-commit-id: 56e04554e9
Former-commit-id: 1d4e65d435 [formerly 72a559120f]
Former-commit-id: 4b06eb1152
2013-06-06 15:43:34 -05:00
Steve Harris
d46b0413fb 13.4.1-14 baseline
Former-commit-id: be236eb722 [formerly c749e122eb] [formerly be236eb722 [formerly c749e122eb] [formerly 18b90226a2 [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]
Former-commit-id: 18b90226a2
Former-commit-id: cebc1ddb63 [formerly dee685e3c7]
Former-commit-id: 8ec7524cbb
2013-06-06 15:15:27 -04:00
David Gillingham
ce5c51d360 Issue #2063: Improve performance of grid blanking in iscMosaic by only retrieving history data, not entire grid slices.
Change-Id: Icd25e7e54a391ca19445be866e411b35aed54b16

Former-commit-id: 51b317ac52 [formerly 9acf385f21] [formerly 51b317ac52 [formerly 9acf385f21] [formerly bad6a1fa40 [formerly 5570ee749c5797f8f2c9ab3f6f8392d2c5680d32]]]
Former-commit-id: bad6a1fa40
Former-commit-id: 5fe4739fc4 [formerly 070365714a]
Former-commit-id: 8199019e54
2013-06-05 16:26:04 -05:00
Ron Anderson
764f1dbec6 Issue #2026 Improved alertviz error logging
Change-Id: Ia30086b9d830c6d950045ceab36bbe802d507ac8

Former-commit-id: 6bab5a5935 [formerly 39e6673685] [formerly 6bab5a5935 [formerly 39e6673685] [formerly 859b72a714 [formerly d2418d309830a5063fcd90fd18a8d636574ddfbb]]]
Former-commit-id: 859b72a714
Former-commit-id: b3f48138a0 [formerly 94cfb2dddf]
Former-commit-id: c0efa5b28f
2013-06-05 12:05:15 -05:00
Steve Harris
14845b87e4 Issue #1872 - Licensing for java jdk, jbzip2, postgresql, qpid
Change-Id: I09f958247c6342ff45da5f85a197ccb4c652c6db

Former-commit-id: bf4d9824ef [formerly a97ea3942d] [formerly bf4d9824ef [formerly a97ea3942d] [formerly aefacbcd9b [formerly c9334ae14df169463a03d7c46fa3bbe8c5ac27c9]]]
Former-commit-id: aefacbcd9b
Former-commit-id: b1a3ff5b3f [formerly 7db966b23e]
Former-commit-id: 173102dcfc
2013-06-04 13:56:51 -05:00
Nate Jensen
b32e732341 Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF

Former-commit-id: 537b731f6e [formerly 329d9d1c6a] [formerly 537b731f6e [formerly 329d9d1c6a] [formerly 5d1ecb3a5d [formerly 6742f7dbcac39261d8bee4e055bb9e4eda66520d]]]
Former-commit-id: 5d1ecb3a5d
Former-commit-id: 412c21f516 [formerly 2d1405b9c4]
Former-commit-id: 5c2f0ab151
2013-06-04 11:43:22 -05:00
Ron Anderson
b0f7ac7f1a Merge "Issue #1759: Add a more detailed comment in code for previous change." into omaha_13.4.1
Former-commit-id: d0897c31d8 [formerly fb5d432669] [formerly d0897c31d8 [formerly fb5d432669] [formerly 0ae8346cfb [formerly b1c936f0dfb28dc543d7a83b6d0a0233866b98de]]]
Former-commit-id: 0ae8346cfb
Former-commit-id: e6d7b83df5 [formerly f65ce6e3e6]
Former-commit-id: d01a608015
2013-06-03 07:45:02 -05:00
Richard Peter
4ec5ca19ea Issue #2058: Update obsPurgeRules.xml and sfcobsPurgeRules.xml
Change-Id: I80fe6124b7cfb0e5988135fa5bd0edacc2785e6c

Former-commit-id: 7693aef3db [formerly 948d1aabfe] [formerly 7693aef3db [formerly 948d1aabfe] [formerly 5a8fe397b2 [formerly ea807c13a7cf0ff8a561feb46c99e649eb5254a0]]]
Former-commit-id: 5a8fe397b2
Former-commit-id: ba36d7c9af [formerly 8d856602e3]
Former-commit-id: 1846685f3f
2013-05-31 14:43:43 -05:00
Richard Peter
1ac79385f7 Issue #2053: Use DX_SERVERS to resolve hosts, otherwise use hard coded server names
Former-commit-id: 91bfa4b37a [formerly c2e1b72f9b] [formerly 91bfa4b37a [formerly c2e1b72f9b] [formerly fdcf086681 [formerly 26c7862ba586d3b109bf0c6799b1ec8b12d360fe]]]
Former-commit-id: fdcf086681
Former-commit-id: 2d3b8706c1 [formerly 14ef93bf5a]
Former-commit-id: 522dfa3733
2013-05-31 13:01:52 -05:00
David Gillingham
c3cdfa4293 Issue #1759: Add a more detailed comment in code for previous change.
Change-Id: Ib45c63efa95fb2bac601f435898d2433db242d8e

Former-commit-id: 3ec84b8f18 [formerly 5b9094275d] [formerly 3ec84b8f18 [formerly 5b9094275d] [formerly a11ef45913 [formerly 76fd66783565677c99006dd7c2b7628acd61c2a3]]]
Former-commit-id: a11ef45913
Former-commit-id: b77e978008 [formerly 593a5fcbed]
Former-commit-id: db859cfe86
2013-05-31 12:25:19 -05:00
Ron Anderson
e9fbd70d11 Merge "Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path." into omaha_13.4.1
Former-commit-id: 1b9e0c2047 [formerly 7e1d2d273f] [formerly 1b9e0c2047 [formerly 7e1d2d273f] [formerly c3f8ab24ea [formerly 08de853f51cf46cb8b8a7b9f26b355ec59c164ab]]]
Former-commit-id: c3f8ab24ea
Former-commit-id: 35f018c206 [formerly b6d6349f09]
Former-commit-id: 5b94dbc699
2013-05-31 12:09:49 -05:00
Greg Armendariz
2d5ce9a11e Merge "Issue #2053: Add dx2f to capture" into omaha_13.4.1
Former-commit-id: 34e1b80460 [formerly 63fcb26312] [formerly 34e1b80460 [formerly 63fcb26312] [formerly 5052a7f3f5 [formerly ca827b6fac3130f4ca0403bba860182215f8a6f2]]]
Former-commit-id: 5052a7f3f5
Former-commit-id: ae082f94c9 [formerly 9e57f1869e]
Former-commit-id: d67ec97699
2013-05-31 11:44:12 -05:00
Richard Peter
095c5459ad Merge "Issue #1847 D2D nsharp will now format Lat/Lons as stationId like NC ncharp. Change-Id: If5507d0dc13bf283d97218d68a49120120fe8626" into omaha_13.4.1
Former-commit-id: 3ae3f6a0cb [formerly 5da3e64528] [formerly 3ae3f6a0cb [formerly 5da3e64528] [formerly 1fc1c77189 [formerly d971f21d651d351fa05ee96a50f5183c2a95df87]]]
Former-commit-id: 1fc1c77189
Former-commit-id: f77ef2196d [formerly 2dc6232ba0]
Former-commit-id: 7b6b40e31d
2013-05-31 11:43:19 -05:00
Ben Steffensmeier
82bd402966 Issue #1847 D2D nsharp will now format Lat/Lons as stationId like NC ncharp.
Change-Id: If5507d0dc13bf283d97218d68a49120120fe8626

Former-commit-id: 36cd455621 [formerly da73b0fd4e] [formerly 36cd455621 [formerly da73b0fd4e] [formerly 7ae82832d1 [formerly fba34b77a870a2fc1d6b4301dc3a4d61ce424f67]]]
Former-commit-id: 7ae82832d1
Former-commit-id: 66cc26f78b [formerly d720c0fa3f]
Former-commit-id: 7cb83e5c64
2013-05-31 11:39:50 -05:00
David Gillingham
ca548953d2 Issue #1759: Prevent site-specific paths from getting stuck in IscScript's include path.
Change-Id: I8ce909536174192217f5ba228af24cca08796c7b

Former-commit-id: 88eed9bc17 [formerly 3ccf091c44] [formerly 88eed9bc17 [formerly 3ccf091c44] [formerly cab1c849bf [formerly 6ebf8b354145cac21458617b9bb4cdcbedeff7e7]]]
Former-commit-id: cab1c849bf
Former-commit-id: 912212b953 [formerly df9c5492c8]
Former-commit-id: 06bfd0413c
2013-05-31 10:42:51 -05:00
Richard Peter
896593c691 Issue #2053: Add dx2f to capture
Former-commit-id: 345a9e4d65 [formerly d8d7c01705] [formerly 345a9e4d65 [formerly d8d7c01705] [formerly d4cf7a1312 [formerly 6bcb1c44f311370d54747785cd4fe650ca846d67]]]
Former-commit-id: d4cf7a1312
Former-commit-id: 4f7125d343 [formerly 337efabc5a]
Former-commit-id: 43b0fa7d11
2013-05-31 10:37:48 -05:00
Richard Peter
02cdefa3de Issue #2056: Update FileLocker to handle release of ACQUIRING locks
Change-Id: Id1e0f60390775c4143dbbf25070d2efb9ffe2b23

Former-commit-id: c15635bccc [formerly e63f2de395] [formerly c15635bccc [formerly e63f2de395] [formerly 163998df17 [formerly 9097197872da18fded96e09d133132872d4dcc27]]]
Former-commit-id: 163998df17
Former-commit-id: 49cdce7b03 [formerly a10651b3b9]
Former-commit-id: b1e80dd072
2013-05-30 17:53:17 -05:00
Nate Jensen
0f1cab2357 Merge "Issue #2055 Remove modelName from sounding pointName. Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b" into omaha_13.4.1
Former-commit-id: 7a73bd79d6 [formerly 1ea89c8f0f] [formerly 7a73bd79d6 [formerly 1ea89c8f0f] [formerly 35a2a44ccd [formerly b5657bb2156ade929296f5d748616afd246d8321]]]
Former-commit-id: 35a2a44ccd
Former-commit-id: 7e05836290 [formerly 21d261d8be]
Former-commit-id: daf8bdc47a
2013-05-30 16:15:27 -05:00
Ben Steffensmeier
78a840b4aa Issue #2055 Remove modelName from sounding pointName.
Change-Id: I05f48ae34547a9fc0f79f2218ccde8cb153efd6b

Former-commit-id: 965705049b [formerly 2ee4b85d74] [formerly 965705049b [formerly 2ee4b85d74] [formerly 51f6906c88 [formerly 15a4af789dcad3507cb6778ceea5f00df8425502]]]
Former-commit-id: 51f6906c88
Former-commit-id: e9b92d330d [formerly f7353cc092]
Former-commit-id: 9159f57ff5
2013-05-30 16:05:53 -05:00
Ron Anderson
40b8d1ed3c Issue #2028 Fixed date line issue in MakeHazardDialog
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287

Former-commit-id: 165bc6c409 [formerly 6557515f64] [formerly 165bc6c409 [formerly 6557515f64] [formerly 08e09382db [formerly 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f]]]
Former-commit-id: 08e09382db
Former-commit-id: 3f9cb35feb [formerly c3363d43fa]
Former-commit-id: b04716dd2b
2013-05-30 11:01:07 -05:00
Steve Harris
86a4b2913f Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 07bc6c83e9 [formerly 9d4577079d] [formerly 07bc6c83e9 [formerly 9d4577079d] [formerly 0a276d4954 [formerly f50ef3c44d1386dd4ec800fd65db7b0f2b4fe03f]]]
Former-commit-id: 0a276d4954
Former-commit-id: f72ba834dc [formerly f4d1b7c86c]
Former-commit-id: 9bf53663ae
2013-05-30 07:26:30 -05:00
Steve Harris
176f4d392f 13.4.1-13 baseline
Former-commit-id: e3b8086bd0 [formerly 87b9712009] [formerly e3b8086bd0 [formerly 87b9712009] [formerly de476791fb [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]
Former-commit-id: de476791fb
Former-commit-id: 418f8aef56 [formerly b58cf237bf]
Former-commit-id: c9155c1631
2013-05-29 16:30:09 -04:00
Richard Peter
f3b67f0d33 Merge "Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period." into omaha_13.4.1
Former-commit-id: 344765c61d [formerly 979cc8c181] [formerly 344765c61d [formerly 979cc8c181] [formerly 732ae3c832 [formerly 09ec82babbc567bea671b606f3b45e8923c6e831]]]
Former-commit-id: 732ae3c832
Former-commit-id: e65237b93f [formerly ec8c77f6f3]
Former-commit-id: d48c54529f
2013-05-23 18:10:58 -05:00
Ron Anderson
3a44fb51ca Merge "Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest." into omaha_13.4.1
Former-commit-id: 1eb1cffa15 [formerly c0fffc630d] [formerly 1eb1cffa15 [formerly c0fffc630d] [formerly 57c452b085 [formerly 339fa8409866f8464eebaf982cdbfc3ae37a8b6b]]]
Former-commit-id: 57c452b085
Former-commit-id: 9cdf34184d [formerly 59d823bf7b]
Former-commit-id: e33fd0c95f
2013-05-23 12:12:39 -05:00
Richard Peter
62191a8d82 Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period.
Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c

Former-commit-id: d5c0b86b7a [formerly b599745012] [formerly d5c0b86b7a [formerly b599745012] [formerly 7349808131 [formerly a48084f6cd99a440fcaab025c0178cf1fa17c9bb]]]
Former-commit-id: 7349808131
Former-commit-id: 53190601f6 [formerly f3e0966966]
Former-commit-id: c51e6750b4
2013-05-23 11:50:34 -05:00
Mike Duff
12bad74ca8 Issue #1902 - fix to forced guidance
Peer review comments

Change-Id: I5c42fad454e42e5697d32e183702de535ecc3e5e

Former-commit-id: b331a68a08 [formerly 11423a7465] [formerly b331a68a08 [formerly 11423a7465] [formerly 2a733fa5f8 [formerly ebd633109a62e7a2d8a0b8e3083aaf5680766739]]]
Former-commit-id: 2a733fa5f8
Former-commit-id: 2878cde676 [formerly 7d177607bf]
Former-commit-id: a1dd9d73ba
2013-05-23 09:52:07 -05:00
Steve Harris
6dbe80b1af Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: dce0dc3692 [formerly 097617fa26] [formerly dce0dc3692 [formerly 097617fa26] [formerly 462652e31e [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]
Former-commit-id: 462652e31e
Former-commit-id: 026674d0b2 [formerly 299690a202]
Former-commit-id: bd9b2e493e
2013-05-22 16:10:04 -05:00
David Gillingham
8706da5f02 Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest.
Change-Id: Ie9e58a139eed869a0483a475974ed4b733711bac

Former-commit-id: cf1f45d77f [formerly 8e8d71dc2f] [formerly cf1f45d77f [formerly 8e8d71dc2f] [formerly d5895e23c7 [formerly d6c6f3f9a6d7d37f22af82984d0d75937b4415cc]]]
Former-commit-id: d5895e23c7
Former-commit-id: 2e6f7c8250 [formerly 0e1135ac1f]
Former-commit-id: 135ed9899f
2013-05-22 15:48:32 -05:00
Steve Harris
71e13c4d4d 13.4.1-12 baseline
Former-commit-id: 397bbf674a [formerly 6a97b4325a] [formerly 397bbf674a [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: b745b332ae [formerly bd4f93e859]
Former-commit-id: 0d9e71aee2
2013-05-22 16:42:39 -04:00
David Gillingham
016ea4ec14 Issue #1759: Fix regression to ISC request reply due to missing import.
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80

Former-commit-id: 2555cf9819 [formerly 5cba0f5e40] [formerly 2555cf9819 [formerly 5cba0f5e40] [formerly 801c659108 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]
Former-commit-id: 801c659108
Former-commit-id: 1471a7fa34 [formerly 60aeb71652]
Former-commit-id: dca867b77c
2013-05-22 11:42:08 -05:00
Richard Peter
2a8115770f Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 4809b3c15b [formerly 73372622f7] [formerly 4809b3c15b [formerly 73372622f7] [formerly 77a08ebd31 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 21b87e9ea7 [formerly 427f54a878]
Former-commit-id: 69e6ea4847
2013-05-21 10:35:00 -05:00
Steve Harris
d9f967c811 13.4.1-11 baseline
Former-commit-id: d6319a2ca6 [formerly 2edee36158] [formerly d6319a2ca6 [formerly 2edee36158] [formerly c0376ce9ed [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]
Former-commit-id: c0376ce9ed
Former-commit-id: 4d88863515 [formerly 6df093ef48]
Former-commit-id: 2767fd893c
2013-05-21 09:19:25 -04:00
Steve Harris
b41118326c 13.4.1-10 baseline
Former-commit-id: 68fe2134b8 [formerly 9a403b3615] [formerly 68fe2134b8 [formerly 9a403b3615] [formerly 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 7e04d8cd13 [formerly b1fc4e625b]
Former-commit-id: 322036ea82
2013-05-20 10:52:47 -04:00
Bryan Kowal
7425d2c695 Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
Former-commit-id: db9b06cc9d [formerly d8ce0f369c] [formerly db9b06cc9d [formerly d8ce0f369c] [formerly a070d28ecc [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]]
Former-commit-id: a070d28ecc
Former-commit-id: a52363e2df [formerly 7dd9b1e1c0]
Former-commit-id: bef3b4c74f
2013-05-17 18:21:03 -05:00
Steve Harris
34145afafe Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Former-commit-id: 87a31f9990 [formerly 16ba74496d] [formerly 87a31f9990 [formerly 16ba74496d] [formerly b76d359695 [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: b5d3ff1867 [formerly 26664e6615]
Former-commit-id: 4827d8f1d9
2013-05-16 13:45:58 -05:00
Bryan Kowal
fc9f89b497 Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e

Former-commit-id: 2149099abb [formerly 11c93f548e] [formerly 2149099abb [formerly 11c93f548e] [formerly 43ec909008 [formerly f90a3d048154641a2900fbe21de3e96db9f87aff]]]
Former-commit-id: 43ec909008
Former-commit-id: c03d61587c [formerly 97cff7bf9c]
Former-commit-id: c00e145831
2013-05-16 10:21:11 -05:00
Bryan Kowal
c7a9750841 Issue #1872 - merge 2002; do not include .gitignore files in the rpm
Former-commit-id: c83d93b527 [formerly b0122e794e] [formerly c83d93b527 [formerly b0122e794e] [formerly 20fd227d99 [formerly 25a995ec49f223eba1c81ce6d9da350c3f381607]]]
Former-commit-id: 20fd227d99
Former-commit-id: 8cba03d5a5 [formerly 7ec8600dc1]
Former-commit-id: 1a63d07768
2013-05-16 10:19:31 -05:00
Steve Harris
1730b6c41e 13.4.1-9 baseline
Former-commit-id: 88eee9cbfa [formerly bcf7f15c90] [formerly 88eee9cbfa [formerly bcf7f15c90] [formerly aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: 67a95d07d2 [formerly 0766ae20dd]
Former-commit-id: 3f87ea1a15
2013-05-16 11:12:07 -04:00
Nate Jensen
921d851ef1 Merge "Issue #2007 unpack plugins that have res/spring files" into omaha_13.4.1
Former-commit-id: bb307ed685 [formerly 35830d317d] [formerly bb307ed685 [formerly 35830d317d] [formerly 7f9ef5ce98 [formerly 444b61ff0af4a687bdf7daab51a3b435f91f3829]]]
Former-commit-id: 7f9ef5ce98
Former-commit-id: dbe24d00fd [formerly 4c7b2d73d3]
Former-commit-id: f7d304c51b
2013-05-15 14:00:15 -05:00
Nate Jensen
351989c61f Issue #2007 unpack plugins that have res/spring files
Change-Id: Ibc8720a873ae8ba11e89d5d88c668418a3abfc9b

Former-commit-id: 86d3bf5a7c [formerly 948e47a2c6] [formerly 86d3bf5a7c [formerly 948e47a2c6] [formerly fecadf104b [formerly 147787a0a161bd54926e9ec86aee472b414859ed]]]
Former-commit-id: fecadf104b
Former-commit-id: 9284c27ddd [formerly ba3bda461c]
Former-commit-id: 43369f0cf3
2013-05-15 13:36:09 -05:00
Bryan Kowal
84ed22cf52 Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
Former-commit-id: e1794dd03f [formerly f9e77e90b7] [formerly e1794dd03f [formerly f9e77e90b7] [formerly 0e3e3e891b [formerly 1f656fbe0a267ace1dad3b22b3ef7ef1bd7c8d92]]]
Former-commit-id: 0e3e3e891b
Former-commit-id: 1fccd55036 [formerly 0af34bbe4c]
Former-commit-id: 59024f8dd7
2013-05-15 11:55:56 -05:00
Steve Harris
5bdcf5c0a1 13.4.1-8 baseline
Former-commit-id: 576a74fe0b [formerly 19866e7032] [formerly 576a74fe0b [formerly 19866e7032] [formerly c59b52a266 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]
Former-commit-id: c59b52a266
Former-commit-id: 5465764527 [formerly a1c4cd2a39]
Former-commit-id: 395d21565f
2013-05-14 09:21:41 -04:00
Richard Peter
fe2e894307 Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea

Former-commit-id: c63a4882e7 [formerly 99391cfe12] [formerly c63a4882e7 [formerly 99391cfe12] [formerly d4135dba62 [formerly 883a51484d03900852ed84820aa559e088c97335]]]
Former-commit-id: d4135dba62
Former-commit-id: 43a90c062c [formerly a02955e40c]
Former-commit-id: 81ece036ac
2013-05-13 17:16:57 -05:00
Richard Peter
9623d4c82e Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
	nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
	nativeLib/files.native/adapt/climate/bin/Linux/build_f6
	nativeLib/files.native/adapt/climate/bin/Linux/create_climate
	nativeLib/files.native/adapt/climate/bin/Linux/display_climate
	nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
	nativeLib/files.native/adapt/climate/bin/Linux/format_climate
	nativeLib/files.native/adapt/climate/bin/Linux/init_climate
	nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
	nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
	nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
	nativeLib/files.native/edex/lib/native/linux32/libXm.so
	nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
	nativeLib/files.native/edex/lib/native/linux32/libtcl.so
	nativeLib/files.native/edex/lib/native/linux32/libtk.so
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e

Former-commit-id: 4ae23b93d9 [formerly 8062c38b71] [formerly 4ae23b93d9 [formerly 8062c38b71] [formerly ba590e2f93 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]]
Former-commit-id: ba590e2f93
Former-commit-id: faf22cc925 [formerly 8e5929406c]
Former-commit-id: 4b5869684b
2013-05-13 16:33:50 -05:00
Steve Harris
c7c6ea343e 13.4.1-7 baseline
Former-commit-id: 8072752c77 [formerly 4c6ff79e71] [formerly 8072752c77 [formerly 4c6ff79e71] [formerly 8347bed50e [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]
Former-commit-id: 8347bed50e
Former-commit-id: ff7a21ac37 [formerly b35027f661]
Former-commit-id: dffa6d3bdc
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
85eda2ea78 Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: 926da8983e [formerly e5fc3f3835] [formerly 926da8983e [formerly e5fc3f3835] [formerly 598ce2ae6c [formerly 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937]]]
Former-commit-id: 598ce2ae6c
Former-commit-id: bb257fc9e5 [formerly b4c645f99f]
Former-commit-id: 62db2bdcd3
2013-05-13 11:42:54 -05:00
Mike Duff
3df65a2ad9 Issue #1919 - Fix VGBs in FFMP
Former-commit-id: d087b03eb3 [formerly f887a41875] [formerly d087b03eb3 [formerly f887a41875] [formerly 7874521269 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]]
Former-commit-id: 7874521269
Former-commit-id: 311ce09129 [formerly d262dc63f0]
Former-commit-id: 83304c3e4c
2013-05-10 09:58:02 -05:00
David Gillingham
50d58b588e Issue #1898: Ensure map bundles are copied to /site/bundles/maps/ not /site/maps/.
Change-Id: Iccd50915b7b19c49fe35fdfc7edd678e9fd7dac4

Former-commit-id: 11cb7b2295 [formerly 51063c7c53] [formerly 11cb7b2295 [formerly 51063c7c53] [formerly 36944298f4 [formerly 4c7f1216d9e2ba683bc46adcfe1d5863e4477490]]]
Former-commit-id: 36944298f4
Former-commit-id: c5983413a0 [formerly d475d8f07b]
Former-commit-id: 65e64221d5
2013-05-09 14:28:17 -05:00
Brad Gonzales
6421017e65 Issue #1970 added annotation comment to PluginDataObject header.
Change-Id: Ic6612278d98f862e0d1ba3d504a0391cf59f6a52

Former-commit-id: 36345cc166 [formerly 90d93e2a02] [formerly 36345cc166 [formerly 90d93e2a02] [formerly ed59927d62 [formerly a84978566dda2f943dff31f61c30ee286d961fd1]]]
Former-commit-id: ed59927d62
Former-commit-id: 41fbf12b4d [formerly 877fbacffe]
Former-commit-id: 7938eea395
2013-05-09 08:05:49 -05:00
Richard Peter
a2cfd38f6a Issue #1814: Remove slow consumer disconnect. Add time to live to all topics
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: ae84ced7be [formerly 4f3e86574b] [formerly ae84ced7be [formerly 4f3e86574b] [formerly 697297803c [formerly c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4]]]
Former-commit-id: 697297803c
Former-commit-id: 139c234452 [formerly cfaeeaff5f]
Former-commit-id: dfba22e206
2013-05-08 17:28:01 -05:00