Commit graph

2233 commits

Author SHA1 Message Date
Steve Harris
114eec390d Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 0f000f4485 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]]
Former-commit-id: 327d05f3b5
Former-commit-id: b2de6fd4c1 [formerly 0342b648b6] [formerly 17693382994fce6acddb70eda705f85cda502c1d [formerly c7b9690456]]
Former-commit-id: cbf659d2aeb98a7a61aa0b89fa053b8445f63a9f [formerly f22108c973]
Former-commit-id: dc0baf57ba
2013-04-03 15:52:19 -05:00
Ron Anderson
6ed11bbc88 Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1
Former-commit-id: 492587b91c [formerly b880af3c48] [formerly de856db77a] [formerly 492587b91c [formerly b880af3c48] [formerly de856db77a] [formerly c82968c1e6 [formerly de856db77a [formerly 53ace4843058424627c3b670caa77972ddbe01be]]]]
Former-commit-id: c82968c1e6
Former-commit-id: 0acc778948 [formerly a633b96fdf] [formerly d6c6f95496edc22dcabb64db1fe0138d9b9dfabb [formerly 237e414b5d]]
Former-commit-id: 6cff15f012d66863326f0d8789adfac29026769c [formerly fb76bf6d49]
Former-commit-id: e5252cf3a4
2013-04-03 15:25:52 -05:00
Richard Peter
f03594dc87 Merge "Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode." into omaha_13.3.1
Former-commit-id: 7d2b8a7576 [formerly 920ba0628c] [formerly d282a49b6f] [formerly 7d2b8a7576 [formerly 920ba0628c] [formerly d282a49b6f] [formerly 6d73e25290 [formerly d282a49b6f [formerly af61ff08574c9c32518f02a4629aa2786e609ec2]]]]
Former-commit-id: 6d73e25290
Former-commit-id: dcc6ca7202 [formerly 8ac6ae3539] [formerly dc7cbd6d3f910f10adee39b3fe760360f1e82888 [formerly 64dc5c4d23]]
Former-commit-id: 54bea0b83fc5bd1c3cc475f07d09468710cce778 [formerly 0548ee285d]
Former-commit-id: 75a2845464
2013-04-03 15:14:17 -05:00
Richard Peter
3215738fd4 Merge "Issue #1661 - yajsw will now log to both the console and log file indefinitely" into omaha_13.3.1
Former-commit-id: f0450ff6f2 [formerly dd527a4ef2] [formerly cbbd9ab90d] [formerly f0450ff6f2 [formerly dd527a4ef2] [formerly cbbd9ab90d] [formerly cfcacd20e9 [formerly cbbd9ab90d [formerly 1fe96f5c55b7927b3794cdb36217fdbe032235c4]]]]
Former-commit-id: cfcacd20e9
Former-commit-id: bddc4b1bdf [formerly d973d83519] [formerly a8e4b972144335b974c48d4fadd8845f75b550f0 [formerly 58908a0fd7]]
Former-commit-id: 3332bf3bb5bf9062085e62fc233a2fd0b8b7dbdc [formerly d2dd57fee4]
Former-commit-id: aca16ca6f9
2013-04-03 15:13:26 -05:00
Steve Harris
0cd73a41a1 13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: a196ebc11b [formerly 0edd049e3b] [formerly 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]]
Former-commit-id: 88c12203c6853385a029c2fa9c3bdc8048aff152 [formerly 044912d48b]
Former-commit-id: fc009792e3
2013-04-03 14:58:29 -05:00
Nate Jensen
cf069478fe Issue #1855 fix python threading in GFE procedures and smart tools
Change-Id: I6420338991c1961ce63ff944b516925f83a12994

