Commit graph

392 commits

Author SHA1 Message Date
Nate Jensen
b67f38a548 Issue #1926 faster scan rendering and cleanup
Change-Id: I825690a953fa0967a4c9a3f74ab58bda779068ca

Former-commit-id: 3f579d7568 [formerly 4f78929858] [formerly 3f579d7568 [formerly 4f78929858] [formerly 1e419b79c2 [formerly 068d711ec098e55630eb087e4d6b1a16063ff0e7]]]
Former-commit-id: 1e419b79c2
Former-commit-id: 64bfa8ede1 [formerly e7af935f4c]
Former-commit-id: 54179c5314
2013-04-22 16:47:11 -05:00
Bryan Kowal
df2bb162c8 Issue #1835 - updates to the ldm rpm specification
- su "-lc" will now be used when executing the commands to build ldm
- the ldm rpm will now create its own /usr/local/ldm link
- Amend: removed registry.xml, ldmadmin-pl.conf, *.tbl from the source tar
- Amend: create .bash_profile during installation
- Amend: archive any existing ldm directories before creating the link

Change-Id: I00ebf8e621e66ddc4270ecfb44801cac7a9315b5

Former-commit-id: 94affd80a0 [formerly 1fda784c0c] [formerly 94affd80a0 [formerly 1fda784c0c] [formerly a6e4df1041 [formerly d6ae05c543d1c26d737f7dda97081e5400ea5c1e]]]
Former-commit-id: a6e4df1041
Former-commit-id: e1cb97383f [formerly 06c21f9828]
Former-commit-id: d684368192
2013-04-22 15:31:54 -05:00
Ben Steffensmeier
405e19daad Issue #1912 decrease the number of seperate database requests in the FFMPDataLoader.
Former-commit-id: e85f5fa0d0 [formerly 7a43a052f6] [formerly e85f5fa0d0 [formerly 7a43a052f6] [formerly a0fb4b9b5b [formerly 1ba1f77bab277fb191a416e02f5cc56a0147b15d]]]
Former-commit-id: a0fb4b9b5b
Former-commit-id: c5df5345b7 [formerly bd751b44f0]
Former-commit-id: ca6a967cf9
2013-04-22 11:32:25 -05:00
Ben Steffensmeier
55f98b6bbe Issue #1912 increase bulk requests to pypies.
Former-commit-id: 82d2c832b1 [formerly 2b11b35462] [formerly 82d2c832b1 [formerly 2b11b35462] [formerly 0e59516135 [formerly 50da745da0b9e963c3505512b86b3c59101f8ed7]]]
Former-commit-id: 0e59516135
Former-commit-id: 745c9e016b [formerly f842d5d036]
Former-commit-id: b04215896e
2013-04-22 10:59:34 -05:00
Richard Peter
1db7853659 Merge "Issue #1932 Allow yajsw to kill the wrapped process after timeout in debug mode" into omaha_13.4.1
Former-commit-id: 037d696e80 [formerly cbee3b1ee4] [formerly 037d696e80 [formerly cbee3b1ee4] [formerly 714aee8f6f [formerly 14af0c5f32ad02e9ec1a2db65c67f980ad7fddbe]]]
Former-commit-id: 714aee8f6f
Former-commit-id: 460cb47d76 [formerly 545f495ee5]
Former-commit-id: b54039b734
2013-04-22 09:31:40 -05:00
Nate Jensen
74d26fb020 Merge "Issue #1915 - updated Linux java to 6u43." into omaha_13.4.1
Former-commit-id: 2c7a8b0d15 [formerly 7fbc2427cf] [formerly 2c7a8b0d15 [formerly 7fbc2427cf] [formerly 57ccac05e8 [formerly 53f84650e0436e61d21599178ee845a8f9588e29]]]
Former-commit-id: 57ccac05e8
Former-commit-id: cba0db0c3a [formerly 09edb866f3]
Former-commit-id: 6c2fddc7ac
2013-04-22 09:13:28 -05:00
Nate Jensen
a744fb78af Merge "Issue #1926 speed up scan startup by not requesting PDOs since we have URIs" into omaha_13.4.1
Former-commit-id: 20596ce69f [formerly 21605fe89f] [formerly 20596ce69f [formerly 21605fe89f] [formerly a4a0bb6695 [formerly d4c7a6c1c8f91c2c4de2e247c4a1e4c86ea8694f]]]
Former-commit-id: a4a0bb6695
Former-commit-id: a46419805e [formerly b466022745]
Former-commit-id: 5463375f80
2013-04-22 09:11:02 -05:00
Dustin Johnson
e5be88929a Issue #1932 Allow yajsw to kill the wrapped process after timeout in debug mode
Change-Id: If638edfbb0111fb7b58901584899a0523142c518

