Commit graph

7240 commits

Author SHA1 Message Date
David Lovely
396eb2cda5 Omaha #2991 Initial add of qpid 0.28. Fixed an issue with the x86_64 directory not being created.
Change-Id: Iacd5c7d8b41ab3100b7ea9c409ec18691ffe7fdc

Former-commit-id: 3d1fa8e1b8 [formerly 2f9c1e8303] [formerly 3d1fa8e1b8 [formerly 2f9c1e8303] [formerly 081ea4a12a [formerly b50c56c84968f4765245ec12fa33c3037b0380ff]]]
Former-commit-id: 081ea4a12a
Former-commit-id: 28639c96c0 [formerly 2f02a475a8]
Former-commit-id: ab038bc4c7
2014-10-23 15:55:26 -05:00
Benjamin Phillippe
7b8b7c12dd Omaha #3454 Fixing text purge
Former-commit-id: 9bc5473d29 [formerly 2f7c98d960] [formerly 9bc5473d29 [formerly 2f7c98d960] [formerly 5606597b56 [formerly 43299673f2172188bc44866c6ccd5552fda348cb]]]
Former-commit-id: 5606597b56
Former-commit-id: 7a9277d53d [formerly e2759d38e4]
Former-commit-id: 3fe4feaea6
2014-10-23 12:54:26 -05:00
Greg Armendariz
1f2f2c302f Merge "Omaha #3299 attempt to fix cave p2-install order" into omaha_14.4.1
Former-commit-id: d4c7882e4f [formerly 8d25cfcc94] [formerly d4c7882e4f [formerly 8d25cfcc94] [formerly abfcd2505f [formerly 2604e7f68719bf1e5b4ba1d2e212f26341926938]]]
Former-commit-id: abfcd2505f
Former-commit-id: 0ebf2f4b29 [formerly 8c46b21075]
Former-commit-id: af235215d9
2014-10-23 11:45:00 -05:00
Nate Jensen
873f38db4d Omaha #3299 attempt to fix cave p2-install order
Change-Id: Ic02c4a1c28d6be67cff709e0ea50fed3e36ca6b3

Former-commit-id: 7f0bc3f860 [formerly 972245b270] [formerly 7f0bc3f860 [formerly 972245b270] [formerly ca94deb789 [formerly d8ef7657cada2a7ec2bf1c3b2c70011a3d160913]]]
Former-commit-id: ca94deb789
Former-commit-id: 6877642c65 [formerly d17c972d04]
Former-commit-id: 19d56eca8e
2014-10-23 11:35:44 -05:00
Nate Jensen
d56f2baea8 Merge "Omaha #3668 Switch grid requests to job pool." into omaha_14.4.1
Former-commit-id: 7bff603b2c [formerly b9ffe1b4ce] [formerly 7bff603b2c [formerly b9ffe1b4ce] [formerly d50a3bab27 [formerly 6360d4efca94ed47661c239a7a84088661027d64]]]
Former-commit-id: d50a3bab27
Former-commit-id: d693703c63 [formerly 04ba3e6583]
Former-commit-id: 9435df398f
2014-10-23 11:15:58 -05:00
Ben Steffensmeier
9f8fedddc3 Omaha #3668 Switch grid requests to job pool.
Former-commit-id: a61eaa6695 [formerly f940b4d3d4] [formerly a61eaa6695 [formerly f940b4d3d4] [formerly d5d432e7bd [formerly 6552b496329f6ef9404a4872048a61e020ab9565]]]
Former-commit-id: d5d432e7bd
Former-commit-id: 8eb62f63c7 [formerly ee38a062d0]
Former-commit-id: b044d1cf80
2014-10-23 10:30:27 -05:00
Ron Anderson
83ff68647a Omaha #3685 Fix spell checker to use mixed case.
Fix bug in importShapefile

Change-Id: I818bef97b2306cb47e07d4885e77906d1fd5c793

