Commit graph

2738 commits

Author SHA1 Message Date
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
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
Bryan Kowal
e0a1431c69 Issue #2006 - qpid is now compatible with the upgraded FOSS libraries.
Former-commit-id: 17101171b6 [formerly 1e726506e0] [formerly 17101171b6 [formerly 1e726506e0] [formerly 39b12ee0fb [formerly 4d804cd0de708904368f0a26ed8421379278bddd]]]
Former-commit-id: 39b12ee0fb
Former-commit-id: 3812567894 [formerly 37461e68dd]
Former-commit-id: d792059e3c
2013-05-16 11:00:47 -05:00
Nate Jensen
6a1c713e6f Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266

Former-commit-id: 9f8654e4ff [formerly 1ecdd989df] [formerly 9f8654e4ff [formerly 1ecdd989df] [formerly ce2579a289 [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]]
Former-commit-id: ce2579a289
Former-commit-id: 53f994c0a8 [formerly 04c7c4a4da]
Former-commit-id: b9bfcead05
2013-05-16 10:25:38 -05: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
Richard Peter
ff16d49977 Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
Former-commit-id: 9a8bc5871f [formerly fc5b621973] [formerly 9a8bc5871f [formerly fc5b621973] [formerly a073bf2702 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]]]
Former-commit-id: a073bf2702
Former-commit-id: 671aaba9d9 [formerly 57698cc95b]
Former-commit-id: da0fc8057c
2013-05-15 18:14:00 -05:00
Dustin Johnson
0f69c0b64d Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
Former-commit-id: 28a4f02216 [formerly 8eeb2f4f9c] [formerly 28a4f02216 [formerly 8eeb2f4f9c] [formerly d62e51ad7e [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]]]
Former-commit-id: d62e51ad7e
Former-commit-id: 6fa299ecd8 [formerly 00e9f3305d]
Former-commit-id: ab15adabe2
2013-05-15 17:06:42 -05:00
Dustin Johnson
a7a948bf3a Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c

Former-commit-id: 695c64a9f4 [formerly 8a9e1f643a] [formerly 695c64a9f4 [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]]
Former-commit-id: ef1e80b61f
Former-commit-id: 31fbf71aa2 [formerly b8d6f54206]
Former-commit-id: 6db9b3f8d9
2013-05-15 16:54:40 -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
Richard Peter
06a146f5d3 Merge "Issue #1989 removing unused jars" into development
Former-commit-id: 3e1fe851e4 [formerly 303267be4d] [formerly 3e1fe851e4 [formerly 303267be4d] [formerly ad43b7bab5 [formerly 544b8830ec6c95ff88726b1095662fac5438cfcb]]]
Former-commit-id: ad43b7bab5
Former-commit-id: a504d84327 [formerly fb1197ecb7]
Former-commit-id: 44b7de35fc
2013-05-15 16:17:57 -05:00
Bryan Kowal
a6ba3a9ba2 Issue #2002 - ensure that there are not any .gitignore files in webapps or the esb deployment
Former-commit-id: 07408178a8 [formerly 5811585229] [formerly 07408178a8 [formerly 5811585229] [formerly 41f4075e6f [formerly 3bbc0996f4e5e6ab9d11a7481aff39d6a9ee0044]]]
Former-commit-id: 41f4075e6f
Former-commit-id: edaa5339d7 [formerly aabc22cc2e]
Former-commit-id: e39c66a454
2013-05-15 15:37:16 -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
Nate Jensen
546249897b Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301