Former-commit-id: 43314cdd3c [formerly 4128e76180] [formerly 43314cdd3c [formerly 4128e76180] [formerly 86931a613a [formerly a8cbb9fb5341cfcc3af3272ba0700bfc451bc1d2]]]
Former-commit-id: 86931a613a
Former-commit-id: b6f2a338b7 [formerly 50dfb1f67c]
Former-commit-id: 0bf5c317f3
2013-04-22 08:31:05 -05:00
Greg Armendariz
7376a35a56 Merge "Issue #1835 - minor updates to the ldm specification" into omaha_13.4.1
Former-commit-id: 0cd81b855f [formerly 96877d71ff] [formerly 0cd81b855f [formerly 96877d71ff] [formerly 5a4a2dea72 [formerly 03868f608e9dcef1855e316a5ab825246c370406]]]
Former-commit-id: 5a4a2dea72
Former-commit-id: 3f5af9ead4 [formerly 33a7a2cdb3]
Former-commit-id: 88eed1f685
2013-04-19 10:42:29 -05:00
Bryan Kowal
7430785501 Issue #1805 - edex-environment will now use the 13.4.1 path to access the EDEX service script.
Change-Id: Idc3a9c692faf76ea81ba3d994e949f3fcb8416ca

Former-commit-id: f7eca8672c [formerly 7c0f1eb0f7] [formerly f7eca8672c [formerly 7c0f1eb0f7] [formerly c02a38d7f2 [formerly 20d26f1a073a74abd595455af1800da790c36c0a]]]
Former-commit-id: c02a38d7f2
Former-commit-id: 3838fc2e43 [formerly e6c490852b]
Former-commit-id: 57f9348d05
2013-04-19 06:55:00 -05:00
Bryan Kowal
affe664f04 Issue #1915 - updated Linux java to 6u43.
Change-Id: I39bdb6bbb0cc23c457ddb08ba151ce0b707ff3e7

Former-commit-id: 8caf7c9404 [formerly c0227ea66d] [formerly 8caf7c9404 [formerly c0227ea66d] [formerly 633b89da12 [formerly 0f5b4acf4a33a8b3c9a0ba8a30eed16822d117bb]]]
Former-commit-id: 633b89da12
Former-commit-id: 02c0ea7d8b [formerly a2200c5742]
Former-commit-id: 77d41548ab
2013-04-18 23:51:54 -05:00
Nate Jensen
09e87709c9 Issue #1926 speed up scan startup by not requesting PDOs since we have URIs
Change-Id: I7b223d9c94fb55931b1c650b115c545c7ca24180

Former-commit-id: 900f54d691 [formerly 96cdc7ce76] [formerly 900f54d691 [formerly 96cdc7ce76] [formerly 91476c8e80 [formerly 96e1427daa378280133f85a1ee24647a72c8e9af]]]
Former-commit-id: 91476c8e80
Former-commit-id: c4125bb32b [formerly 74a5a462de]
Former-commit-id: 7009fe2c69
2013-04-18 18:29:15 -05:00
Bryan Kowal
c1de5d6b27 Issue #1835 - minor updates to the ldm specification
- the ldm rpm will now print error descriptions when the installation fails
- declared a depdency on zlib which is required to build noaaport