Former-commit-id: ea43af0c3a [formerly 6ab8c36e83] [formerly ea43af0c3a [formerly 6ab8c36e83] [formerly 5c1570eafd [formerly 25ded2580ec97f4a966297f0af6dbb5d0e66956a]]]
Former-commit-id: 5c1570eafd
Former-commit-id: 2cee0f2bb9 [formerly c8042a4ee2]
Former-commit-id: 31553de133
2014-10-23 09:02:16 -05:00
Nate Jensen
994c8ae829 Omaha #3713 fix build
Change-Id: I84adced908a1f09e802cb5c05fa86ce65f0c3af6

Former-commit-id: 028b8b4609 [formerly 129e6031e6] [formerly 028b8b4609 [formerly 129e6031e6] [formerly 318badc290 [formerly ec59ed4c41cb867e80340ef9ff44b5e575f0da55]]]
Former-commit-id: 318badc290
Former-commit-id: 664e764874 [formerly 8b93f74b65]
Former-commit-id: 150fc23bfe
2014-10-22 17:00:27 -05:00
Nate Jensen
b1a258d7f9 Merge "Omaha #3713 The aviation advisory menu items should be contributed by the com.raytheon.uf.viz.aviation.advisory plugin" into omaha_14.4.1
Former-commit-id: fb1a02c800 [formerly 7cd4d5aa0d] [formerly fb1a02c800 [formerly 7cd4d5aa0d] [formerly b8ed807e4e [formerly 6a7420db347a08d5200f0549e80d684c1e3ad83f]]]
Former-commit-id: b8ed807e4e
Former-commit-id: 37660eee4a [formerly 3e0c5af32b]
Former-commit-id: 608160de55
2014-10-22 15:21:48 -05:00
Ron Anderson
94c875ced4 Omaha #3685 Add support for sending specific products in mixed case
Change-Id: I3c7e8bfe285ce7344ddfccf28173a68f3396b126

Former-commit-id: 64162dd9c0 [formerly e729cd8814] [formerly 64162dd9c0 [formerly e729cd8814] [formerly 5d07d13aa0 [formerly 18d4fc13ebbd77b3a476bc70252fae1322d631c6]]]
Former-commit-id: 5d07d13aa0
Former-commit-id: ba737603f1 [formerly 5e711922d7]
Former-commit-id: 3f248e341a
2014-10-22 14:29:30 -05:00
Brian.Dyke
ddb3a6fc97 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 564db5cd87 [formerly 9199e8b072] [formerly 564db5cd87 [formerly 9199e8b072] [formerly 268f76df74 [formerly 97623c832e9ba336959d6f4f11045ec9738657eb]]]
Former-commit-id: 268f76df74
Former-commit-id: ef08117a63 [formerly b1608227ef]
Former-commit-id: e7fef28b20
2014-10-22 14:51:41 -04:00
Shawn.Hooper
ed790d1a7a ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868

Former-commit-id: 114ff128ed [formerly 0e372cd13e] [formerly 114ff128ed [formerly 0e372cd13e] [formerly 3b4b9d262a [formerly e29cf5a57591e5a25b6e73b267c0abb46e9f95c2]]]
Former-commit-id: 3b4b9d262a
Former-commit-id: b1426303fa [formerly d62f27cae6]
Former-commit-id: cc74b6bb2c
2014-10-22 14:47:42 -04:00
Steve Harris
116b83101e Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml

