Commit graph

2463 commits

Author SHA1 Message Date
Steve Harris
4dc4b40b9f Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
Conflicts:
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Former-commit-id: d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]]
Former-commit-id: 14c9de2259
Former-commit-id: 12055591ea [formerly f85a1ab9ab] [formerly a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82]]
Former-commit-id: 700a93f7091a2759b6631f6d92c36ed5def40795 [formerly 0fee31b1a8]
Former-commit-id: e74f4ae39e
2013-04-01 12:15:04 -05:00
Lee Venable
ad603c0971 Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
Former-commit-id: 35413b2833 [formerly 7d73b8dacf] [formerly fe89cb7fe4] [formerly 35413b2833 [formerly 7d73b8dacf] [formerly fe89cb7fe4] [formerly d3390596f4 [formerly fe89cb7fe4 [formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]]]
Former-commit-id: d3390596f4
Former-commit-id: 1c1b083dbf [formerly 4e95ffe2ae] [formerly 68ab799532cdacaca9c02a6f89555b70848b70ca [formerly 89da26a266]]
Former-commit-id: e0fe5a0651fea3911879ccab45390dea686a6a64 [formerly e0d1017c14]
Former-commit-id: 631444f8fa
2013-04-01 12:06:16 -05:00
Steve Harris
fd3b082c54 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
2013-04-01 12:04:56 -05:00
Steve Harris
b739c58290 13.3.1-16 baseline
Former-commit-id: 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 3066dd33e5 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 994aab5c6a [formerly 6b75202d07] [formerly 4ee75d69123e11d9ab2091fbd33d33a09b414210 [formerly 36a4b3eb51]]
Former-commit-id: 19e2f3972eced86532b7883214738f39cc0c8612 [formerly c53a305b1e]
Former-commit-id: e61c718b49
2013-04-01 11:39:08 -05:00
Mike Duff
d73a468059 Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: eb0a77c8ac [formerly fa8ca827d1] [formerly 261a39122d] [formerly eb0a77c8ac [formerly fa8ca827d1] [formerly 261a39122d] [formerly 9c2ac87482 [formerly 261a39122d [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]]]
Former-commit-id: 9c2ac87482
Former-commit-id: 0f3223b8b9 [formerly e627279d7c] [formerly 40f4ad0f38b194a5fd5090487f0a7c14332e060c [formerly 11ca7c2c20]]
Former-commit-id: 4837b6fc816588eadba7e1dc8793471d71a914aa [formerly 63489a0873]
Former-commit-id: e07f3971c0
2013-04-01 11:36:53 -05:00
Richard Peter
7132200d1c Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
Former-commit-id: b921a25faf [formerly 2fa88522ff] [formerly e221223f8a] [formerly b921a25faf [formerly 2fa88522ff] [formerly e221223f8a] [formerly 255617199c [formerly e221223f8a [formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]]]
Former-commit-id: 255617199c
Former-commit-id: fcbac13167 [formerly 65f317e56b] [formerly 278bd2cb7526a3ad41f96620998122ab2e04cbef [formerly ea4a599a5a]]
Former-commit-id: 2945b0291f595207661a7b4d2aae5bfd1b61f8ec [formerly 58a8049b64]
Former-commit-id: 1b229e3d61
2013-04-01 11:33:59 -05:00
Steve Harris
622caf8d93 13.3.1-15 baseline
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 4df1b4aeae [formerly 2bf790aae3] [formerly 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]]
Former-commit-id: 2638b93048c278492c5ba927b77742ee53322508 [formerly 4204273f21]
Former-commit-id: cc1ef45545
2013-04-01 11:33:20 -05:00
Max Schenkelberg
aeb8a97b02 Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments

Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835

Former-commit-id: 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 321a29ffa4 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]]
Former-commit-id: 51d976e5e2
Former-commit-id: af56d47973 [formerly 8de3a70962] [formerly e3dd868a83e249e4b426fe0bcf89cd02cc3f3360 [formerly 1c35a54a9f]]
Former-commit-id: 62b962b1d377e7f942551913bb5a435bea8c88c7 [formerly 01c2d29c1b]
Former-commit-id: a29eff544b
2013-04-01 10:19:36 -05:00
Lee Venable
f890984a8a Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
Former-commit-id: b100693786 [formerly 7389bf5b29] [formerly 2875600910] [formerly b100693786 [formerly 7389bf5b29] [formerly 2875600910] [formerly 0bfc05ce61 [formerly 2875600910 [formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]]]
Former-commit-id: 0bfc05ce61
Former-commit-id: ec82403afa [formerly ebfa8ea79c] [formerly 4e6a76ba3f476fd4e5523e043921ad6ad3166ef7 [formerly 3d683e98a9]]
Former-commit-id: 53437b54152c1d6ef462f859d385b814fbb1d91c [formerly 034e16baa7]
Former-commit-id: 0a5a8d108a
2013-04-01 09:40:59 -05:00
Steve Harris
ca4153d5f5 13.2.1-19 baseline
Former-commit-id: 127cd26812 [formerly 88a4bb0924] [formerly bebd9ad1f4] [formerly 127cd26812 [formerly 88a4bb0924] [formerly bebd9ad1f4] [formerly fc859547f8 [formerly bebd9ad1f4 [formerly 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7]]]]
Former-commit-id: fc859547f8
Former-commit-id: 8a561e4b84 [formerly 4525c281f3] [formerly 34cab86a38e7b40b1cbd8dddbfeae07e06a3afb3 [formerly a83eddfe7b]]
Former-commit-id: 2d3ca74ddb9d8c545d7c78bcaf1a55c8279718cf [formerly 999eb26cec]
Former-commit-id: 0ff4cc2cc4
2013-04-01 10:11:24 -04:00
Roger Ferrel
2c4327e525 Issue #1790 Changes for non-blocking StationProfileDlg.
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef

Former-commit-id: 7551b03bfe [formerly e1b40f9f2f] [formerly 0d269691e2] [formerly 7551b03bfe [formerly e1b40f9f2f] [formerly 0d269691e2] [formerly d21cb5e2e8 [formerly 0d269691e2 [formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]]]
Former-commit-id: d21cb5e2e8
Former-commit-id: b78126a764 [formerly 86e21acae2] [formerly 9aeb83700b132f9f7b7a467ee07c274704d24266 [formerly 944d03615e]]
Former-commit-id: 2077ff02b813a3c47d1b8228805639c942dc10f9 [formerly 9e3bee6562]
Former-commit-id: c95d8692ff
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
b2dae45d7b Issue #1799 fix modal tools again.
Former-commit-id: 0802c4cd3d [formerly cffac354e8] [formerly eeeede7288] [formerly 0802c4cd3d [formerly cffac354e8] [formerly eeeede7288] [formerly 66af8daa11 [formerly eeeede7288 [formerly c1a69f88df85478571394c0e125617c93100168d]]]]
Former-commit-id: 66af8daa11
Former-commit-id: d2fa8b7c0c [formerly 11e6afa5fa] [formerly 788f9b6d4dfdc20ad93f496e50d5d0160cd0daa5 [formerly 7082466303]]
Former-commit-id: 13c2701a9357486bc4d24dc6616b4bbc322bb246 [formerly b3245f7a5d]
Former-commit-id: facdfdc501
2013-03-29 14:30:54 -05:00
Roger Ferrel
1d91e60e60 Issue #1790 Changes for non-blocking StationListDlg.
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be

Former-commit-id: 6d83f23cc2 [formerly 281e7f53cb] [formerly c5a95dcb44] [formerly 6d83f23cc2 [formerly 281e7f53cb] [formerly c5a95dcb44] [formerly 6ad80607bc [formerly c5a95dcb44 [formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]]]
Former-commit-id: 6ad80607bc
Former-commit-id: e536a10191 [formerly ba0060522f] [formerly b9523cc26b55358eb9448f57d15ea5437f8eccc1 [formerly de02460b11]]
Former-commit-id: 72c5c798d9fd121c512349ee0adfe5dc6cfa9bbb [formerly 99ebeac6fd]
Former-commit-id: 3a3e3674a8
2013-03-29 13:46:51 -05:00
Roger Ferrel
55fa68c464 Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa

Former-commit-id: 9c498726af [formerly 20f6baba0e] [formerly 8f4492c63c] [formerly 9c498726af [formerly 20f6baba0e] [formerly 8f4492c63c] [formerly 463407a40e [formerly 8f4492c63c [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]]]
Former-commit-id: 463407a40e
Former-commit-id: ecdb29cc1d [formerly 8c1116eaae] [formerly b5cf324e1831cdc6b8016baf3b449a6934efcbe0 [formerly ec5f32aec6]]
Former-commit-id: f9e5b103cc66b19c490c084b0f65e71e9a2704bd [formerly c1ffc82920]
Former-commit-id: 791fbba888
2013-03-29 11:35:08 -05:00
Ron Anderson
6323fb90b1 Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089

Former-commit-id: d7f0cfe92d [formerly 4ac9a4d9a8] [formerly 0f4fb125b0] [formerly d7f0cfe92d [formerly 4ac9a4d9a8] [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 0f4fb125b0 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]]
Former-commit-id: c7cfcf0250
Former-commit-id: ba064a146a [formerly cd0f319ec5] [formerly b7666888685e677f58fc852f5e79b4f07dcfe700 [formerly 9cfa87f7e5]]
Former-commit-id: 4797511c3c164c1892ecfbe58632bbae5c051a8a [formerly 41b0758084]
Former-commit-id: 8502dee456
2013-03-29 10:48:26 -05:00
Ron Anderson
92a156fe0f Issue #1774 Fix invalid unit strings in parameterInfo files.
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de

Former-commit-id: ef06834e54 [formerly cfb324f380] [formerly aeb451a37c] [formerly ef06834e54 [formerly cfb324f380] [formerly aeb451a37c] [formerly 679bb01764 [formerly aeb451a37c [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]]]
Former-commit-id: 679bb01764
Former-commit-id: 6cd8d1e8ee [formerly d5e3976dc4] [formerly 905f44a12ebe7347d47fb3a96c6a47ac28a6024f [formerly 96e8f63679]]
Former-commit-id: 4a42a154f1df90e4b82ead30ff3b512563ee1f14 [formerly 22f633b2a1]
Former-commit-id: 1eede44aac
2013-03-29 10:07:37 -05:00
Greg Armendariz
4b042a145d Fix merge issue
Former-commit-id: 466fa3fd41 [formerly 611661ccc9] [formerly cd5da3a6c5] [formerly 466fa3fd41 [formerly 611661ccc9] [formerly cd5da3a6c5] [formerly 5da06cadd7 [formerly cd5da3a6c5 [formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]]]
Former-commit-id: 5da06cadd7
Former-commit-id: 7382b92b41 [formerly dcd36e64a6] [formerly 44cbb71a5bf0c2824428a793efce64319681b9f5 [formerly f0e1b80cd2]]
Former-commit-id: aabec0ec4490b2d78130b37cfd26e0a7ec9b56dd [formerly 57eff9d7bf]
Former-commit-id: 9a8ce1af9e
2013-03-29 09:52:46 -05:00
Greg Armendariz
54fef6c68f Change package location of import
Former-commit-id: 56f51657fd [formerly f778112c20] [formerly d533c5c08d] [formerly 56f51657fd [formerly f778112c20] [formerly d533c5c08d] [formerly 27345f6edf [formerly d533c5c08d [formerly c158a7540d23451b864a1464ab64882c3d45386d]]]]
Former-commit-id: 27345f6edf
Former-commit-id: 54231d5bcc [formerly 05af592718] [formerly 1061f3510ad0f3f2357e2ec1eef2f8762af60619 [formerly 089dfc87e6]]
Former-commit-id: 8c8f0c979cc0dab06aa749a105aa5767bce4b2d6 [formerly 87e37c990e]
Former-commit-id: 63d746dd77
2013-03-29 09:09:32 -05:00
David Gillingham
7fdc3419ec Issue #1837: Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0

Former-commit-id: 2ee53d54f5 [formerly 170f252bdd] [formerly 8a7c965eaa] [formerly 2ee53d54f5 [formerly 170f252bdd] [formerly 8a7c965eaa] [formerly c9ed59b0e0 [formerly 8a7c965eaa [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]]]
Former-commit-id: c9ed59b0e0
Former-commit-id: acc3ac1c03 [formerly fddd42615d] [formerly 9f4cd32b5571d903c6b3f5e023a5fb8faddecd4f [formerly dbec0fa00f]]
Former-commit-id: 90bc9337ad9dafe74c0cc603a354d9e435dfdd1e [formerly 0b155a5788]
Former-commit-id: 4c1c4e665e
2013-03-28 17:18:43 -05:00
Nate Jensen
a000719325 Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
Former-commit-id: 9d74722ce0 [formerly 3ad797690b] [formerly 214b2ed4ba] [formerly 9d74722ce0 [formerly 3ad797690b] [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly 214b2ed4ba [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 8092e699e6 [formerly 946323416c] [formerly 30f54582860a05d8d3bdb9a1608610e277dc1958 [formerly 711fbe98d2]]
Former-commit-id: a360b60383d40ac29a22e5ea872d7601bf70222f [formerly a6a81a17d6]
Former-commit-id: 1b1d1a48d2
2013-03-28 17:02:14 -05:00
Richard Peter
d18439e5e8 Merge "Issue #1750 - qpid updates for compatibility with operational servers" into development
Former-commit-id: b548239f0b [formerly 1228c8cbbc] [formerly b4fea10724] [formerly b548239f0b [formerly 1228c8cbbc] [formerly b4fea10724] [formerly 209d53ee67 [formerly b4fea10724 [formerly 461708424eea856dacbd2bd2af506f8f905f19c7]]]]
Former-commit-id: 209d53ee67
Former-commit-id: 16fcad80cd [formerly affe383cf3] [formerly 82e5c3e6f53c40ac03ff1c4efe1d517532b59faf [formerly 8b0347001d]]
Former-commit-id: 37801977c0bd5597ef5cd0fa5551cf1cc61a4d83 [formerly a087e63bcb]
Former-commit-id: c22b37600a
2013-03-28 16:59:18 -05:00
Steve Harris
20ece0647e Issue #1782 - restore FFPMGenerator.java
Former-commit-id: 545ab48027 [formerly f01b5fb849] [formerly e67dbb206e] [formerly 545ab48027 [formerly f01b5fb849] [formerly e67dbb206e] [formerly 3953f8368b [formerly e67dbb206e [formerly 813033f4a2b30a669646b288eb00959922f0e804]]]]
Former-commit-id: 3953f8368b
Former-commit-id: cf60c00cb2 [formerly bec6e9099f] [formerly 9a8ed35adf1f227ce761f695b19a7a3ab2bd96e1 [formerly a74d22efc5]]
Former-commit-id: e85be3d04a48ce9d094adad6cc0f9c59b3b531da [formerly 92aa705ebc]
Former-commit-id: ef1e593ebd
2013-03-28 16:06:54 -05:00
Bryan Kowal
3ad26d1b99 Issue #1750 - qpid updates for compatibility with operational servers
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes

Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f

Former-commit-id: a9cdcfeb64 [formerly d124f7a37f] [formerly 2819e8fe48] [formerly a9cdcfeb64 [formerly d124f7a37f] [formerly 2819e8fe48] [formerly e3c39b9be6 [formerly 2819e8fe48 [formerly 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4]]]]
Former-commit-id: e3c39b9be6
Former-commit-id: 0e463b7bc9 [formerly fa5825b0c5] [formerly 6aae58a0db49da2bf8d5ca2ffa9bbcfa5037b662 [formerly 07a52630a7]]
Former-commit-id: 9645bd3efad403aca10a90570bae4707b44a92e2 [formerly df6d81dfd9]
Former-commit-id: 8cd870d757
2013-03-28 16:00:27 -05:00
Ben Steffensmeier
f8747920e5 Issue #1799 fix activation of tools for new perspectives.
Former-commit-id: 6bf1ec8543 [formerly dcbed65681] [formerly 50a276a7e2] [formerly 6bf1ec8543 [formerly dcbed65681] [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly 50a276a7e2 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]]
Former-commit-id: 4efa92ff49
Former-commit-id: d7d0ea7264 [formerly 33de9bfc87] [formerly 2aaf804695afe25cc1d0feb84ab77be8addda34b [formerly a415fb17ae]]
Former-commit-id: 006fd150c7d61038086ffa25715d53db4c52c407 [formerly a5e1593213]
Former-commit-id: 788df8fc68
2013-03-28 15:47:36 -05:00
Max Schenkelberg
e6e93dbc2a Issue #1638 Added persistIndex route that only persists and indexes
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae

Former-commit-id: 040a09b8ab [formerly d55e7a0eda] [formerly e91406ab10] [formerly 040a09b8ab [formerly d55e7a0eda] [formerly e91406ab10] [formerly a308b27c2f [formerly e91406ab10 [formerly 3d386df8a1def460f81468154964603e7c1edbe8]]]]
Former-commit-id: a308b27c2f
Former-commit-id: 232655183c [formerly 623c49c3cc] [formerly e4d956e4004a3d775c7a86d2f7a9ed188361fc67 [formerly d9a481f542]]
Former-commit-id: 73b5d3c96bf8dd9ba37e4ab2e38562564605d6ee [formerly 58a5bebb80]
Former-commit-id: b30b72252b
2013-03-28 15:45:31 -05:00
Ron Anderson
80ce55bd3a Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly b65ecfc151 [formerly 5bb47b7931 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]]
Former-commit-id: b65ecfc151
Former-commit-id: 65dd075089 [formerly 33bcf5fee8] [formerly 8becee59e148ef01f28560b8511322fa50267284 [formerly 3f2fa771d9]]
Former-commit-id: 378adfc06dd24afcb2243ae4d39d879540f2cf23 [formerly 5eb1885dbd]
Former-commit-id: bef17d4f03
2013-03-28 13:37:29 -05:00
Steve Harris
0528a1c5d2 Revert "Replaced with formatted version"
This reverts commit 911496b339 [formerly 20c9d653c8] [formerly 81296b2ac3d7613ca929d1c9a3b82b28fad7ad2a [formerly 054d8d263f]] [formerly 4887191329 [formerly e074710e0a] [formerly e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]]] [formerly 18019c07a4] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]]].


Former-commit-id: 8706337f67 [formerly c51c9ea5df] [formerly 29c5918428] [formerly 8706337f67 [formerly c51c9ea5df] [formerly 29c5918428] [formerly 8400028e11 [formerly 29c5918428 [formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]]]
Former-commit-id: 8400028e11
Former-commit-id: c9dd652973 [formerly 7bd478fc41] [formerly 754565dfe3a290cfa6e7f374444e9a04459503ee [formerly b614bf53f6]]
Former-commit-id: 7785f0f8379983a18ed3a8ce49a49f5cee5bbfcc [formerly 0074c522bb]
Former-commit-id: 938243eb0b
2013-03-28 13:08:16 -05:00
Dustin Johnson
e275e220bb Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
Former-commit-id: c06f0ed7f4 [formerly 9bc6dd47b6] [formerly c618169639] [formerly c06f0ed7f4 [formerly 9bc6dd47b6] [formerly c618169639] [formerly 3991df64ff [formerly c618169639 [formerly 88779a4fbd8078d81139b7555525142940999558]]]]
Former-commit-id: 3991df64ff
Former-commit-id: d37764f722 [formerly 3896cf42f1] [formerly 700e4d9bcbd8afebd66b90ead899faa9b5f42bfb [formerly d900459ab4]]
Former-commit-id: d71448462cb9ab117673ae34b2e4a8163533ee0f [formerly 9c4030ea37]
Former-commit-id: be22a59736
2013-03-28 13:07:20 -05:00
Greg Armendariz
911496b339 Replaced with formatted version
Former-commit-id: 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]]
Former-commit-id: 18019c07a4
Former-commit-id: 4887191329 [formerly e074710e0a] [formerly e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]]
Former-commit-id: 81296b2ac3d7613ca929d1c9a3b82b28fad7ad2a [formerly 054d8d263f]
Former-commit-id: 20c9d653c8
2013-03-28 12:59:43 -05:00
Dustin Johnson
1b7986e692 Merge "Issue #1802: Eliminated a call to new on StatsDao in AggregateManager" into development
Former-commit-id: 2ec3e76c1c [formerly 59393b633a] [formerly 8583a5f785] [formerly 2ec3e76c1c [formerly 59393b633a] [formerly 8583a5f785] [formerly 51bf00bf1c [formerly 8583a5f785 [formerly bf39f3c73e4de589855abda284c6d2d46543d283]]]]
Former-commit-id: 51bf00bf1c
Former-commit-id: a5bb46da22 [formerly ee26b669e3] [formerly 9d4afc316993b2f4357647dcee834eee6af6bfcd [formerly db5a8b9865]]
Former-commit-id: df99689cde8a53890c2c8b1ce2780d68fd331f83 [formerly 1cf371cd41]
Former-commit-id: 520b9f2a69
2013-03-28 12:25:12 -05:00
Dustin Johnson
847503d736 Issue #1840 Fix merge error that removed .classpath
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17

Former-commit-id: 6f36d70ead [formerly c2edf1dd89] [formerly ab42673848] [formerly 6f36d70ead [formerly c2edf1dd89] [formerly ab42673848] [formerly a4e4df02b0 [formerly ab42673848 [formerly 59977a0a652352a9128caaaf7d8f041b82941490]]]]
Former-commit-id: a4e4df02b0
Former-commit-id: ce4b93027c [formerly 85d6a19a5e] [formerly 150bcdf38ca3c079cb25192b6b11f9b215ca5226 [formerly 902986256d]]
Former-commit-id: 6d266d55ab153a947bbe33826514f5c88ba00752 [formerly f135c0d948]
Former-commit-id: a5009cb271
2013-03-28 12:14:47 -05:00
Dustin Johnson
8f7c7adf90 Issue #1840 Fix merge error that removed .classpath
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e

Former-commit-id: e28ea4d3ef [formerly 5e0073f1f9] [formerly 680d2984e1] [formerly e28ea4d3ef [formerly 5e0073f1f9] [formerly 680d2984e1] [formerly 695c83669e [formerly 680d2984e1 [formerly f6b91884ba72412a8fad2608eca1490757df2c60]]]]
Former-commit-id: 695c83669e
Former-commit-id: 65f6842341 [formerly d0056996cd] [formerly 49686481ddfb365c4542534bf9b1daede1aa694b [formerly 25b6eb0eb9]]
Former-commit-id: 099c2ace4d8824649134e43cbeb7b4520268aa4a [formerly fddc41bb6e]
Former-commit-id: 3850e46c2c
2013-03-28 12:13:23 -05:00
Benjamin Phillippe
7b0b82d34a Issue #1802: Eliminated a call to new on StatsDao in AggregateManager
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce

Former-commit-id: c63337ac35 [formerly ec880b7923] [formerly ed9cb5f8f6] [formerly c63337ac35 [formerly ec880b7923] [formerly ed9cb5f8f6] [formerly 6640a65a51 [formerly ed9cb5f8f6 [formerly e9e7f34e87f18120232ed5cc8e00da6cb8bda5d5]]]]
Former-commit-id: 6640a65a51
Former-commit-id: 8bfd5868ca [formerly af5827f1de] [formerly 3ca6f8d97c36c44404ce7fb69a9938ea70b43c36 [formerly c4496475a6]]
Former-commit-id: 81f0ba984561fbca0381870836ee4853cc303c7d [formerly 5ec3ffed77]
Former-commit-id: cca60522c4
2013-03-28 12:08:57 -05:00
Greg Armendariz
1900dd4925 Merge "Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep" into omaha_13.3.1
Former-commit-id: cea8e5309e [formerly b543b515d9] [formerly a48365165b] [formerly cea8e5309e [formerly b543b515d9] [formerly a48365165b] [formerly 943426fd00 [formerly a48365165b [formerly 6eee456e38bcc5d4a7097868a50e6928cc99bf16]]]]
Former-commit-id: 943426fd00
Former-commit-id: 35041aac30 [formerly 10823802da] [formerly 6ef530e98d51e37155a6fd3738dfdf4ebe9de859 [formerly 05d1d16500]]
Former-commit-id: ea8074bd4be781560cb6d50b5f9c86fd5343491e [formerly cccd9a73ca]
Former-commit-id: 817f9ec79c
2013-03-28 12:05:07 -05:00
Dustin Johnson
22a62fea55 Issue #1839 Change build.edex build.xml to support building work assignment features after main build
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9

Former-commit-id: 2e1cc96d01 [formerly ce37e32e61] [formerly 3be6669f1b] [formerly 2e1cc96d01 [formerly ce37e32e61] [formerly 3be6669f1b] [formerly 1365d5c9af [formerly 3be6669f1b [formerly 1f4c7ce21abf2853a424cb4a7c478847dcdd8065]]]]
Former-commit-id: 1365d5c9af
Former-commit-id: 6ad3355dad [formerly 1960bcbf11] [formerly c88cf84fe3b042c261af4f646c01752674a7c487 [formerly 83f6fb720c]]
Former-commit-id: db422ebb6e9f3dceaec4bd0424043a548411b890 [formerly f817dbe495]
Former-commit-id: 9d04ba83a5
2013-03-28 11:43:24 -05:00
Bryan Kowal
458a79ba89 Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep
- add Eclipse CDT configuration for 32-bit and 64-bit Linux compiles


Former-commit-id: d8b1984283 [formerly 5fe808757f] [formerly c592e8a877] [formerly d8b1984283 [formerly 5fe808757f] [formerly c592e8a877] [formerly 955b5c84d3 [formerly c592e8a877 [formerly 6f51d7079a786534edfa4f60d365284611fb8c3e]]]]
Former-commit-id: 955b5c84d3
Former-commit-id: b3e4b32a20 [formerly 1a11fef532] [formerly a12041d3a7c9c7077cb0b926732f1947bc7372ae [formerly 7a6f32796b]]
Former-commit-id: b4e10e373658408d4cba2dcde87722f859449334 [formerly 087e7b2468]
Former-commit-id: cb965ceb79
2013-03-28 10:42:51 -05:00
Max Schenkelberg
e5b74d9295 Issue #1638 Fix merge error
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712

Former-commit-id: 33352d0e53 [formerly 25202d8534] [formerly 573b441662] [formerly 33352d0e53 [formerly 25202d8534] [formerly 573b441662] [formerly 2b58e3ce3f [formerly 573b441662 [formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: 0bd1554e20 [formerly abcf4bf569] [formerly 6e4fa7c7c493c3578c067bb8eeff65574ac1665b [formerly c9301b75ea]]
Former-commit-id: cf288f0ac84e55f21c607cccb1dced2766398f21 [formerly 223f946b90]
Former-commit-id: 4253d92576
2013-03-28 10:20:54 -05:00
Ben Steffensmeier
7446339aff Issue #1821 recalculate 6 hours to be longer.
Former-commit-id: c61b608e1b [formerly 61e0ca3b75] [formerly a9cec71222] [formerly c61b608e1b [formerly 61e0ca3b75] [formerly a9cec71222] [formerly efbdd3aa8c [formerly a9cec71222 [formerly 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed]]]]
Former-commit-id: efbdd3aa8c
Former-commit-id: 7b4a3d369a [formerly e1a619e030] [formerly c4ade474503e6a9399c1f1ee86362c6279fef943 [formerly 403da9bfb9]]
Former-commit-id: 3c7fe12b069b4ef0a323be77b83958d6cde2b41b [formerly 94dcd159d4]
Former-commit-id: 67b3b92712
2013-03-28 10:16:11 -05:00
Lee Venable
63cbc67322 Merge "Issue #1790 Bug fixes for SCAN." into development
Former-commit-id: 87e166d88d [formerly a891171c43] [formerly e7805ded92] [formerly 87e166d88d [formerly a891171c43] [formerly e7805ded92] [formerly 167fa6eadf [formerly e7805ded92 [formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]]]
Former-commit-id: 167fa6eadf
Former-commit-id: 9b754cf557 [formerly 655f06cb65] [formerly bafa15f4cfb79c82ba6e59d41e92b5a7d5efc1f8 [formerly 772bbe23a7]]
Former-commit-id: e07831e527fb08840c49295685f74234b4b7c302 [formerly adbaebd457]
Former-commit-id: 03fd0004ec
2013-03-28 10:04:34 -05:00
Bryan Kowal
7b230a9f04 Issue #1821 - re-compile grib2.so 32-bit and 64-bit
Former-commit-id: d3a2525705 [formerly 203a3d5200] [formerly da99727625] [formerly d3a2525705 [formerly 203a3d5200] [formerly da99727625] [formerly 2da2b370db [formerly da99727625 [formerly f7f382d880134acb2f84bef990302aa91784c2d2]]]]
Former-commit-id: 2da2b370db
Former-commit-id: cf87439189 [formerly 131e260337] [formerly e0118a2e7c08a69d3c453f036763cc1d265db530 [formerly 998fbe8769]]
Former-commit-id: 508308ddeba82fc74145379e3c709953bd7c5648 [formerly 9343dee116]
Former-commit-id: c29e1e5374
2013-03-28 09:48:27 -05:00
Roger Ferrel
38ff70f9cb Issue #1790 Bug fixes for SCAN.
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65

Former-commit-id: 895ac9a39b [formerly 009cd032cb] [formerly 9c560ab626] [formerly 895ac9a39b [formerly 009cd032cb] [formerly 9c560ab626] [formerly e204276c17 [formerly 9c560ab626 [formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]]]
Former-commit-id: e204276c17
Former-commit-id: 57b5bf2d45 [formerly 380846374f] [formerly 14207e5f65d2b40c1876b607562886d07b1c2186 [formerly 216fa1b23b]]
Former-commit-id: 0a4e64e987d64d9c494fbaf73ff76eb4aa2f610d [formerly 3bb55722f5]
Former-commit-id: 18b74a6aa7
2013-03-28 09:16:24 -05:00
Roger Ferrel
f12907e546 Issue #1790 bug fix for GFE dialogs in ticket 1353.
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612

Former-commit-id: bb33366fc9 [formerly 57fe6b5ca6] [formerly 98d056c3a1] [formerly bb33366fc9 [formerly 57fe6b5ca6] [formerly 98d056c3a1] [formerly 4db9e20fbf [formerly 98d056c3a1 [formerly ee4a6d815bc85f861bb7d77719c5787343625741]]]]
Former-commit-id: 4db9e20fbf
Former-commit-id: 1c3089a826 [formerly a8872882ae] [formerly a281f6a3b00ef8635f1bebf4a15f140bf56982a7 [formerly b95a38db32]]
Former-commit-id: 3653fa1d65c254e87b01eb0cd9f78a703f950e0d [formerly c354469c78]
Former-commit-id: a6337e82dd
2013-03-28 09:04:10 -05:00
Greg Armendariz
6a115c344f Add source variable
Former-commit-id: 5d9bb2f71e [formerly ae09ebb11f] [formerly 8800080d2a] [formerly 5d9bb2f71e [formerly ae09ebb11f] [formerly 8800080d2a] [formerly d0d889f11d [formerly 8800080d2a [formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]]]
Former-commit-id: d0d889f11d
Former-commit-id: 8d335839e6 [formerly 44fcd1a8db] [formerly da1c2ea08a80b36673131e488158b2c4a2af18db [formerly 24fea6f45d]]
Former-commit-id: e10fee20c3429fa2de5343bfd74d936e7a2fc6d7 [formerly 344c5b41b3]
Former-commit-id: 0ab3b9d7f9
2013-03-28 08:56:50 -05:00
Steve Harris
f2a81e18e9 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]]
Former-commit-id: 3073951b3d
Former-commit-id: b7beed13a5 [formerly 6e48567370] [formerly e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]]
Former-commit-id: 0d9762105b7449280eb42aff17e841196ee5e518 [formerly 90ec2d3fbf]
Former-commit-id: 53ee0151ca
2013-03-27 22:16:15 -05:00
Steve Harris
e487576093 Merge branch 'master_13.3.1' (13.3.1-14 cleaned up) into omaha_13.3.1
Former-commit-id: 16a781b20e [formerly c284261dc2] [formerly 3cb15755a8] [formerly 16a781b20e [formerly c284261dc2] [formerly 3cb15755a8] [formerly 6351d8f6d3 [formerly 3cb15755a8 [formerly 0f0b0a0c0f2f0d334ccd56f8265e2b6fd9a12902]]]]
Former-commit-id: 6351d8f6d3
Former-commit-id: 12c22ed8ac [formerly 3138de0e06] [formerly c359cfeed3b2c3793ee934eeb2bebd27bef69286 [formerly e56bd830ac]]
Former-commit-id: 0cc48cc40b11883291bd20e40e182bf96356a6f7 [formerly 5102880f6e]
Former-commit-id: 550305a7b6
2013-03-27 22:13:11 -05:00
Steve Harris
4514374145 13.3.1-14 baseline
Former-commit-id: bf64a0dc2f [formerly 6a4bbd9f1a] [formerly c29076949e] [formerly bf64a0dc2f [formerly 6a4bbd9f1a] [formerly c29076949e] [formerly 4d4234d5c9 [formerly c29076949e [formerly e05ab5dbc442d410ae53400f087c02197ba5068b]]]]
Former-commit-id: 4d4234d5c9
Former-commit-id: 7e379468f5 [formerly e89cef72a4] [formerly 1abdaa1a9ab7f0a79d2f0781641350605735054f [formerly c0737a6022]]
Former-commit-id: 3c6b961749da2320d9995a467c8b8d13471fbcb3 [formerly efadc571ca]
Former-commit-id: c1c5990b25
2013-03-27 22:10:03 -05:00
Roger Ferrel
057f05e937 Issue #1790 Bug fix for dialogs in ticket 1578
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90

Former-commit-id: 63ab75fec6 [formerly 5bd60ce50c] [formerly a8410499bc] [formerly 63ab75fec6 [formerly 5bd60ce50c] [formerly a8410499bc] [formerly 1129728e03 [formerly a8410499bc [formerly 9bc7fe4c771e534148b446d33de969ef53be3b0d]]]]
Former-commit-id: 1129728e03
Former-commit-id: e920ac0aae [formerly be143656eb] [formerly 9d226e7317e1867a47554f09161c1a8772d04079 [formerly 56ca204764]]
Former-commit-id: 4d5bbeb2cc38cbd8c09412564c65ce84ca101629 [formerly 36219d5090]
Former-commit-id: cee3cd01e6
2013-03-27 21:54:26 -05:00
Richard Peter
6e9eee551c Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
Former-commit-id: 52174ddb57 [formerly 642ff5e320] [formerly 3ba331e9f5] [formerly 52174ddb57 [formerly 642ff5e320] [formerly 3ba331e9f5] [formerly 2b207fc6ec [formerly 3ba331e9f5 [formerly db45bf80d754e49429e4d6a7fd6a28f50d7fb140]]]]
Former-commit-id: 2b207fc6ec
Former-commit-id: 52459fd3cc [formerly b061ba5595] [formerly 422f89b43e649e651ca02e3a954f92499144263f [formerly d8cbd1ff39]]
Former-commit-id: 7d5128c91b6fd53bd9edd1c800ecb49af4574ae5 [formerly c2896a01d2]
Former-commit-id: 6bca38d68c
2013-03-27 18:32:38 -05:00
Richard Peter
d5aab5c91d Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
Former-commit-id: b03b4b8f75 [formerly 2a71b9de1b] [formerly 7992b43a7a] [formerly b03b4b8f75 [formerly 2a71b9de1b] [formerly 7992b43a7a] [formerly 6c4f279623 [formerly 7992b43a7a [formerly b0753a969f27d0f7903a42a535066e3ac5b354fd]]]]
Former-commit-id: 6c4f279623
Former-commit-id: 28c463775b [formerly ce746d6228] [formerly 55be6e5f32264ac772c6926e10bae527eaa7a2cd [formerly e68173e147]]
Former-commit-id: 4a5aa05d01f86c1540aab9a3efbffb6f5581f05f [formerly 17a9c008d0]
Former-commit-id: 97a4cd9e1a
2013-03-27 18:28:01 -05:00
Steve Harris
cdad316568 Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]]
Former-commit-id: d997aeaee4
Former-commit-id: 3f99eed860 [formerly 428ec8a472] [formerly d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03]]
Former-commit-id: 81096335a88ae0f8d272c7ae379aa77289f918fa [formerly f3a84e952e]
Former-commit-id: 21332cb0b5
2013-03-27 18:21:05 -05:00