Former-commit-id: c305833e55 [formerly 1c40009549] [formerly c305833e55 [formerly 1c40009549] [formerly 744f37dd96 [formerly eaf0391abdd276d362930243a461ee6ad70d8e31]]]
Former-commit-id: 744f37dd96
Former-commit-id: db4e03f80e [formerly 46fe3aee32]
Former-commit-id: 43ddbd484a
2013-04-18 16:18:57 -05:00
Richard Peter
e4bede2efb Merge "Issue #1899 - edex-environment is now compatible with qpid 0.18." into omaha_13.4.1
Former-commit-id: ac2965df6b [formerly 04a734a584] [formerly ac2965df6b [formerly 04a734a584] [formerly ea75ad5525 [formerly a62ac3a2c58bdacfd139d3c67cc769d185a1cef2]]]
Former-commit-id: ea75ad5525
Former-commit-id: 342357e226 [formerly 3489d95e08]
Former-commit-id: cb71460cf3
2013-04-18 15:46:20 -05:00
Richard Peter
8fe8d46ff4 Merge "Issue #1913 Fixed GFE level translation" into omaha_13.4.1
Former-commit-id: 0b160892bc [formerly 0361d7a7bd] [formerly 0b160892bc [formerly 0361d7a7bd] [formerly a47ca9d509 [formerly 54c5a68656e4d9859daf1d3ff4510419f3f2516f]]]
Former-commit-id: a47ca9d509
Former-commit-id: 8c54d1415e [formerly 914100d33d]
Former-commit-id: 8f580522de
2013-04-18 15:10:56 -05:00
Bryan Kowal
822094bc7c Issue #1899 - edex-environment is now compatible with qpid 0.18.
- added change history

Change-Id: Ie6a47ed2413a366f1475d2be848ea05569c4e646

Former-commit-id: 64d9276e2e [formerly 0924bfd726] [formerly 64d9276e2e [formerly 0924bfd726] [formerly 86d8e511b5 [formerly a38c6c2014c3252b740ba434b44d09adbebb9991]]]
Former-commit-id: 86d8e511b5
Former-commit-id: cf71d24fff [formerly ff64a23deb]
Former-commit-id: af1d6136e4
2013-04-18 14:06:53 -05:00
Nate Jensen
3932b05a6e Merge "Issue #1916 fast rendering of CWAT Local Threat" into omaha_13.4.1
Former-commit-id: fde67ea9bb [formerly 2680043152] [formerly fde67ea9bb [formerly 2680043152] [formerly d7248a4dd5 [formerly bcc532d51f7b38da2f37ff943358b489a6d248fe]]]
Former-commit-id: d7248a4dd5
Former-commit-id: 068d35734a [formerly fe657596a7]
Former-commit-id: 2d8b398635
2013-04-18 12:42:27 -05:00
Dave Hladky
e6577edba9 Issue #1919 Fixed broken VGB processing
Change-Id: I4d0a1e3d2bdd13f474c33ded48620c740431719b

Former-commit-id: 179338b837 [formerly 30561c4d1b] [formerly 179338b837 [formerly 30561c4d1b] [formerly f682fe4482 [formerly d8b9e5d236f15145ff395dcbd3d741c931ef39f7]]]
Former-commit-id: f682fe4482
Former-commit-id: 89ae841190 [formerly 4ffbe250a8]
Former-commit-id: 773ced6623
2013-04-18 12:35:24 -05:00
Nate Jensen
795c41543d Issue #1916 fast rendering of CWAT Local Threat
Change-Id: Ia8129ac6a81f35b1ed4aca19edfb21022cee2344

Former-commit-id: a1896e138e [formerly 91fbdd4ad1] [formerly a1896e138e [formerly 91fbdd4ad1] [formerly 74edcf7706 [formerly 66a036b90f75a844cbeed3eb1a483ccdc72ec11d]]]
Former-commit-id: 74edcf7706
Former-commit-id: 8b98d518c9 [formerly 22f54ab95e]
Former-commit-id: edb9a87c56
2013-04-18 12:19:36 -05:00
Ron Anderson
c11d94d88b Issue #1913 Fixed GFE level translation
Change-Id: I2e59228991243d4178c73721d169f695d6581b8a

Former-commit-id: fdb69afb73 [formerly 75f802d348] [formerly fdb69afb73 [formerly 75f802d348] [formerly 666263beb4 [formerly ed32dc366aae2fa64c02c9f32202aafb95845765]]]
Former-commit-id: 666263beb4
Former-commit-id: c21f5438be [formerly 214738a19e]
Former-commit-id: ae881d581b
2013-04-18 11:43:24 -05:00
Nate Jensen
87555a8dae Merge "Issue #1916 overrode getDataTimes() to boost efficiency" into omaha_13.4.1
Former-commit-id: 45ad0cbb85 [formerly 0de50ae786] [formerly 45ad0cbb85 [formerly 0de50ae786] [formerly 7562ac5edc [formerly ec6edaaad3943caf55f97e8f7fd9974086e3b360]]]
Former-commit-id: 7562ac5edc
Former-commit-id: c79c2ce16e [formerly 25dfadb872]
Former-commit-id: bd1913e040
2013-04-18 10:15:57 -05:00
Ben Steffensmeier
dc914ac07c Issue #1912 Initial bulk hdf5 access for ffmp
Change-Id: If2b9afbd23d0388c16f05ddaaf47a1ac8dc6b339

