Commit graph

2127 commits

Author SHA1 Message Date
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
Nate Jensen
c183650ebd Issue #2001 fix message handling
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: 56309efafe [formerly 1ab118958f] [formerly 56309efafe [formerly 1ab118958f] [formerly 960bc6db69 [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]
Former-commit-id: 960bc6db69
Former-commit-id: a06bb176ba [formerly e575c19ab6]
Former-commit-id: 942855e9f8
2013-05-21 10:26:18 -05:00
Dustin Johnson
2cf8ffac1a Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: fef73ac960 [formerly 195cd5f210] [formerly fef73ac960 [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]
Former-commit-id: 8fcc958d84
Former-commit-id: bd65447c9f [formerly 5695c4f967]
Former-commit-id: 566273cf69
2013-05-21 08:19:34 -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
Ben Steffensmeier
4687ddcd62 Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: c11631c7da [formerly 1a31aa2211] [formerly c11631c7da [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]
Former-commit-id: 931e76ae59
Former-commit-id: 30eb486e45 [formerly 5147eb18d4]
Former-commit-id: 9bac8c566c
2013-05-20 18:00:32 -05:00
Richard Peter
a664883d97 Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: 8b2ecd5771 [formerly e0740990ce] [formerly 8b2ecd5771 [formerly e0740990ce] [formerly 59c38fdb78 [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]
Former-commit-id: 59c38fdb78
Former-commit-id: 72206676ee [formerly 8b7cf1beb8]
Former-commit-id: 1418dbf556
2013-05-20 17:49:22 -05:00
Roger Ferrel
84b75ff489 Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac

Former-commit-id: e3c06b643b [formerly 16c7de874a] [formerly e3c06b643b [formerly 16c7de874a] [formerly dfd586fca6 [formerly 57a43dfefb79d49895beace44930db630cd502be]]]
Former-commit-id: dfd586fca6
Former-commit-id: 4a5073902f [formerly c9e6e367fe]
Former-commit-id: 7bf7c508b0
2013-05-20 17:43:47 -05:00
Ben Steffensmeier
4f575058e0 Issue #1869 Remove DataURI column from sat plot types.
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb

Former-commit-id: aa3b8c80f4 [formerly 26e80bbd18] [formerly aa3b8c80f4 [formerly 26e80bbd18] [formerly 885b106652 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]]
Former-commit-id: 885b106652
Former-commit-id: a03dbd284b [formerly 13b2b4afef]
Former-commit-id: 8c9db38335
2013-05-20 17:27:15 -05:00
Dustin Johnson
a314bd8f4a Issue #2000 Subscription overlap configuration GUI
Amend:
  Peer review comments.

Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6

Former-commit-id: 554347f17c [formerly 5b62669f8e] [formerly 554347f17c [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 3a504d1e7b [formerly 7858a3b57f]
Former-commit-id: d12b26ac1d
2013-05-20 17:12:47 -05:00
Richard Peter
6a6b25ebda Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 8079561032 [formerly 30a61c3e17] [formerly 8079561032 [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]]
Former-commit-id: 3d861eca69
Former-commit-id: e03cf56895 [formerly 0ced8c87e4]
Former-commit-id: b032b405ed
2013-05-20 14:48:47 -05: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
Richard Peter
fb910196c0 Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: 648a1b25ae [formerly a33ddbd1a6] [formerly 648a1b25ae [formerly a33ddbd1a6] [formerly a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: aff520d61b [formerly c47eb36e43]
Former-commit-id: 969fa704e5
2013-05-17 10:33:18 -05:00
Max Schenkelberg
9921ea5cb1 Issue #1638 Fixed updates for resource datas that override update without checking update object
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f

Former-commit-id: 4d435d3dd5 [formerly c421240835] [formerly 4d435d3dd5 [formerly c421240835] [formerly d07de0870f [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]]
Former-commit-id: d07de0870f
Former-commit-id: 7ce0b7ef13 [formerly a94469df82]
Former-commit-id: 6adbb139ab
2013-05-16 18:04:26 -05:00
Nate Jensen
779a299440 Merge "Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource." into development
Former-commit-id: 9a3f855a1a [formerly 39543d7ee0] [formerly 9a3f855a1a [formerly 39543d7ee0] [formerly 6ef214f1b8 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]]
Former-commit-id: 6ef214f1b8
Former-commit-id: 7f58e8a568 [formerly ffa74c3bdb]
Former-commit-id: 3f2bb17ce4
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
ea3d3660f3 Issue #1869 Remove DataURI column from qc.
Former-commit-id: 89b4bd571a [formerly c0d8dad8ae] [formerly 89b4bd571a [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 777f12fbad [formerly 6353b7e04b]
Former-commit-id: 998330955a
2013-05-16 17:48:37 -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
7446376b42 Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds
- The new p2 director is not able to install zipped repositories; so, each repository
  is now unzipped before installation during the CAVE Assembly phase of the Windows
  32-bit build
- Adjusted the order of the p2 repositories are built so Windows will install them
  in the correct order during the CAVE Assembly phase of the Windows 32-bit build


Former-commit-id: dccc6e4a96 [formerly 7e849f0af3] [formerly dccc6e4a96 [formerly 7e849f0af3] [formerly 22d4494918 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]]
Former-commit-id: 22d4494918
Former-commit-id: 88cc3a6011 [formerly 560fb81038]
Former-commit-id: e95c2d36b4
2013-05-16 11:01:40 -05:00
Max Schenkelberg
012be9fc97 Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource.
Amend: Corrected ticket number

Change-Id: Ice336b6b4fb286dd4905f43b6f16259f23dea0c6

Former-commit-id: 62efca5041 [formerly 67e0d17aed] [formerly 62efca5041 [formerly 67e0d17aed] [formerly 8b4d47c690 [formerly dad0108065ac5f208f59ce6bc6493000278e2c21]]]
Former-commit-id: 8b4d47c690
Former-commit-id: a3ad1c7c45 [formerly 0038138fdc]
Former-commit-id: 91d38b1e87
2013-05-16 10:54:52 -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
7549733d5d Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 5b4c91d734 [formerly 03f93712a2] [formerly 5b4c91d734 [formerly 03f93712a2] [formerly 367784bd99 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]]
Former-commit-id: 367784bd99
Former-commit-id: 1355010c38 [formerly e4b47d1eb9]
Former-commit-id: 6408ef5425
2013-05-16 09:27:48 -05:00
Ben Steffensmeier
017e025cc6 Issue #1869 Switch acars back to original plot resource.
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85

Former-commit-id: 5a8118b5a8 [formerly 51015cd592] [formerly 5a8118b5a8 [formerly 51015cd592] [formerly 1a1592ea3d [formerly 567b7b5baeb7bbc6b37b5f03927c9f3f34255ebf]]]
Former-commit-id: 1a1592ea3d
Former-commit-id: 4fa2a21323 [formerly 4a8a5b16af]
Former-commit-id: 3b5a3a8a3b
2013-05-15 18:22:25 -05:00
Nate Jensen
99bd7bc4eb Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4

Former-commit-id: b7076f6947 [formerly 2abccdfe2b] [formerly b7076f6947 [formerly 2abccdfe2b] [formerly 662fac5b31 [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]]
Former-commit-id: 662fac5b31
Former-commit-id: 8b1298777c [formerly ae5df55dba]
Former-commit-id: 8cffed1451
2013-05-15 16:25:23 -05:00
Ben Steffensmeier
1824606f71 Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: 89fe0b301d [formerly 080b43444a] [formerly 89fe0b301d [formerly 080b43444a] [formerly bbe2667522 [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]]
Former-commit-id: bbe2667522
Former-commit-id: b3a2cd22c7 [formerly f813b40379]
Former-commit-id: 6333ed4841
2013-05-15 15:35:02 -05:00
Richard Peter
6117554b65 Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: 186f7169af [formerly 286ec23fab] [formerly 186f7169af [formerly 286ec23fab] [formerly bcbe24f489 [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]]]
Former-commit-id: bcbe24f489
Former-commit-id: 589fcada8b [formerly ce6452daac]
Former-commit-id: 89fc805bfe
2013-05-15 14:41:04 -05: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
David Gillingham
7f956add77 Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.

Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d

Former-commit-id: 0cbf36df79 [formerly 9c688f7070] [formerly 0cbf36df79 [formerly 9c688f7070] [formerly 84158e76c7 [formerly 13d5d8dd7c59fcf399d62e83c9eb7021bca4c2d1]]]
Former-commit-id: 84158e76c7
Former-commit-id: 9f79748cd2 [formerly ca10ac1598]
Former-commit-id: fab4021ce4
2013-05-15 13:56:53 -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
Ben Steffensmeier
7a8b41876e Issue #1869 Remove DataURI from goes/poes soundings.
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416

Former-commit-id: 22b20b5f8e [formerly b905ee013c] [formerly 22b20b5f8e [formerly b905ee013c] [formerly 1c3e60a5ff [formerly 836239896aace50e37896f6219015a75aea117b7]]]
Former-commit-id: 1c3e60a5ff
Former-commit-id: cb335861c2 [formerly 8ea143a147]
Former-commit-id: ff9ce2b7c4
2013-05-15 12:50:08 -05:00
Richard Peter
d847f413af Merge "Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen." into development
Former-commit-id: d81cee387b [formerly 0523d790f8] [formerly d81cee387b [formerly 0523d790f8] [formerly 82ccd32ee0 [formerly 3abbb84fdb4b2a9e52757d4b5f2e8cb9fb94899e]]]
Former-commit-id: 82ccd32ee0
Former-commit-id: e0c4287959 [formerly b40e0ca1c9]
Former-commit-id: 69ce5d7529
2013-05-15 12:44:48 -05:00
Nate Jensen
338bbc4216 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: 0c718e1cd1 [formerly 5280b54277] [formerly 0c718e1cd1 [formerly 5280b54277] [formerly 4e63b88031 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]]
Former-commit-id: 4e63b88031
Former-commit-id: 65fdf84101 [formerly 1e059ee8d9]
Former-commit-id: 4973acb807
2013-05-15 09:22:16 -05:00
Nate Jensen
8ca2d65342 Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development
Former-commit-id: 8c03ad79d6 [formerly a6f8174d0c] [formerly 8c03ad79d6 [formerly a6f8174d0c] [formerly 44cfe00b5e [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]]
Former-commit-id: 44cfe00b5e
Former-commit-id: eb75eaf6ce [formerly e7f638ce3b]
Former-commit-id: dc98eb524f
2013-05-14 16:36:47 -05:00
Nate Jensen
befeae603d Merge "Issue #1869 Get plots working without dataURI" into development
Former-commit-id: 521420916e [formerly 6c42b5af64] [formerly 521420916e [formerly 6c42b5af64] [formerly 661482f1dd [formerly 3d4bbfa57651c97bc94d88ea83583a366a09200b]]]
Former-commit-id: 661482f1dd
Former-commit-id: 9680f63df2 [formerly 301b294d66]
Former-commit-id: 851885b8c5
2013-05-14 16:23:00 -05:00
Nate Jensen
0080d492e2 Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]
Former-commit-id: 6f1684b85c
Former-commit-id: dac803ca07 [formerly 22c23492c4]
Former-commit-id: 925339b84c
2013-05-14 16:16:13 -05:00
Dustin Johnson
bf3655da4c Merge "Issue #2000 Subscription duplication/overlap detection" into development
Former-commit-id: c302fafbd2 [formerly 341ce0c8c2] [formerly c302fafbd2 [formerly 341ce0c8c2] [formerly a5a0e3e280 [formerly db10de3aca3d0ef373df68a3de9871483128b645]]]
Former-commit-id: a5a0e3e280
Former-commit-id: 66126d5411 [formerly 21e66394be]
Former-commit-id: f625b26373
2013-05-14 15:48:58 -05:00
Dustin Johnson
1503e4c8e5 Issue #2000 Subscription duplication/overlap detection
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5

Former-commit-id: 3447a3726b [formerly db2e3cd9bb] [formerly 3447a3726b [formerly db2e3cd9bb] [formerly fdf3ac7897 [formerly 95df3d38914f451471f10d6095ad2bc6badbab72]]]
Former-commit-id: fdf3ac7897
Former-commit-id: 5f2de42ebe [formerly 085058e788]
Former-commit-id: aa591995c6
2013-05-14 15:34:08 -05:00
Ben Steffensmeier
98bb0ea551 Issue #1869 Get plots working without dataURI
Former-commit-id: 2ce2fc8a17 [formerly 79139629a6] [formerly 2ce2fc8a17 [formerly 79139629a6] [formerly a84c975426 [formerly 855d95e8563c47e5601c80c9efe5006280bda76e]]]
Former-commit-id: a84c975426
Former-commit-id: 9ebbfb262d [formerly 2dfb65b594]
Former-commit-id: 8a1b518934
2013-05-14 14:42:47 -05:00
Roger Ferrel
4dbb2fda4a Issue #1966 Initial setup.
Change-Id: I9b63433524fe419099e5646d028391377784d193

Former-commit-id: fad208e0ee [formerly 0a02d5e018] [formerly fad208e0ee [formerly 0a02d5e018] [formerly 9f9f85f875 [formerly e36e62d3c146f10ef20a0d84abd26a96b9740827]]]
Former-commit-id: 9f9f85f875
Former-commit-id: fb15e2d0a6 [formerly ab75cd5107]
Former-commit-id: 532787c043
2013-05-14 13:49:53 -05:00
Richard Peter
5f097830db Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development
Former-commit-id: 7683bfd122 [formerly 57d6790d5e] [formerly 7683bfd122 [formerly 57d6790d5e] [formerly 6c406d6a8e [formerly 4503fe27c4760d681a3026fd0d9b4fd77f1b13cb]]]
Former-commit-id: 6c406d6a8e
Former-commit-id: b4e46593a8 [formerly 3309e0c3b7]
Former-commit-id: a734c8594a
2013-05-14 09:40:21 -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
Ben Steffensmeier
81f1cbfdbd Issue #1869 Modified D2D height Graphs to work without dataURI column.
Former-commit-id: 4d3f9ee7d0 [formerly f856d0e02b] [formerly 4d3f9ee7d0 [formerly f856d0e02b] [formerly 1d900e6b94 [formerly acb500b1581d4725eb31e73b362fd523752b11d9]]]
Former-commit-id: 1d900e6b94
Former-commit-id: edcd8df871 [formerly d0e1ff7ce3]
Former-commit-id: 386ba183bf
2013-05-13 18:33:24 -05: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
c7755a649b Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: 2c009eb618 [formerly a12830f762] [formerly 2c009eb618 [formerly a12830f762] [formerly c5040038d3 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]
Former-commit-id: c5040038d3
Former-commit-id: 6c09ab9bdf [formerly bcf4dcc810]
Former-commit-id: f7470fbd8f
2013-05-13 17:11:05 -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
Ben Steffensmeier
c917c7f592 Issue #1869 Modified D2D time series of point data to work without dataURI.
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32

Former-commit-id: 8e550124f4 [formerly 2b4dd1521b] [formerly 8e550124f4 [formerly 2b4dd1521b] [formerly baf051a27e [formerly 3f246d2d473050ae89a4db65bc01d7729dc0aa01]]]
Former-commit-id: baf051a27e
Former-commit-id: c862d04d57 [formerly 9aab9c6034]
Former-commit-id: e17c6f6857
2013-05-13 11:26:47 -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
Roger Ferrel
a0ff160f7c Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen.
Change-Id: If8045d03084b9085b573cc11c42b6a2f93ffacc8

Former-commit-id: 3b27e54b31 [formerly d1a3e3dc2f] [formerly 3b27e54b31 [formerly d1a3e3dc2f] [formerly 938cd275cc [formerly b794f0b882d88cec6f552bf10f7f58096dfd5a69]]]
Former-commit-id: 938cd275cc
Former-commit-id: 6523560a48 [formerly 2be6266c9b]
Former-commit-id: 3aa2986115
2013-05-09 08:56:44 -05:00
Nate Jensen
5070778f06 Merge "Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication." into development
Former-commit-id: 6dae59d1ac [formerly 19f0ca1fb0] [formerly 6dae59d1ac [formerly 19f0ca1fb0] [formerly d2a108ed8a [formerly 3ba0adb830cc0839d39a8cd938fbde3cf27e4651]]]
Former-commit-id: d2a108ed8a
Former-commit-id: fce991dac7 [formerly a5bedd2a27]
Former-commit-id: 825c46815a
2013-05-08 18:42:28 -05:00
Nate Jensen
b638a10153 Merge "Issue #1978 Perform variable substitution on subMenu IDs." into development
Former-commit-id: 11965c031f [formerly 9e0f3acbc0] [formerly 11965c031f [formerly 9e0f3acbc0] [formerly e753329f47 [formerly b1e425c0da9a241a60f2a0508c40d180fe5058fa]]]
Former-commit-id: e753329f47
Former-commit-id: 84caf44a0c [formerly 2299e22de2]
Former-commit-id: 747163abc1
2013-05-08 18:40:51 -05:00