Former-commit-id: c75bfeb9a5 [formerly 9c2b6bad3e] [formerly c75bfeb9a5 [formerly 9c2b6bad3e] [formerly f4b8c0dc60 [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]]
Former-commit-id: f4b8c0dc60
Former-commit-id: 6caa681ed3 [formerly 0234e6788b]
Former-commit-id: 2b72b5c530
2013-05-15 14:44:30 -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
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
Bryan Kowal
9e9498b002 Issue #2002 - do not include .gitignore files in the rpm
Former-commit-id: 4132370301 [formerly 60ae5df378] [formerly 4132370301 [formerly 60ae5df378] [formerly 107055781d [formerly 33160e9835e8e153d60b76619b75e22bd3f75fc8]]]
Former-commit-id: 107055781d
Former-commit-id: 43db530ddb [formerly 7df8e11ed3]
Former-commit-id: a2a6d0bdad
2013-05-15 13:31:24 -05:00
Nate Jensen
1329d58062 Merge "Issue #1927 - add quartz as a RadarServer build dependency" into development
Former-commit-id: 6952b172cf [formerly 591eb2d6e2] [formerly 6952b172cf [formerly 591eb2d6e2] [formerly b621d417e5 [formerly 5db35fcaef26b2817bfcd4a051f4c1f05d8fdcdd]]]
Former-commit-id: b621d417e5
Former-commit-id: 93568fff0b [formerly b9275b3c2b]
Former-commit-id: 0a49169575
2013-05-15 13:02:58 -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
Richard Peter
04be1d3807 Merge "Issue #1869 Revert changes to bufrmos types used by ncep." into development
Former-commit-id: b687ddef04 [formerly f1d65e7028] [formerly b687ddef04 [formerly f1d65e7028] [formerly 48b67522d5 [formerly ce880367eb70abdd85664841e3775142f6e28c50]]]
Former-commit-id: 48b67522d5
Former-commit-id: 11b33a5b14 [formerly aa3ef28527]
Former-commit-id: 3e60ceec03
2013-05-15 12:44:28 -05:00
Bryan Kowal
2deeffdb51 Issue #1927 - add quartz as a RadarServer build dependency
Change-Id: I1bc64bc347ebd54e249dbd8e4b2cadfa65c28b56

Former-commit-id: 01413b17dd [formerly 047a3de7bd] [formerly 01413b17dd [formerly 047a3de7bd] [formerly 99a5290083 [formerly f3dc0db70d9c3c680b56c07f18c84e2fbc2daaa2]]]
Former-commit-id: 99a5290083
Former-commit-id: f57a730309 [formerly 63fa948ba8]
Former-commit-id: 7692701168
2013-05-15 12:38:02 -05:00
Ben Steffensmeier
1846170387 Issue #1869 Revert changes to bufrmos types used by ncep.
Former-commit-id: 507ce28888 [formerly 62b85f3afe] [formerly 507ce28888 [formerly 62b85f3afe] [formerly dd320f2a56 [formerly 71808a9d82233a395c5e5a394b0708b07405f553]]]
Former-commit-id: dd320f2a56
Former-commit-id: 884922687e [formerly 27b0b4a289]
Former-commit-id: 7ce819184a
2013-05-15 11:45:51 -05:00
Dustin Johnson
dbde58d5eb Merge "Issue #2000 Fix reinitializing of bandwidth manager" into development
Former-commit-id: a00364b294 [formerly 8a70a773d5] [formerly a00364b294 [formerly 8a70a773d5] [formerly c88be3579c [formerly f300554c735266999f57e0331eda63420e5a6ef3]]]
Former-commit-id: c88be3579c
Former-commit-id: bd7c38a160 [formerly 8c26413d23]
Former-commit-id: 8276c2a9c9
2013-05-15 10:50:53 -05:00
Dustin Johnson
7240a99ce7 Issue #2000 Fix reinitializing of bandwidth manager
Change-Id: I8af056eea7d40a13e9189afa81414f7088690267

Former-commit-id: b700ef7a95 [formerly e38e8d7dc5] [formerly b700ef7a95 [formerly e38e8d7dc5] [formerly e374011c49 [formerly 1073806e6f0a84da0538160d83ee3c12b92d84d5]]]
Former-commit-id: e374011c49
Former-commit-id: b6a3c3ae80 [formerly 98d99250b2]
Former-commit-id: c2c849fe7e
2013-05-15 10:24:33 -05:00
Richard Peter
a9a4b2cfcc Merge "Issue #1869 Remove DataURI column from bufrmos. Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e" into development
Former-commit-id: 1a7fbec35e [formerly f1920eb8d9] [formerly 1a7fbec35e [formerly f1920eb8d9] [formerly 47124d2411 [formerly 5c73f61cf2401ccc901771f92147bfb4bc6d9c25]]]
Former-commit-id: 47124d2411
Former-commit-id: 1a5bb1a9d5 [formerly f4974ebd19]
Former-commit-id: 6cc24d855f
2013-05-15 10:00:19 -05:00
Ben Steffensmeier
2ffe811d07 Issue #1869 Remove DataURI column from bufrmos.
Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e

Former-commit-id: cad31c0ce6 [formerly 026a824e60] [formerly cad31c0ce6 [formerly 026a824e60] [formerly fabbc29fe8 [formerly 5b740e5d614d9cac2476335a0754ccd0e1185c84]]]
Former-commit-id: fabbc29fe8
Former-commit-id: 6acaa99256 [formerly 3f540d16f0]
Former-commit-id: 5dc7de691b
2013-05-15 09:40:05 -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
122aea2c8e Issue #1989 jetty fixes
Change-Id: I01c00ee8f754132b9c57d84f971d744c16dda07d

Former-commit-id: ce19737a49 [formerly d894aca768] [formerly ce19737a49 [formerly d894aca768] [formerly 958ed1f6a2 [formerly fecb2dc4da19aba5a188834780e33c791d312e1b]]]
Former-commit-id: 958ed1f6a2
Former-commit-id: a121523049 [formerly 1b62b066c9]
Former-commit-id: 58eeca454a
2013-05-14 18:27:00 -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
Richard Peter
848cd582e9 Merge "Issue #1869 Remove DataURI column from GFE. Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488" into development
Former-commit-id: 9bf35d621a [formerly 2f4b1d54a1] [formerly 9bf35d621a [formerly 2f4b1d54a1] [formerly b76d402c98 [formerly f7d2c39ca0c70b627b2e72f5982fba11a6a683bd]]]
Former-commit-id: b76d402c98
Former-commit-id: 824407f930 [formerly 17407e863a]
Former-commit-id: b7fc98ce28
2013-05-14 09:37:18 -05: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
Ben Steffensmeier
ba5555930e Issue #1869 Remove DataURI column from GFE.
Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488

Former-commit-id: 35da7528bf [formerly 2536042f6d] [formerly 35da7528bf [formerly 2536042f6d] [formerly 8661bde0cc [formerly 4c35aa22bdd5058992984eca824083e927d8deda]]]
Former-commit-id: 8661bde0cc
Former-commit-id: c6d8809f87 [formerly 039a92d9b9]
Former-commit-id: d78e7bcd78
2013-05-13 17:35:00 -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
Dustin Johnson
c284d00e3d Merge "Issue #1948 Modified registry permgen memory size to accomodate additional Spring container" into development
Former-commit-id: 23fa59f25b [formerly 0b2bdf1848] [formerly 23fa59f25b [formerly 0b2bdf1848] [formerly ab755981a9 [formerly 46b88ec783b7721448940f158e5eb2ad168a3a97]]]
Former-commit-id: ab755981a9
Former-commit-id: 82a35120b8 [formerly 0796694014]
Former-commit-id: a6532af8c9
2013-05-13 15:26:19 -05:00
Benjamin Phillippe
38caf6c225 Issue #1948 Modified registry permgen memory size to accomodate additional Spring container
Change-Id: I0492d5440f6753896fa6b278f0cf642a2ef13d65

Former-commit-id: 037b40e59a [formerly 5a113f1c43] [formerly 037b40e59a [formerly 5a113f1c43] [formerly 4165759e58 [formerly 4e375316f389f1db4b21708893c0087587c3f3e9]]]
Former-commit-id: 4165759e58
Former-commit-id: 9768a187f9 [formerly 2768c62541]
Former-commit-id: b8a47cc9be
2013-05-13 15:20:28 -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
Richard Peter
aa83bde84c Merge "Issue #1869 Modified D2D time series of point data to work without dataURI. Change-Id: I80f39877903e50338add58700f6ffeb39e848a32" into development
Former-commit-id: f8881f6e02 [formerly 18c5ad2727] [formerly f8881f6e02 [formerly 18c5ad2727] [formerly 045a8c0b5d [formerly ac7b7bdf702eb75bb41631febe433354acf78589]]]
Former-commit-id: 045a8c0b5d
Former-commit-id: e6c820c2c5 [formerly c598cd3be0]
Former-commit-id: 570a330497
2013-05-13 11:42:23 -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
Dustin Johnson
dc30897353 Merge "Issue #1967 undo mistake" into development
Former-commit-id: 403ae0d458 [formerly e82d454167] [formerly 403ae0d458 [formerly e82d454167] [formerly 519d46724a [formerly f0529c591755d871796a6d5acae43c443c8c301c]]]
Former-commit-id: 519d46724a
Former-commit-id: 6ffe9cd833 [formerly b3be6bb88b]
Former-commit-id: da159a9c31
2013-05-10 09:25:58 -05:00