Former-commit-id: 7a5835a43a [formerly 4db55d9a58] [formerly 7a5835a43a [formerly 4db55d9a58] [formerly fada8ae7dd [formerly 972ca525d04ca13eb43816bdfeb9bf4fb4786d76]]]
Former-commit-id: fada8ae7dd
Former-commit-id: 09c34a3eae [formerly 84ee23cc58]
Former-commit-id: 9582c84385
2013-04-17 16:35:50 -05:00
Nate Jensen
93868c334c Issue #1916 overrode getDataTimes() to boost efficiency
Change-Id: Ic9b3c6ddd2885f3fdef56910cb1e829387d48872

Former-commit-id: df2823edea [formerly 834d36e1a9] [formerly df2823edea [formerly 834d36e1a9] [formerly f2b383d4d6 [formerly cd6133708f29ea162ae3fe5456a2d8463e60dce3]]]
Former-commit-id: f2b383d4d6
Former-commit-id: d4273c8b41 [formerly 181b717cf2]
Former-commit-id: 245fcec165
2013-04-17 16:21:20 -05:00
Dustin Johnson
cc23ed1760 Merge "Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up. Peer review comments" into omaha_13.4.1
Former-commit-id: eb096536b3 [formerly c2cdafa265] [formerly eb096536b3 [formerly c2cdafa265] [formerly f6a63050a1 [formerly 4adb0045f3a22d9b07e2cca5630feebc78981492]]]
Former-commit-id: f6a63050a1
Former-commit-id: c6c0e2cd5a [formerly f2e4d0c743]
Former-commit-id: b526eaadc8
2013-04-17 13:03:16 -05:00
Richard Peter
3e427dc3c4 Merge "Issue #1868 Rewrite mergeAll in PluginDao Change-Id: I5f5706229029c9fe11c8b6a057e871aaf10baf9d" into omaha_13.4.1
Former-commit-id: 98021fc2be [formerly c35d7575dc] [formerly 98021fc2be [formerly c35d7575dc] [formerly ad5757729f [formerly 636d54e9ac473d59a8293ade9814161ec06e6b50]]]
Former-commit-id: ad5757729f
Former-commit-id: c534c9eb36 [formerly 35db65a6c1]
Former-commit-id: bd3d8d0a85
2013-04-17 12:46:02 -05:00
Greg Armendariz
9a6d08ab4b Merge "Issue #1835 - update LDM to 6.11.2" into omaha_13.4.1
Former-commit-id: f87951189b [formerly 18a660f406] [formerly f87951189b [formerly 18a660f406] [formerly e67819dbdc [formerly a7a457820a74b1d9810b7e4112ede8885d5c7905]]]
Former-commit-id: e67819dbdc
Former-commit-id: 6e4fddd6c6 [formerly 2af1a197aa]
Former-commit-id: 99b9ef5719
2013-04-17 12:03:22 -05:00
Ben Steffensmeier
f7adb5a99d Issue #1868 Rewrite mergeAll in PluginDao
Change-Id: I5f5706229029c9fe11c8b6a057e871aaf10baf9d

Former-commit-id: d21778dbfb [formerly 7dc1e34f1b] [formerly d21778dbfb [formerly 7dc1e34f1b] [formerly 3e83b37afd [formerly 93a4bc3f6e7ae7de959a25a563778f424d53f2d1]]]
Former-commit-id: 3e83b37afd
Former-commit-id: 0be0b444e4 [formerly bf72ff3d37]
Former-commit-id: 5779912e87
2013-04-17 11:58:41 -05:00
Mike Duff
9ff19270a5 Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up.
Peer review comments

Change-Id: Idf195398fdfcf7f52abf0ce203b048c3ac1186cb