Former-commit-id: e9c9a17f96 [formerly dc557b2d0c] [formerly e9c9a17f96 [formerly dc557b2d0c] [formerly bfade7674d [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]]
Former-commit-id: bfade7674d
Former-commit-id: 879b0608ed [formerly 9e7ce04543]
Former-commit-id: 040e641ec9
2014-10-22 11:45:39 -05:00
Richard Peter
04023ecfe3 Merge "Omaha #3744 Adjust cave g1 region size." into omaha_14.4.1
Former-commit-id: 5c10fe0251 [formerly d679022b3f] [formerly 5c10fe0251 [formerly d679022b3f] [formerly 4dc4428f62 [formerly 53bcf86ca4db5ad10fdd2adc3f22a18567a66507]]]
Former-commit-id: 4dc4428f62
Former-commit-id: fba5ab2d39 [formerly 6c35f40508]
Former-commit-id: 73d4cc14ef
2014-10-22 11:18:12 -05:00
Ben Steffensmeier
f7bff32ffe Omaha #3744 Adjust cave g1 region size.
Former-commit-id: 1a1fafb08a [formerly 2c9d16911a] [formerly 1a1fafb08a [formerly 2c9d16911a] [formerly 19ccfa6633 [formerly a60888ed9e08f3bb56f39ef287bb6d02a49d3241]]]
Former-commit-id: 19ccfa6633
Former-commit-id: 3117cdd13c [formerly d5c85324d8]
Former-commit-id: 46e3e3b7d9
2014-10-22 10:30:33 -05:00
Brian.Dyke
9b06c9038c Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 975f877994 [formerly 9bcc6bb52e] [formerly 975f877994 [formerly 9bcc6bb52e] [formerly abb4203634 [formerly c8cd8594507148284ac3ec2283fcc9e152c532a6]]]
Former-commit-id: abb4203634
Former-commit-id: a16d6c944f [formerly 40717fa44c]
Former-commit-id: 06f41040c2
2014-10-22 10:39:36 -04:00
Mark Peters
f928a2760c Omaha #3713 The aviation advisory menu items should be contributed by the com.raytheon.uf.viz.aviation.advisory plugin
Change-Id: I7c32e066175dab712e69398b58b5e56f4dbde3f4

Former-commit-id: 220491ed18 [formerly 402591056c] [formerly 220491ed18 [formerly 402591056c] [formerly ef80e7632f [formerly 19d480da4e9b4ec9eab86b0438757eb451867409]]]
Former-commit-id: ef80e7632f
Former-commit-id: 54d23f5716 [formerly 3956b4ecf8]
Former-commit-id: 81da40a29e
2014-10-21 17:03:53 -05:00
David Lovely
05b6e83a4c Omaha #3721 Changed Grid Data reference to a Soft Reference and reduced memory usage from X*Y to X*3.
Change-Id: I627ded464d411e7f975df088261a975657d41d9a

Former-commit-id: 8a5c1607c9 [formerly 636e823956] [formerly 8a5c1607c9 [formerly 636e823956] [formerly 531b62d114 [formerly 9a6313162a5477863d30ab0a888608ee419067a9]]]
Former-commit-id: 531b62d114
Former-commit-id: d6ba9bdbb7 [formerly 44120d9fba]
Former-commit-id: 2b2a5fcd43
2014-10-21 16:06:18 -05:00
Richard Peter
3a80d5c801 Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
Former-commit-id: d2f0ab621f [formerly 05784292b7] [formerly d2f0ab621f [formerly 05784292b7] [formerly 2c21e72bf3 [formerly 6b2879d8180a6b6f60a340977e3254ee5eb95213]]]
Former-commit-id: 2c21e72bf3
Former-commit-id: 168854e078 [formerly 7b9653cdad]
Former-commit-id: b77d5b33aa
2014-10-21 10:51:56 -05:00
Shawn.Hooper
2b594e3be8 Merge "ASM #13467 - Update GenericHazards.py for Shannon" into asm_14.3.1
Former-commit-id: d998d23eb4 [formerly 4e0cb152d2] [formerly d998d23eb4 [formerly 4e0cb152d2] [formerly 92204e05a1 [formerly 4bbcf01f8a3abf038f3183c5872bc8f9f12624a1]]]
Former-commit-id: 92204e05a1
Former-commit-id: 86d953da5c [formerly f1841b5042]
Former-commit-id: a531fdfa56
2014-10-21 10:35:01 -05:00
Shawn.Hooper
490cb64a41 ASM #16805 - Fix rpms/legal/ directory
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3

Former-commit-id: 26054621ca [formerly d0fba5965b] [formerly 26054621ca [formerly d0fba5965b] [formerly a96693cb70 [formerly 94872b496bec6c427030ea353856466809d2e6c1]]]
Former-commit-id: a96693cb70
Former-commit-id: 78cd702d20 [formerly f98e05c9de]
Former-commit-id: b99895779f
2014-10-21 11:17:45 -04:00
Shawn.Hooper
67d5d621ed ASM #13467 - Update GenericHazards.py for Shannon
Change-Id: Ic1131929aa14f97cff0e1cf92e30c338470f368e

Former-commit-id: 700bc0691c [formerly 4d81023184] [formerly 700bc0691c [formerly 4d81023184] [formerly ddeec493c3 [formerly f4e8f7493bbfb025e8040f7663dc582414a87413]]]
Former-commit-id: ddeec493c3
Former-commit-id: 115a9c1fd9 [formerly f1feaee0ea]
Former-commit-id: 2d96f0e149
2014-10-21 11:11:34 -04:00
Nate Jensen
c81c996c4b Merge "Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers." into omaha_14.4.1
Former-commit-id: 1798a75f18 [formerly 24aca9cd99] [formerly 1798a75f18 [formerly 24aca9cd99] [formerly 73c03a3379 [formerly 450faac664f274c1c2ce1bbc0100ecaa984309f7]]]
Former-commit-id: 73c03a3379
Former-commit-id: 1854ad5653 [formerly 1e3b551f4b]
Former-commit-id: cf8e567c18
2014-10-21 08:55:37 -05:00
Nathan Bowler
2565e3f305 Omaha #3598 Update grid scripts to use DAF. Accept level information in request identifiers.
Change-Id: I18011b95dc7dc2a0d92d41ce6e7864d3aaa1afbf

Former-commit-id: 679c836fdc [formerly d9f75f5adc] [formerly 679c836fdc [formerly d9f75f5adc] [formerly 1ff018ccdf [formerly 8b001934bef0d672bce4739accf994eba497b32c]]]
Former-commit-id: 1ff018ccdf
Former-commit-id: 674b6c2dcc [formerly 23950384ee]
Former-commit-id: 5268e32927
2014-10-21 07:16:18 -04:00
Nate Jensen
f6bd3b959c Merge "Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block." into omaha_14.4.1
Former-commit-id: 332fb931c6 [formerly 26c8400ac1] [formerly 332fb931c6 [formerly 26c8400ac1] [formerly 579f38dc62 [formerly abd0db67d4525476a55be5c07ca8c50228c54258]]]
Former-commit-id: 579f38dc62
Former-commit-id: 2bfb26f4e6 [formerly 561e40d3d3]
Former-commit-id: 74a3fa0607
2014-10-20 15:32:17 -05:00
David Lovely
8487137803 Omaha #3418 Fixed NPE for cell trends. Fixed possible NPE in PointsDataManager catch block.
Change-Id: Ice45220f2798e4004d41fa8fe78ccad8b5737f0d

Former-commit-id: f83eb3e69b [formerly d7cd4cc845] [formerly f83eb3e69b [formerly d7cd4cc845] [formerly 2e7cade8d6 [formerly 68d3cede303b82dd3fde23255d830289f967a889]]]
Former-commit-id: 2e7cade8d6
Former-commit-id: 1eac8ddbe8 [formerly 9e1b263569]
Former-commit-id: a9b97bbd58
2014-10-20 14:42:39 -05:00
Slav Korolev
8a6f3b4749 Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors.
Former-commit-id: 1f4ed7fd1b [formerly 9c369a9c5c] [formerly 1f4ed7fd1b [formerly 9c369a9c5c] [formerly 8971f40dc2 [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]]]
Former-commit-id: 8971f40dc2
Former-commit-id: 19db4c34bb [formerly e517a73d81]
Former-commit-id: de09cba07a
2014-10-20 15:06:05 -04:00
Matthew Howard
f2364ce437 Merge "ASM #16858 - Check in SerpISC tool." into asm_14.3.1
Former-commit-id: cf3afaf2bb [formerly 8827f5e49c] [formerly cf3afaf2bb [formerly 8827f5e49c] [formerly 587cf1b66e [formerly 4a965632119a9349cf320125b97db52498a760c8]]]
Former-commit-id: 587cf1b66e
Former-commit-id: 31e1eaf1cf [formerly 612cf99edb]
Former-commit-id: 30c0cf769c
2014-10-20 13:56:06 -05:00
Rici.Yu
aca44fc590 ASM #16858 - Check in SerpISC tool.
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6

Former-commit-id: 51adc6a204 [formerly 9c2555466c] [formerly 51adc6a204 [formerly 9c2555466c] [formerly 6958f11ea7 [formerly 1e8961e4f4a8168b667ce4b689efd88157dfb61c]]]
Former-commit-id: 6958f11ea7
Former-commit-id: f069fa1fea [formerly 5c22571568]
Former-commit-id: c502ac8d82
2014-10-20 14:39:46 -04:00
Shawn.Hooper
82afe46187 ASM #16805 - Update master rights and license files for 14.3.1.
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82

Former-commit-id: 217f39ee04 [formerly e24cb3c37e] [formerly 217f39ee04 [formerly e24cb3c37e] [formerly 65065f2380 [formerly f72ec046e98bdb6734dbce10ef472dd5294c59ba]]]
Former-commit-id: 65065f2380
Former-commit-id: c491bf611e [formerly e50becc648]
Former-commit-id: 17f88aad75
2014-10-20 14:36:31 -04:00
Benjamin Phillippe
008b23be1e Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: e6deeb6fb5 [formerly 7845e8e40f] [formerly e6deeb6fb5 [formerly 7845e8e40f] [formerly fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]
Former-commit-id: fdd16051e8
Former-commit-id: a8ef477042 [formerly 5eec33b078]
Former-commit-id: 3808c125b9
2014-10-20 12:42:19 -05:00
Slav Korolev
be8e3fb6b2 Issue #2757 - Fixed a problem with duplicate zones.
Former-commit-id: bde08f6c38 [formerly 0d4ed62be4] [formerly bde08f6c38 [formerly 0d4ed62be4] [formerly 079b74d69c [formerly 8929c542c33090555dd9db16113453e1000c6e5b]]]
Former-commit-id: 079b74d69c
Former-commit-id: 7df98880af [formerly 7555a3be9d]
Former-commit-id: a3f162adfe
2014-10-20 13:08:44 -04:00
Nate Jensen
660dd0d428 Merge "Omaha #3598 Add original, unaltered grid scripts." into omaha_14.4.1
Former-commit-id: 6cb997b25d [formerly 887b47cda1] [formerly 6cb997b25d [formerly 887b47cda1] [formerly 9079801e98 [formerly 89d6e37d13413a7c8c8045c0c8d369e1cb61a2f4]]]
Former-commit-id: 9079801e98
Former-commit-id: 7c81792600 [formerly 0ea89ff7bb]
Former-commit-id: 836d7543f7
2014-10-20 11:50:40 -05:00
Nate Jensen
3709881113 Merge "Omaha #3720 Remove dataURI from redbook plugin" into omaha_14.4.1
Former-commit-id: dd9f6fb257 [formerly 1245df2e0c] [formerly dd9f6fb257 [formerly 1245df2e0c] [formerly 401390dd9b [formerly 1435184cbc94eb9ee2ac97a5616566c421092805]]]
Former-commit-id: 401390dd9b
Former-commit-id: 168396211b [formerly 54602afa68]
Former-commit-id: 6477939d2d
2014-10-20 11:45:50 -05:00
Nathan Bowler
1b77a7ed9c Omaha #3598 Add original, unaltered grid scripts.
Change-Id: Ifed34ae4edb58e72cb0481ad90d3a7133a15554c

Former-commit-id: c8fd3c154a [formerly 1ae94e957b] [formerly c8fd3c154a [formerly 1ae94e957b] [formerly ee73c1e8cc [formerly fce70e6b0fcd5a2e905e49b95a4af60f52f9464d]]]
Former-commit-id: ee73c1e8cc
Former-commit-id: 7d0ac44a7e [formerly 936b1e7ea7]
Former-commit-id: 6858d732e2
2014-10-20 11:18:35 -04:00
Nate Jensen
08066b2561 Merge "Omaha #3681 Allow satellite to be asynchronously interrogated." into omaha_14.4.1
Former-commit-id: 4f93cf17ee [formerly 1b628bdfa1] [formerly 4f93cf17ee [formerly 1b628bdfa1] [formerly 4946826d61 [formerly af0c30de9d7847feabc183f9bf84d07cab792320]]]
Former-commit-id: 4946826d61
Former-commit-id: cca91a9714 [formerly bbebc4487a]
Former-commit-id: 692155e51f
2014-10-20 09:34:57 -05:00
Dave Hladky
c5924c5c82 Issue #3736 Allow shared subscriptions to have adhocs
Change-Id: I2379ac2cd1f02b36587531b448b8c3e6434664f9

Former-commit-id: 8a4711aa8d [formerly 19840e43f3] [formerly 8a4711aa8d [formerly 19840e43f3] [formerly 5cde2fa48c [formerly a5a2b995e5dd4a7af165f62496d8052ed43d23b4]]]
Former-commit-id: 5cde2fa48c
Former-commit-id: 029a0dd15a [formerly 87ae74320e]
Former-commit-id: b860f286d3
2014-10-20 08:58:08 -05:00
Nate Jensen
d0eeb1113f Merge "Issue #3707 Reworked gridded subscription triggereing for retrievals. Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176" into omaha_14.3.1
Former-commit-id: 68e1e93532 [formerly dcce72b823] [formerly 68e1e93532 [formerly dcce72b823] [formerly cfb24faf68 [formerly 57848f31cc73d81d16595e4e5b01949bcff12a24]]]
Former-commit-id: cfb24faf68
Former-commit-id: 8ab9c456da [formerly 6593a843e4]
Former-commit-id: c73551e8ac
2014-10-20 08:37:41 -05:00
Dave Hladky
16b8183169 Issue #3707 Reworked gridded subscription triggereing for retrievals.
Change-Id: I4abded9b531c7b7e9b9058760b97b8f5e778d176

Former-commit-id: 468276afdd [formerly a3268ae60d] [formerly 468276afdd [formerly a3268ae60d] [formerly c7df290186 [formerly eb64bd232cd25a71dbac655f4d59f9ec10b841b4]]]
Former-commit-id: c7df290186
Former-commit-id: 55c5454bd5 [formerly 54e397a561]
Former-commit-id: 04aa204dc1
2014-10-17 16:01:47 -05:00
Ron Anderson
5f246475bc Merge "Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files." into omaha_14.4.1
Former-commit-id: eae4393aa5 [formerly 82a0b4bb9b] [formerly eae4393aa5 [formerly 82a0b4bb9b] [formerly 1a01842639 [formerly 7a5b27db4a3be6dde7ff701b341124d9ed1a9ecd]]]
Former-commit-id: 1a01842639
Former-commit-id: 37973d264e [formerly e113d88477]
Former-commit-id: ae5402fe97
2014-10-16 18:44:38 -05:00
Ron Anderson
77183528ae Omaha #3685 Checkin original A1 files sorted by key to aid in comparison with new files.
Former-commit-id: 734ca75957 [formerly 2fbf61748d] [formerly 734ca75957 [formerly 2fbf61748d] [formerly 2781c4369b [formerly 09e39d4f85c8e853475b9f6059a748291e4d1bd7]]]
Former-commit-id: 2781c4369b
Former-commit-id: 2ff4c96038 [formerly aa0749903b]
Former-commit-id: cb5846b2ab
2014-10-16 18:32:04 -05:00
Greg Armendariz
737d6e235c Merge "Omaha #3299 fix xml attribute name" into omaha_14.4.1
Former-commit-id: 8461e3075e [formerly 6c09741587] [formerly 8461e3075e [formerly 6c09741587] [formerly aaa09c668a [formerly 248f0585868ba5bfb2c514acde91d40f1684bfdf]]]
Former-commit-id: aaa09c668a
Former-commit-id: 66d634e668 [formerly 974561952e]
Former-commit-id: 8d0c8ac158
2014-10-16 18:03:29 -05:00
Nate Jensen
e657d347e8 Omaha #3299 fix xml attribute name
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8

Former-commit-id: 306485851f [formerly cd5e4b9a08] [formerly 306485851f [formerly cd5e4b9a08] [formerly 73e15036de [formerly fa064accaafc2a4dedd8574eec6faf1960c8bc70]]]
Former-commit-id: 73e15036de
Former-commit-id: 2b6bd2cb0c [formerly 714d812e17]
Former-commit-id: 1caa1c9b7a
2014-10-16 17:11:26 -05:00
Brian.Dyke
70568c04be Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 498abd3716 [formerly 418894a17b] [formerly 498abd3716 [formerly 418894a17b] [formerly 93df82ac92 [formerly f0f79fb324665245ef759947d24514a6c8bc4470]]]
Former-commit-id: 93df82ac92
Former-commit-id: bde528063d [formerly 8af5c9870e]
Former-commit-id: a71dcd88c4
2014-10-16 12:04:27 -04:00
Nate Jensen
28302acec7 Merge "Omaha #3709 Collaboration chat windows need to support changing foreground and background color" into omaha_14.4.1
Former-commit-id: ccde01bd22 [formerly d3d6c9370d] [formerly ccde01bd22 [formerly d3d6c9370d] [formerly 0c5f1c0f78 [formerly 7c37a9bd7e4fb16feace1d081d85a2b26d471338]]]
Former-commit-id: 0c5f1c0f78
Former-commit-id: a73127bfe9 [formerly edef0621f5]
Former-commit-id: fe9206aec2
2014-10-16 10:48:06 -05:00
Sean.Webb
e42e731341 ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd

Former-commit-id: b256e04c45 [formerly 36d39be5fd] [formerly b256e04c45 [formerly 36d39be5fd] [formerly 5f6c9bc837 [formerly c11e78b57bca7d242d4d8c29dc51669d7aebb37d]]]
Former-commit-id: 5f6c9bc837
Former-commit-id: cbdb5b8911 [formerly 1cbbc5bd59]
Former-commit-id: 8755e96919
2014-10-16 10:38:14 -05:00
Shawn.Hooper
a95b84344a ASM #13467 - Fix for GFE: Need to add Beach Hazards Statement
Change-Id: I9d19a76afff8e4c36db20aec15b997eefc260209

Former-commit-id: ee70a6a4bd [formerly eafaf01966] [formerly ee70a6a4bd [formerly eafaf01966] [formerly 118f34bbf1 [formerly 366c7c478c6d83f8d21e3b30cc664a32cabf08bd]]]
Former-commit-id: 118f34bbf1
Former-commit-id: 08ec650f2f [formerly cd6be50dd6]
Former-commit-id: 156edc445f
2014-10-16 11:30:29 -04:00
Mark Peters
91eedeee50 Omaha #3709 Collaboration chat windows need to support changing foreground and background color
Change-Id: I1f208c3e12e0fe989ae395423ad28454be3589f7

Former-commit-id: ec62b9a6f1 [formerly 54a3e8d2eb] [formerly ec62b9a6f1 [formerly 54a3e8d2eb] [formerly e002132009 [formerly 8e00cd23205c4ab3f83c5594373f3736afe7fe83]]]
Former-commit-id: e002132009
Former-commit-id: db58207c6d [formerly 5fc9bdec3b]
Former-commit-id: 4b8da0d859
2014-10-16 10:28:34 -05:00
Brian.Dyke
61ffee9e3a Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 7f719d0124 [formerly c60124fa61] [formerly 7f719d0124 [formerly c60124fa61] [formerly 0d5f2c0add [formerly ea0a81b12c7b1a0154361d97882ef65fc55b20e1]]]
Former-commit-id: 0d5f2c0add
Former-commit-id: a68d796d0f [formerly e44ba36b9b]
Former-commit-id: bcc0a9529f
2014-10-16 11:21:39 -04:00
Brian.Dyke
7dd1a01952 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 7953b736e5 [formerly 86a76b3fe6] [formerly 7953b736e5 [formerly 86a76b3fe6] [formerly f3c8f4eeb0 [formerly 53bfd53b6fea22c354fa6ca501ebfb3ff937f4f2]]]
Former-commit-id: f3c8f4eeb0
Former-commit-id: b75b534085 [formerly e0bc687c6d]
Former-commit-id: 43f8cbe47b
2014-10-16 11:20:36 -04:00