Former-commit-id: 52e83d902b [formerly 5c830c3c9c] [formerly e3462292ab] [formerly 52e83d902b [formerly 5c830c3c9c] [formerly e3462292ab] [formerly fe24e34163 [formerly e3462292ab [formerly c4549e0279a3026adc2f7b40bb272fc4f59acf59]]]]
Former-commit-id: fe24e34163
Former-commit-id: 62eb52e295 [formerly 1c6643e7de] [formerly 27fc586eb36f76446b7be74d68ec2819f9554038 [formerly e18e798a94]]
Former-commit-id: a757d160b2e5635526d0c3f28efa98d91764c0cf [formerly 01b25904ad]
Former-commit-id: f0abb60a1b
2013-04-03 14:33:24 -05:00
Lee Venable
13754c533c Merge "Issue #1858 Handled creating a follow up when initial was created before 0z but issued after." into omaha_13.3.1
Former-commit-id: bd785bf5a4 [formerly c8549e67d6] [formerly 40b8ecf27d] [formerly bd785bf5a4 [formerly c8549e67d6] [formerly 40b8ecf27d] [formerly ff910d99fc [formerly 40b8ecf27d [formerly ad96c48345c8b6f89ea337bd663cb7585981e941]]]]
Former-commit-id: ff910d99fc
Former-commit-id: 49fc55ce03 [formerly 3d129d4526] [formerly dc127c10f9c848a58411f7df06f86982131e3a2d [formerly 36a15b3be1]]
Former-commit-id: cd7a6b03494efcd71e21fc5a0f3ae6206fdcaa20 [formerly 5b0fb8eeaf]
Former-commit-id: 542dfcaf9b
2013-04-03 14:14:41 -05:00
Nate Jensen
5a88c9820b Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1
Former-commit-id: 3334d9b065 [formerly a109ec4601] [formerly dbbad421db] [formerly 3334d9b065 [formerly a109ec4601] [formerly dbbad421db] [formerly 1bc148b468 [formerly dbbad421db [formerly 0b617c32afd67c5f64efa89e18abfef0de51a00f]]]]
Former-commit-id: 1bc148b468
Former-commit-id: 0a783718a9 [formerly 2d4dc636ce] [formerly 61a33575090f1b95703ee5ebf2af09b0f2f1fa1c [formerly ec8cdfd8f0]]
Former-commit-id: 2c852a36d92e9ace1a3bf68a94b1ecc96bc27b30 [formerly ab51de7da5]
Former-commit-id: 2c6e995faf
2013-04-03 14:13:14 -05:00
Nate Jensen
fc40cab9bc Issue #1562 max's fix for topo with custom colormaps
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e