Former-commit-id: 0935bc3e30 [formerly 1f80f38e8a] [formerly 0935bc3e30 [formerly 1f80f38e8a] [formerly 866e27825f [formerly dbdfc33769f7b179f9f4a3a2a2f9d509facb78d8]]]
Former-commit-id: 866e27825f
Former-commit-id: e1e3449c71 [formerly 17d3ed8fde]
Former-commit-id: 61c9dde6d0
2013-04-17 10:48:25 -05:00
Richard Peter
37ac8759d5 Merge "Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes." into omaha_13.4.1
Former-commit-id: 61c22f6715 [formerly 577c9c144d] [formerly 61c22f6715 [formerly 577c9c144d] [formerly 5b1df2ba1a [formerly 81a40e8324f38f819039d179889b4b7c016d3dfe]]]
Former-commit-id: 5b1df2ba1a
Former-commit-id: a4bbf3c07a [formerly c614e29a9c]
Former-commit-id: 8641f8617a
2013-04-17 09:33:06 -05:00
Bryan Kowal
69c1d4c465 Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
Former-commit-id: 3ac089fbf8 [formerly 0a92ecca56] [formerly 3ac089fbf8 [formerly 0a92ecca56] [formerly a2cd90e16a [formerly 43f7cd079a103ad11d21a903438aac5736d88654]]]
Former-commit-id: a2cd90e16a
Former-commit-id: 2f4b108057 [formerly 74ba9ebc3f]
Former-commit-id: 15af31e90f
2013-04-16 17:01:45 -05:00
Bryan Kowal
8cc6de9e57 Issue #1835 - update LDM to 6.11.2
- fixed hard-coded 6.8.1 version

Change-Id: Id201ea8703dd67e3b7aaadd9787fa97be2da8890

Former-commit-id: dfd75571f3 [formerly 890a6c0afb] [formerly dfd75571f3 [formerly 890a6c0afb] [formerly ba3a0ad7d5 [formerly 72ffc3204a1fa40fe2ae17801013cb93cd2961b8]]]
Former-commit-id: ba3a0ad7d5
Former-commit-id: fc4e0af835 [formerly 6ef61185c9]
Former-commit-id: 77242640b8
2013-04-16 16:32:58 -05:00
Brad Gonzales
4a086703ea Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
       added sequence delta script.

Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1

Former-commit-id: 005c935be6 [formerly dc37712fda] [formerly 005c935be6 [formerly dc37712fda] [formerly b75ef08190 [formerly 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95]]]
Former-commit-id: b75ef08190
Former-commit-id: a21b495206 [formerly 16f030294d]
Former-commit-id: 00c0f59b6b
2013-04-16 14:44:06 -05:00
Mike Duff
6cbaa20526 Issue #1786 - fix null pointer
Change-Id: Ie7bf3aa9afe6a8dcd9d288afc0e6dc537fdf043d

Former-commit-id: ad08e0a6ac [formerly 6b909c7902] [formerly ad08e0a6ac [formerly 6b909c7902] [formerly 7701902083 [formerly 6f14dfd04a696c71e2b2c9d12b86549287e7f0de]]]
Former-commit-id: 7701902083
Former-commit-id: 69dd972313 [formerly 53c87a865c]
Former-commit-id: 4c9edcec56
2013-04-16 14:21:28 -05:00
Richard Peter
e4c7161748 Merge "Issue #1787 Fixed to support changes to D2D grid location" into omaha_13.4.1
Former-commit-id: 30e77171ab [formerly 390bf03c39] [formerly 30e77171ab [formerly 390bf03c39] [formerly 5a11d3cc1c [formerly 73e3a04a98ced3670c61b5debacdfc79d494ab29]]]
Former-commit-id: 5a11d3cc1c
Former-commit-id: 4ed90bf67a [formerly 6be394ba64]
Former-commit-id: d2354e13ec
2013-04-16 09:35:12 -05:00
Ron Anderson
4dd37ae7cd Issue #1787 Fixed to support changes to D2D grid location
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c