Former-commit-id: 869f5498f6 [formerly d64e0a2a39] [formerly 057a929903] [formerly 869f5498f6 [formerly d64e0a2a39] [formerly 057a929903] [formerly 6c711f037c [formerly 057a929903 [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]]]
Former-commit-id: 6c711f037c
Former-commit-id: 10b70e4222 [formerly 6ca17c5a2a] [formerly a8d505a73fefb71d965eb0d0a4c7619632647528 [formerly 616612e550]]
Former-commit-id: 084203f5ffb0d6a7d8de687bcc1a6caa6ffeaf43 [formerly fb5bce6afe]
Former-commit-id: 0e25d15232
2013-04-03 14:10:53 -05:00
Bryan Kowal
aab5a08bdb Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: 981638c532 [formerly d1663ea98b] [formerly e788c7b471] [formerly 981638c532 [formerly d1663ea98b] [formerly e788c7b471] [formerly ee8c99ef6e [formerly e788c7b471 [formerly cadc51640a1349742bde98a5ae7189d507391d7e]]]]
Former-commit-id: ee8c99ef6e
Former-commit-id: ea6a9687f7 [formerly b60bea920c] [formerly 75de255c33338b2c6a36abb8a97bd7559baa6968 [formerly 344237d9ee]]
Former-commit-id: a0d42e4f89e75d56e4c9f0549bc21f3da3691e6b [formerly 962755143e]
Former-commit-id: 1aa28394c4
2013-04-03 14:03:54 -05:00
Bryan Kowal
d62b0d3d5f Issue #1661 - yajsw will now log to both the console and log file indefinitely
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: 2dbabffbe5 [formerly ad523b9cee] [formerly 939ff752e8] [formerly 2dbabffbe5 [formerly ad523b9cee] [formerly 939ff752e8] [formerly 42ab5f4244 [formerly 939ff752e8 [formerly d19b2efc155e5834ee079bcfc88b0263f8652279]]]]
Former-commit-id: 42ab5f4244
Former-commit-id: e618c4833f [formerly 93cd16508c] [formerly 95d11ada8c00865cd2e0c7fefde5e05c93de384a [formerly 4fe7bace99]]
Former-commit-id: 0c7c37575eec14f586dc5a62f5d1c1ee24b0f946 [formerly e709933a4f]
Former-commit-id: 6ab8e23421
2013-04-03 14:03:18 -05:00
Ron Anderson
8a2c181df6 Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59

Former-commit-id: 3e61a80508 [formerly 34c8aad559] [formerly 3a3cdcbf46] [formerly 3e61a80508 [formerly 34c8aad559] [formerly 3a3cdcbf46] [formerly b703b4779e [formerly 3a3cdcbf46 [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]]]
Former-commit-id: b703b4779e
Former-commit-id: a0c34f1750 [formerly 0d57a752dc] [formerly 2ed70c94d4f1788d709469642bb3b7a34fdeef14 [formerly 065ba61389]]
Former-commit-id: f6906d6c665fe19cb44286fdb8ff6ebb5d58db5c [formerly 2222201f43]
Former-commit-id: 3be7ce8bab
2013-04-03 14:01:18 -05:00
Jonathan Sanchez
7a7a1b7ea0 Issue #1858 Handled creating a follow up when initial was created before
0z but issued after.

Former-commit-id: 262f280821 [formerly 9b547cab98] [formerly 9c322bf4b7] [formerly 262f280821 [formerly 9b547cab98] [formerly 9c322bf4b7] [formerly 799b8c57ef [formerly 9c322bf4b7 [formerly b123df8e9dea005c35865f4a71ef28b1d9c8cba8]]]]
Former-commit-id: 799b8c57ef
Former-commit-id: 689334d2e1 [formerly 7ca110890a] [formerly a8114ff352a146cacee317eae56977b042f8cda5 [formerly bd25782b7a]]
Former-commit-id: 3b57f5d0ff98ca49da8472e1ed3b12ed2f12464a [formerly 30a728e641]
Former-commit-id: 6f25295c90
2013-04-03 11:43:59 -05:00
Lee Venable
a32d254419 Merge "Issue #1731 - fix problem with dmd updating." into omaha_13.3.1
Former-commit-id: 15c707ac50 [formerly 48433d4d37] [formerly 0693b02556] [formerly 15c707ac50 [formerly 48433d4d37] [formerly 0693b02556] [formerly 7bdf9c3115 [formerly 0693b02556 [formerly 321f2a9f7b8c204937a8685b402b0f90db13f321]]]]
Former-commit-id: 7bdf9c3115
Former-commit-id: 503ac4a1c9 [formerly f254b070eb] [formerly f86e075331dbbcb0667795e2fcb2530476ddf632 [formerly ea85582347]]
Former-commit-id: dce2e4ef996aa9a742e585d2999d2f662f5cf493 [formerly 2912d66b16]
Former-commit-id: d5a12212d9
2013-04-02 17:46:48 -05:00
Mike Duff
0f8a831c01 Issue #1731 - fix problem with dmd updating.
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6

Former-commit-id: 335b85ea48 [formerly c3ab8259d5] [formerly 64cdb3c7fd] [formerly 335b85ea48 [formerly c3ab8259d5] [formerly 64cdb3c7fd] [formerly 23c8085402 [formerly 64cdb3c7fd [formerly a8c25cfced44c7e3edfd1b37af73b2af8753212b]]]]
Former-commit-id: 23c8085402
Former-commit-id: a932186e2f [formerly bb14757eed] [formerly ca721abdd76f0ab8bfb9d6237b043b5674132b84 [formerly 3f2f0937ce]]
Former-commit-id: dbd807a7829dd50e060600aa69920cc72d69167b [formerly 5298fb6633]
Former-commit-id: aef1bc779f
2013-04-02 16:22:23 -05:00
Greg Armendariz
2b710f3540 Issue #1782 - Restoring #1813 & #1478
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d

Former-commit-id: b8e7d3644c [formerly f1776b887d] [formerly e5408c3807] [formerly b8e7d3644c [formerly f1776b887d] [formerly e5408c3807] [formerly 54f56fde29 [formerly e5408c3807 [formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]]]
Former-commit-id: 54f56fde29
Former-commit-id: 2bfe8fccfd [formerly e3cf306ce4] [formerly d64b8f0c79380e97b0125bf494b7ba124b119a98 [formerly 02e79dfe8a]]
Former-commit-id: 3273e25181a10873df7356911fe3ccbe0a321fe3 [formerly 9ca713f588]
Former-commit-id: e389a3bf6a
2013-04-02 15:00:26 -05:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Ben Steffensmeier
f24c14372e Issue #1821 Reduce db and pypies requests in grid assembler.
Former-commit-id: 66d3c4c237 [formerly 6171d60f44] [formerly 60d13f2282] [formerly 66d3c4c237 [formerly 6171d60f44] [formerly 60d13f2282] [formerly 5add905ea7 [formerly 60d13f2282 [formerly 68febf5d9bff68e752d039fddc853a0e5793b05d]]]]
Former-commit-id: 5add905ea7
Former-commit-id: f3fdbf45bf [formerly 1312e2ba34] [formerly 76ee35fd160c5eff68caa2f459b481b629252e64 [formerly 37fc71a726]]
Former-commit-id: 24d4b9c26d687a0b2ec88ba6fa980f94edb017f2 [formerly 459e00df31]
Former-commit-id: 1f507138d3
2013-03-27 17:59:58 -05:00
Steve Harris
43942dad11 13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 3cbf22bd96 [formerly 936e4adda2] [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]]
Former-commit-id: 8c6b23e522a402fa4cd1e6df150e646e4689e3b0 [formerly 8237fdadaa]
Former-commit-id: f59f1f02b0
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
046233d3d6 Issue #1821 make GridInfoCache more elaborate.
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9

Former-commit-id: bedc1bce0a [formerly a31dc1874b] [formerly bc8729d631] [formerly bedc1bce0a [formerly a31dc1874b] [formerly bc8729d631] [formerly 4b6d2fd8d1 [formerly bc8729d631 [formerly c7b4e7c982fb682779b729d1a8a8fb5ff6f5e1d2]]]]
Former-commit-id: 4b6d2fd8d1
Former-commit-id: c46190259b [formerly 60b2259343] [formerly 685e6735636d4f309a314a4ceda7fb70182b8d08 [formerly e4462ee41a]]
Former-commit-id: bed489685318ce7bd5ace6503ca4ee1681473d91 [formerly 03eade5b98]
Former-commit-id: 07438ab40a
2013-03-27 17:28:45 -05:00
Richard Peter
0d9bf66096 Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
Former-commit-id: 5063faa546 [formerly c11b070571] [formerly c8ae09ab1d] [formerly 5063faa546 [formerly c11b070571] [formerly c8ae09ab1d] [formerly 70a7c3c556 [formerly c8ae09ab1d [formerly a104b57c33655022bc142b71e909e8fb1b1c022b]]]]
Former-commit-id: 70a7c3c556
Former-commit-id: 2ae52dbaee [formerly be2a8e1b16] [formerly 393cfacf90d5055883f5b301797a7483965f899b [formerly de88cceb8c]]
Former-commit-id: a3040a69a63554ef36080379b737ffb513f3e5ca [formerly 09801abaf4]
Former-commit-id: 0522d43c7f
2013-03-27 17:08:00 -05:00
Dustin Johnson
e01c368285 Issue #1827 Create registry/datadelivery client features
Amend: Add event plugins and their dependencies to client features

Change-Id: Ib80522161740857d4332b84bbedad10e19683602

Former-commit-id: 5dbff646aa [formerly fbcfdd0ca1] [formerly 52c27ec57f] [formerly 5dbff646aa [formerly fbcfdd0ca1] [formerly 52c27ec57f] [formerly 1684507bdb [formerly 52c27ec57f [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]]
Former-commit-id: 1684507bdb
Former-commit-id: 49c53e5443 [formerly 2591041c9d] [formerly 9858dbcf0e7632be9b6d9beae6fc5e2f1573062d [formerly f27ebfbc1b]]
Former-commit-id: 9f863145bc53a4b320485d6a4c216ac1f5122e9a [formerly c5685dbe9f]
Former-commit-id: 198fb2b6ae
2013-03-27 15:38:36 -05:00
Ben Steffensmeier
52709e081c Issue #1821 Speed up GridInfoCache.
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40

Former-commit-id: a19226c906 [formerly bd35a06d51] [formerly 2a13abd32c] [formerly a19226c906 [formerly bd35a06d51] [formerly 2a13abd32c] [formerly 6f525a81b4 [formerly 2a13abd32c [formerly fde9f936e53a998f8cde174935d00287e6aaf70c]]]]
Former-commit-id: 6f525a81b4
Former-commit-id: 17a32dc6f1 [formerly bc0153dbba] [formerly ee1c17f89fa0985092ccae8f5eba07c346c20a39 [formerly 72724108b7]]
Former-commit-id: 4caaddd0495a788e3d45d3396506e29eff201d04 [formerly b621850bc6]
Former-commit-id: 06030b77b4
2013-03-27 13:21:33 -05:00
Ron Anderson
b55ddcee24 Merge "Issue #1833: Add performance log file to ingest and ingestGrib" into omaha_13.3.1
Former-commit-id: 7ce946600d [formerly 60735ddd83] [formerly 841a69ed59] [formerly 7ce946600d [formerly 60735ddd83] [formerly 841a69ed59] [formerly 33d78bc7ee [formerly 841a69ed59 [formerly 9b35437ccfecaf70470a9a96fbc3acacd7cf1405]]]]
Former-commit-id: 33d78bc7ee
Former-commit-id: 95001bf982 [formerly dc74b366e9] [formerly 1fc510c7e309d9f5688d57b181aa1c1152754c4e [formerly 6a393ee4f9]]
Former-commit-id: a46eda2c78ecb8612e47c3c6c65a765b13663cb6 [formerly 3fbeeadef3]
Former-commit-id: 583d14ad21
2013-03-27 11:22:48 -05:00
Nate Jensen
b54bc5364f Merge "Issue #1832 fix getNumPy() error handling" into omaha_13.3.1
Former-commit-id: 2d5ec59d57 [formerly caeb823043] [formerly dd3601a873] [formerly 2d5ec59d57 [formerly caeb823043] [formerly dd3601a873] [formerly aaf2d7bc2a [formerly dd3601a873 [formerly f1cabae64e37120f27235ec44b4bd7a1921fe621]]]]
Former-commit-id: aaf2d7bc2a
Former-commit-id: ad691d7deb [formerly adeeccc9c7] [formerly ece186ad016279cdd4244f8b4cc68f07db841659 [formerly da024a1044]]
Former-commit-id: cdd0c64ff7111693a18db23487701788c8d05df7 [formerly 329a106ef3]
Former-commit-id: 185b0ebbc2
2013-03-27 11:16:56 -05:00
Mike Duff
4f6720a362 Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa

Former-commit-id: 0e1b566dd1 [formerly 1beb6e4fa5] [formerly 1958700112] [formerly 0e1b566dd1 [formerly 1beb6e4fa5] [formerly 1958700112] [formerly 302dbf2cfb [formerly 1958700112 [formerly 5304de6fff49f3db7a3b46427077c7d2d9c0b3f9]]]]
Former-commit-id: 302dbf2cfb
Former-commit-id: be438c6fec [formerly c143b356ef] [formerly 44a7dc0c858099a53c302c46a726f699843c6b9e [formerly 3d1c1b146c]]
Former-commit-id: c9a3b5997a4cce3036f764ce1bf73551bf3542bd [formerly 16f03eb52c]
Former-commit-id: e8d921f415
2013-03-27 10:38:59 -05:00
Richard Peter
e962480999 Issue #1833: Add performance log file to ingest and ingestGrib
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d

Former-commit-id: 485a15cc15 [formerly 25d4905570] [formerly 5287a3296b] [formerly 485a15cc15 [formerly 25d4905570] [formerly 5287a3296b] [formerly b75ceeeeb3 [formerly 5287a3296b [formerly 53cb92842c43349968b70bb5fec5beb100773b63]]]]
Former-commit-id: b75ceeeeb3
Former-commit-id: b2a73c8d44 [formerly 6923e10550] [formerly 4a26b55e8490ddfd0f35dfb9dc124a2fe903a855 [formerly f99242f539]]
Former-commit-id: 1fa4e3bd516a4977c836f977106434dab62287a5 [formerly 33c602b13e]
Former-commit-id: 786b68279d
2013-03-26 20:55:42 -05:00