Former-commit-id: 4ea01a29ce [formerly c233ce042d] [formerly 4ea01a29ce [formerly c233ce042d] [formerly 4cd87f2726 [formerly 5a15d9add4f47cb2016bbd453008039cef8f765f]]]
Former-commit-id: 4cd87f2726
Former-commit-id: 24a6a3590f [formerly e9f674a575]
Former-commit-id: 89a2d99bfe
2013-04-15 18:02:47 -05:00
Dave Hladky
14a08d6f66 Issue #1890 moved date keys to references in FFMPRecord instead of hard object in FFMPBasin
Change-Id: I840e0805422686856744f0d39dda0aeac4755bb8

Former-commit-id: c52445652a [formerly 60fa768195] [formerly c52445652a [formerly 60fa768195] [formerly 978e68d893 [formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]]
Former-commit-id: 978e68d893
Former-commit-id: d0ec4f0d87 [formerly 5789936212]
Former-commit-id: 0f7843f0b7
2013-04-15 17:58:06 -05:00
Bryan Kowal
6ad82744d2 Issue #1814 - use the AWIPS II log4j.xml for qpid
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1

Former-commit-id: e720bf74b5 [formerly e00a6207a5] [formerly e720bf74b5 [formerly e00a6207a5] [formerly 35b956fc4c [formerly b7297cb67055cafdef19595e0e0a481a33a9552e]]]
Former-commit-id: 35b956fc4c
Former-commit-id: 49b9046bb4 [formerly cbc2742070]
Former-commit-id: 39bae3cc54
2013-04-15 16:38:00 -05:00
Lee Venable
783df0394c Merge "Issue #1902 - FFMP permormance/cleanup peer review comments" into omaha_13.4.1
Former-commit-id: 9ae56e2172 [formerly 8723d88a19] [formerly 9ae56e2172 [formerly 8723d88a19] [formerly 8c8709f4a6 [formerly 042819679ba8e0d22695b41059772da841619f29]]]
Former-commit-id: 8c8709f4a6
Former-commit-id: b18fa4f6bf [formerly 1674a59ed3]
Former-commit-id: ec3f0c0a11
2013-04-15 15:33:53 -05:00
Richard Peter
ec77d423fe Issue #1814: Change baseline memory configuration and baseline default log configuration
Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3

Former-commit-id: c10d2f7520 [formerly 0c869ee231] [formerly c10d2f7520 [formerly 0c869ee231] [formerly 78b230aaaf [formerly 6ce6d876a153a6fe0fd1c4939dae8b719ec470e3]]]
Former-commit-id: 78b230aaaf
Former-commit-id: a281d26608 [formerly d967301cfc]
Former-commit-id: 4e9789f56d
2013-04-15 12:52:40 -05:00
Mike Duff
feb9fc93ef Issue #1902 - FFMP permormance/cleanup
peer review comments

Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15

Former-commit-id: 8271eaf328 [formerly 020713663a] [formerly 8271eaf328 [formerly 020713663a] [formerly 85f1aba297 [formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]]
Former-commit-id: 85f1aba297
Former-commit-id: 7a1809afca [formerly f61bae1c3e]
Former-commit-id: 812599d8db
2013-04-15 09:40:07 -05:00
Steve Harris
b446c96698 Merge branch 'master_13.3.1' into omaha_13.4.1
Former-commit-id: 97790b0d3e [formerly 6dc19411c1] [formerly 97790b0d3e [formerly 6dc19411c1] [formerly bdefa9f20f [formerly cb0c44c44331d64e566905a166abf132f6a5817b]]]
Former-commit-id: bdefa9f20f
Former-commit-id: a6ccaf52d4 [formerly 85bebd026e]
Former-commit-id: 7144ec32e9
2013-04-15 09:37:29 -05:00
Steve Harris
953ffdab87 13.3.1-20 baseline
Former-commit-id: 07f7e6e2b4 [formerly 25432cc388] [formerly 07f7e6e2b4 [formerly 25432cc388] [formerly 446bec6f49 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]]
Former-commit-id: 446bec6f49
Former-commit-id: 8535bceb4c [formerly 4b71131386]
Former-commit-id: 44cd8d47fb
2013-04-15 08:58:59 -05:00
Ron Anderson
dca0eeb302 Merge "Issue #1845: Fix gfeNotify with java qpid broker" into omaha_13.4.1
Former-commit-id: 4e62fbdd54 [formerly df06966a09] [formerly 4e62fbdd54 [formerly df06966a09] [formerly 428fdebd9e [formerly f23561f863b623b230b19ef2075560507fc61fb6]]]
Former-commit-id: 428fdebd9e
Former-commit-id: b60c6b19e6 [formerly c4d754d75e]
Former-commit-id: e01f6a0f7f
2013-04-15 08:27:42 -05:00
Nate Jensen
f1c3f25368 Merge "Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil." into omaha_13.4.1
Former-commit-id: ea2c0e6c40 [formerly b24ccfd7a3] [formerly ea2c0e6c40 [formerly b24ccfd7a3] [formerly a422709ab6 [formerly bc12d9c818b72ae16c485a33719817bd15301bca]]]
Former-commit-id: a422709ab6
Former-commit-id: bee4f5fafd [formerly 32ea01b8b8]
Former-commit-id: e2f072f2d5
2013-04-12 12:39:12 -05:00
Richard Peter
2110908015 Issue #1845: Fix gfeNotify with java qpid broker
Change-Id: I792b4598a296dcd7a8bafbd89c184dc709fdc193

Former-commit-id: 4e3e044281 [formerly 025600f4cb] [formerly 4e3e044281 [formerly 025600f4cb] [formerly a6ffc663a9 [formerly 9f3806e9579cef66d0a40a290d9d36a089f2b3d6]]]
Former-commit-id: a6ffc663a9
Former-commit-id: c613cfb4da [formerly 207b4cafcc]
Former-commit-id: 153e552f8a
2013-04-12 12:04:54 -05:00
Roger Ferrel
5a6926dfa3 Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil.
Change-Id: Iaa88a15c0406bf5b0c9ffeb5af7f31701be226a9

Former-commit-id: 1258e12e11 [formerly 842852d975] [formerly 1258e12e11 [formerly 842852d975] [formerly 4c15be46a0 [formerly 7cf9c217010a260281480eccdcc4e0b8d83fcd1f]]]
Former-commit-id: 4c15be46a0
Former-commit-id: 0b7d85a43f [formerly e3bacfb9f0]
Former-commit-id: 94c372088d
2013-04-12 11:10:13 -05:00
Bryan Kowal
272441938c Issue #1901 - EDEX will no longer automatically be killed during shutdown
Former-commit-id: fabebb7adf [formerly 36fa6f932b] [formerly fabebb7adf [formerly 36fa6f932b] [formerly 81423bdca1 [formerly 5b6452684b4a64620586e265f54dbcfa15c974ff]]]
Former-commit-id: 81423bdca1
Former-commit-id: d2cb482ead [formerly 694e7fe9ee]
Former-commit-id: 28570210c6
2013-04-12 10:36:15 -05:00
David Gillingham
73ea61a34d Issue #1898: Modify service backup export_configuration script to also include site's map bundles.
Former-commit-id: 967ec40df6 [formerly d5c8ecc6d3] [formerly 967ec40df6 [formerly d5c8ecc6d3] [formerly 7303425900 [formerly d197bc7fef0ca97f533d5270625b5e696ab29dca]]]
Former-commit-id: 7303425900
Former-commit-id: d9035f421c [formerly b6201bba2f]
Former-commit-id: 30493697f8
2013-04-12 09:50:47 -05:00
Bryan Kowal
64cfb4f79d Issue #1897 - updated from PostgreSQL 9.2.3 to PostgreSQL 9.2.4
Former-commit-id: cc0748d2d9 [formerly 331ca69086] [formerly cc0748d2d9 [formerly 331ca69086] [formerly 765569f139 [formerly 64f31d1f7c2c01eee91cfb4de68fbc01a73ae113]]]
Former-commit-id: 765569f139
Former-commit-id: 2fca1ce506 [formerly 73e3d99f47]
Former-commit-id: f30c1fb3cf
2013-04-11 18:06:42 -05:00
Steve Harris
98fd30b0d5 Issue #1872 - Merge branch 'master_13.3.1' (13.3.1-19) into omaha_13.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java

Former-commit-id: 0d86b95f1b [formerly 55d9909d6d] [formerly 0d86b95f1b [formerly 55d9909d6d] [formerly 0fed14d765 [formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]]
Former-commit-id: 0fed14d765
Former-commit-id: 55dda49d47 [formerly fe6a078c64]
Former-commit-id: a9d3e94b3b
2013-04-11 13:14:00 -05:00