Bryan Kowal
757be85472
Issue #1915 - Java 1.6u43 for MSFT Windows
...
Change-Id: I55e6dcba097ee694a5a4aacb311c85052c2f663d
Former-commit-id: aad1dac24c
[formerly 0a1e4b2258
] [formerly 127a2bd489
] [formerly aad1dac24c
[formerly 0a1e4b2258
] [formerly 127a2bd489
] [formerly a2ad4d4d58
[formerly 127a2bd489
[formerly e9ae5b5d30cc1c5283aa947ed02b4d35c3cf3460]]]]
Former-commit-id: a2ad4d4d58
Former-commit-id: a0ca3771c9
[formerly d3d3468bf9
] [formerly 508709462aa05653597cc21744bd476fd2c2576a [formerly 65f487cb9a
]]
Former-commit-id: 760ca6e799b32aeb33464246ed9666c3aed23870 [formerly e7bd7aaad7
]
Former-commit-id: 3c1e9459c2
2013-04-22 16:41:37 -05:00
Bryan Kowal
00ffc84474
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: 9cd7302778
[formerly 94affd80a0
] [formerly 1fda784c0c
] [formerly 9cd7302778
[formerly 94affd80a0
] [formerly 1fda784c0c
] [formerly a6e4df1041
[formerly 1fda784c0c
[formerly d6ae05c543d1c26d737f7dda97081e5400ea5c1e]]]]
Former-commit-id: a6e4df1041
Former-commit-id: f34b13ea1d
[formerly e1cb97383f
] [formerly 4dc0d3d912460f652029312d53bd14e03b3891b8 [formerly 06c21f9828
]]
Former-commit-id: b28287fcaf5020dde9bad9658266135e1d90c484 [formerly d684368192
]
Former-commit-id: df2bb162c8
2013-04-22 15:31:54 -05:00
Ben Steffensmeier
5b845a15ba
Issue #1912 optimized the creation of NavigableMaps from aggregate records and delayed TreeMap creation to the tertiary loader.
...
Former-commit-id: f544505d26
[formerly 9643633de9
] [formerly acaaca2e6b
] [formerly f544505d26
[formerly 9643633de9
] [formerly acaaca2e6b
] [formerly 3e29e0ea1e
[formerly acaaca2e6b
[formerly 42cdc1cf810cfefc97c58932fde2051de0fea439]]]]
Former-commit-id: 3e29e0ea1e
Former-commit-id: eda9f8f95c
[formerly 2501a483b4
] [formerly f42c549d87c23be0c1a6f0f911cb3c2ad1e5e3d4 [formerly 96c503bb2c
]]
Former-commit-id: 12c651082db37e7d0161b0f35505f01c03ea3f51 [formerly 9e12ec625d
]
Former-commit-id: 642451b706
2013-04-22 11:52:37 -05:00
Ben Steffensmeier
b0f2d630db
Issue #1912 decrease the number of seperate database requests in the FFMPDataLoader.
...
Former-commit-id: a82e08fb6a
[formerly e85f5fa0d0
] [formerly 7a43a052f6
] [formerly a82e08fb6a
[formerly e85f5fa0d0
] [formerly 7a43a052f6
] [formerly a0fb4b9b5b
[formerly 7a43a052f6
[formerly 1ba1f77bab277fb191a416e02f5cc56a0147b15d]]]]
Former-commit-id: a0fb4b9b5b
Former-commit-id: 5360ba96c2
[formerly c5df5345b7
] [formerly bdd509a967883f47031067c5edc0b4d0f97a75a6 [formerly bd751b44f0
]]
Former-commit-id: 3c63c9bcfe58d768376928e15b01e91aca3b2c11 [formerly ca6a967cf9
]
Former-commit-id: 405e19daad
2013-04-22 11:32:25 -05:00
Ben Steffensmeier
a19caf9432
Issue #1912 increase bulk requests to pypies.
...
Former-commit-id: 15a88488ca
[formerly 82d2c832b1
] [formerly 2b11b35462
] [formerly 15a88488ca
[formerly 82d2c832b1
] [formerly 2b11b35462
] [formerly 0e59516135
[formerly 2b11b35462
[formerly 50da745da0b9e963c3505512b86b3c59101f8ed7]]]]
Former-commit-id: 0e59516135
Former-commit-id: 96c730f0a8
[formerly 745c9e016b
] [formerly 1599dd6d7a4261ade2e324efd4fc9c1be87da500 [formerly f842d5d036
]]
Former-commit-id: 95ec5570662831b6a2cb9280c9838c27e0b18d6e [formerly b04215896e
]
Former-commit-id: 55f98b6bbe
2013-04-22 10:59:34 -05:00
Richard Peter
fc5465a4f0
Merge "Issue #1932 Allow yajsw to kill the wrapped process after timeout in debug mode" into omaha_13.4.1
...
Former-commit-id: 5c67134d7b
[formerly 037d696e80
] [formerly cbee3b1ee4
] [formerly 5c67134d7b
[formerly 037d696e80
] [formerly cbee3b1ee4
] [formerly 714aee8f6f
[formerly cbee3b1ee4
[formerly 14af0c5f32ad02e9ec1a2db65c67f980ad7fddbe]]]]
Former-commit-id: 714aee8f6f
Former-commit-id: 167fb6a627
[formerly 460cb47d76
] [formerly a5bd8121e6780b780ec6e72236ffd56d0725f1a8 [formerly 545f495ee5
]]
Former-commit-id: a2aa72fc52db52cce289f7f43235021f2fce2644 [formerly b54039b734
]
Former-commit-id: 1db7853659
2013-04-22 09:31:40 -05:00
Nate Jensen
18479fc2a9
Merge "Issue #1915 - updated Linux java to 6u43." into omaha_13.4.1
...
Former-commit-id: ed0fe7cd3e
[formerly 2c7a8b0d15
] [formerly 7fbc2427cf
] [formerly ed0fe7cd3e
[formerly 2c7a8b0d15
] [formerly 7fbc2427cf
] [formerly 57ccac05e8
[formerly 7fbc2427cf
[formerly 53f84650e0436e61d21599178ee845a8f9588e29]]]]
Former-commit-id: 57ccac05e8
Former-commit-id: ba4b90feac
[formerly cba0db0c3a
] [formerly 577c6ce298a0ad230654271e0416a4349e28d154 [formerly 09edb866f3
]]
Former-commit-id: 55e749149f52680b9a7533d518cdf47ab3cf3e44 [formerly 6c2fddc7ac
]
Former-commit-id: 74d26fb020
2013-04-22 09:13:28 -05:00
Nate Jensen
b019815285
Merge "Issue #1926 speed up scan startup by not requesting PDOs since we have URIs" into omaha_13.4.1
...
Former-commit-id: baab9fff8c
[formerly 20596ce69f
] [formerly 21605fe89f
] [formerly baab9fff8c
[formerly 20596ce69f
] [formerly 21605fe89f
] [formerly a4a0bb6695
[formerly 21605fe89f
[formerly d4c7a6c1c8f91c2c4de2e247c4a1e4c86ea8694f]]]]
Former-commit-id: a4a0bb6695
Former-commit-id: dafcf537bf
[formerly a46419805e
] [formerly ee5879247800c4c3d150127e4cbd61909c75dceb [formerly b466022745
]]
Former-commit-id: 0ce913a918aa4c65c236ca11ea4688095b898387 [formerly 5463375f80
]
Former-commit-id: a744fb78af
2013-04-22 09:11:02 -05:00
Dustin Johnson
8486467d67
Issue #1932 Allow yajsw to kill the wrapped process after timeout in debug mode
...
Change-Id: If638edfbb0111fb7b58901584899a0523142c518
Former-commit-id: b878da6a26
[formerly 43314cdd3c
] [formerly 4128e76180
] [formerly b878da6a26
[formerly 43314cdd3c
] [formerly 4128e76180
] [formerly 86931a613a
[formerly 4128e76180
[formerly a8cbb9fb5341cfcc3af3272ba0700bfc451bc1d2]]]]
Former-commit-id: 86931a613a
Former-commit-id: b885b8fb15
[formerly b6f2a338b7
] [formerly 3b80fd220a3c51a41480346f0db597425f98fdce [formerly 50dfb1f67c
]]
Former-commit-id: ef9dbcd70786d04d14591a8aa5869a33584234af [formerly 0bf5c317f3
]
Former-commit-id: e5be88929a
2013-04-22 08:31:05 -05:00
Greg Armendariz
077113ab37
Merge "Issue #1835 - minor updates to the ldm specification" into omaha_13.4.1
...
Former-commit-id: 35588c5cdb
[formerly 0cd81b855f
] [formerly 96877d71ff
] [formerly 35588c5cdb
[formerly 0cd81b855f
] [formerly 96877d71ff
] [formerly 5a4a2dea72
[formerly 96877d71ff
[formerly 03868f608e9dcef1855e316a5ab825246c370406]]]]
Former-commit-id: 5a4a2dea72
Former-commit-id: 3b9d87dd82
[formerly 3f5af9ead4
] [formerly 898329f44475094483e5fd4d1ef50e98c289c6ba [formerly 33a7a2cdb3
]]
Former-commit-id: b3142908fd112439e74b8c62fddb0fa2ee4bfc92 [formerly 88eed1f685
]
Former-commit-id: 7376a35a56
2013-04-19 10:42:29 -05:00
Bryan Kowal
41ecf1339d
Issue #1805 - edex-environment will now use the 13.4.1 path to access the EDEX service script.
...
Change-Id: Idc3a9c692faf76ea81ba3d994e949f3fcb8416ca
Former-commit-id: 5b5651ecf5
[formerly f7eca8672c
] [formerly 7c0f1eb0f7
] [formerly 5b5651ecf5
[formerly f7eca8672c
] [formerly 7c0f1eb0f7
] [formerly c02a38d7f2
[formerly 7c0f1eb0f7
[formerly 20d26f1a073a74abd595455af1800da790c36c0a]]]]
Former-commit-id: c02a38d7f2
Former-commit-id: 93f2f81ec0
[formerly 3838fc2e43
] [formerly b7ebb1bcfe002b6b0a32ee083653c5ea7453ada7 [formerly e6c490852b
]]
Former-commit-id: 31c0c334b8577c6f749dbbdfb33bc73a50295faa [formerly 57f9348d05
]
Former-commit-id: 7430785501
2013-04-19 06:55:00 -05:00
Bryan Kowal
0e77dc5020
Issue #1915 - updated Linux java to 6u43.
...
Change-Id: I39bdb6bbb0cc23c457ddb08ba151ce0b707ff3e7
Former-commit-id: e35586ce18
[formerly 8caf7c9404
] [formerly c0227ea66d
] [formerly e35586ce18
[formerly 8caf7c9404
] [formerly c0227ea66d
] [formerly 633b89da12
[formerly c0227ea66d
[formerly 0f5b4acf4a33a8b3c9a0ba8a30eed16822d117bb]]]]
Former-commit-id: 633b89da12
Former-commit-id: 9371c54897
[formerly 02c0ea7d8b
] [formerly 0063375cdb45d314d0460fcdb60109291b70ecea [formerly a2200c5742
]]
Former-commit-id: 0310016c1adb4c95d7b7ae1bacdb197e9ef9254a [formerly 77d41548ab
]
Former-commit-id: affe664f04
2013-04-18 23:51:54 -05:00
Nate Jensen
aba02431ff
Issue #1926 speed up scan startup by not requesting PDOs since we have URIs
...
Change-Id: I7b223d9c94fb55931b1c650b115c545c7ca24180
Former-commit-id: 9fb04b5e48
[formerly 900f54d691
] [formerly 96cdc7ce76
] [formerly 9fb04b5e48
[formerly 900f54d691
] [formerly 96cdc7ce76
] [formerly 91476c8e80
[formerly 96cdc7ce76
[formerly 96e1427daa378280133f85a1ee24647a72c8e9af]]]]
Former-commit-id: 91476c8e80
Former-commit-id: 27ce2542dc
[formerly c4125bb32b
] [formerly d9d4f37bc25a0cde2368ecbc13e0637995973e0b [formerly 74a5a462de
]]
Former-commit-id: 8c4f245eb2011c0ebd09fcbf149ee4be0945287a [formerly 7009fe2c69
]
Former-commit-id: 09e87709c9
2013-04-18 18:29:15 -05:00
Bryan Kowal
bec76c97f0
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: 2d813c653f
[formerly c305833e55
] [formerly 1c40009549
] [formerly 2d813c653f
[formerly c305833e55
] [formerly 1c40009549
] [formerly 744f37dd96
[formerly 1c40009549
[formerly eaf0391abdd276d362930243a461ee6ad70d8e31]]]]
Former-commit-id: 744f37dd96
Former-commit-id: 6b02bf4333
[formerly db4e03f80e
] [formerly 160e795f6ae9eef25248ac50eec421e042d411f8 [formerly 46fe3aee32
]]
Former-commit-id: 2f73ade31b6b889d071eccf488905ad4b7abf544 [formerly 43ddbd484a
]
Former-commit-id: c1de5d6b27
2013-04-18 16:18:57 -05:00
Richard Peter
1a44a95b01
Merge "Issue #1899 - edex-environment is now compatible with qpid 0.18." into omaha_13.4.1
...
Former-commit-id: 4f050ca78d
[formerly ac2965df6b
] [formerly 04a734a584
] [formerly 4f050ca78d
[formerly ac2965df6b
] [formerly 04a734a584
] [formerly ea75ad5525
[formerly 04a734a584
[formerly a62ac3a2c58bdacfd139d3c67cc769d185a1cef2]]]]
Former-commit-id: ea75ad5525
Former-commit-id: e9df9148e5
[formerly 342357e226
] [formerly 2cb2d9fb4687ac9c9418911eff0be82eb6c4d5cc [formerly 3489d95e08
]]
Former-commit-id: 26f1e38e0c96575644bfc4f194d0b8afcf13782a [formerly cb71460cf3
]
Former-commit-id: e4bede2efb
2013-04-18 15:46:20 -05:00
Richard Peter
ed3f5eff39
Merge "Issue #1913 Fixed GFE level translation" into omaha_13.4.1
...
Former-commit-id: 8925064933
[formerly 0b160892bc
] [formerly 0361d7a7bd
] [formerly 8925064933
[formerly 0b160892bc
] [formerly 0361d7a7bd
] [formerly a47ca9d509
[formerly 0361d7a7bd
[formerly 54c5a68656e4d9859daf1d3ff4510419f3f2516f]]]]
Former-commit-id: a47ca9d509
Former-commit-id: 85fbed8902
[formerly 8c54d1415e
] [formerly 55a963ca062b76c3309f5afbb32a5c3680a08390 [formerly 914100d33d
]]
Former-commit-id: 1eb3222085e693ad8060a4bd0e20d056ee94b5fd [formerly 8f580522de
]
Former-commit-id: 8fe8d46ff4
2013-04-18 15:10:56 -05:00
Bryan Kowal
caa561a4cb
Issue #1899 - edex-environment is now compatible with qpid 0.18.
...
- added change history
Change-Id: Ie6a47ed2413a366f1475d2be848ea05569c4e646
Former-commit-id: 04c1bca946
[formerly 64d9276e2e
] [formerly 0924bfd726
] [formerly 04c1bca946
[formerly 64d9276e2e
] [formerly 0924bfd726
] [formerly 86d8e511b5
[formerly 0924bfd726
[formerly a38c6c2014c3252b740ba434b44d09adbebb9991]]]]
Former-commit-id: 86d8e511b5
Former-commit-id: 68244041e7
[formerly cf71d24fff
] [formerly 0225f396c0bb9b4bc44f8a3a438673280a30a3ff [formerly ff64a23deb
]]
Former-commit-id: 1b947eb6a2a4a24f81407f08c14c3453f1c4ca73 [formerly af1d6136e4
]
Former-commit-id: 822094bc7c
2013-04-18 14:06:53 -05:00
Nate Jensen
331403932a
Merge "Issue #1916 fast rendering of CWAT Local Threat" into omaha_13.4.1
...
Former-commit-id: ddfe76b9f0
[formerly fde67ea9bb
] [formerly 2680043152
] [formerly ddfe76b9f0
[formerly fde67ea9bb
] [formerly 2680043152
] [formerly d7248a4dd5
[formerly 2680043152
[formerly bcc532d51f7b38da2f37ff943358b489a6d248fe]]]]
Former-commit-id: d7248a4dd5
Former-commit-id: ccbb3dfdfc
[formerly 068d35734a
] [formerly b121000e836eecef3d0ac25d8bf2d7202b80c972 [formerly fe657596a7
]]
Former-commit-id: fea05fc9b25cb88db9487c76a44cf1532050ea3c [formerly 2d8b398635
]
Former-commit-id: 3932b05a6e
2013-04-18 12:42:27 -05:00
Dave Hladky
7f35053b42
Issue #1919 Fixed broken VGB processing
...
Change-Id: I4d0a1e3d2bdd13f474c33ded48620c740431719b
Former-commit-id: c885e35106
[formerly 179338b837
] [formerly 30561c4d1b
] [formerly c885e35106
[formerly 179338b837
] [formerly 30561c4d1b
] [formerly f682fe4482
[formerly 30561c4d1b
[formerly d8b9e5d236f15145ff395dcbd3d741c931ef39f7]]]]
Former-commit-id: f682fe4482
Former-commit-id: 557234e509
[formerly 89ae841190
] [formerly b065f26cf41dd3dc1a704644a1ca030dc53ba254 [formerly 4ffbe250a8
]]
Former-commit-id: 01bb66d50b543ac34bca5b1fc3faf5adcf84f001 [formerly 773ced6623
]
Former-commit-id: e6577edba9
2013-04-18 12:35:24 -05:00
Nate Jensen
61ce971d46
Issue #1916 fast rendering of CWAT Local Threat
...
Change-Id: Ia8129ac6a81f35b1ed4aca19edfb21022cee2344
Former-commit-id: ae0418fec6
[formerly a1896e138e
] [formerly 91fbdd4ad1
] [formerly ae0418fec6
[formerly a1896e138e
] [formerly 91fbdd4ad1
] [formerly 74edcf7706
[formerly 91fbdd4ad1
[formerly 66a036b90f75a844cbeed3eb1a483ccdc72ec11d]]]]
Former-commit-id: 74edcf7706
Former-commit-id: ae4f128942
[formerly 8b98d518c9
] [formerly 03f7366194f084c1386bc38b2ae259936297b910 [formerly 22f54ab95e
]]
Former-commit-id: 9704b16d2c954088611ae65e9a06b7f5739a4725 [formerly edb9a87c56
]
Former-commit-id: 795c41543d
2013-04-18 12:19:36 -05:00
Ron Anderson
4e9c539742
Issue #1913 Fixed GFE level translation
...
Change-Id: I2e59228991243d4178c73721d169f695d6581b8a
Former-commit-id: 2bec2b18e5
[formerly fdb69afb73
] [formerly 75f802d348
] [formerly 2bec2b18e5
[formerly fdb69afb73
] [formerly 75f802d348
] [formerly 666263beb4
[formerly 75f802d348
[formerly ed32dc366aae2fa64c02c9f32202aafb95845765]]]]
Former-commit-id: 666263beb4
Former-commit-id: 2d4a498ef7
[formerly c21f5438be
] [formerly 7067e9788ce1bab06c42fc0b779ae18cb293e3a8 [formerly 214738a19e
]]
Former-commit-id: ada74680316a70e4a27eb70dab9cc5979b8f3af6 [formerly ae881d581b
]
Former-commit-id: c11d94d88b
2013-04-18 11:43:24 -05:00
Nate Jensen
0a575c31ce
Merge "Issue #1916 overrode getDataTimes() to boost efficiency" into omaha_13.4.1
...
Former-commit-id: ea3e7c21c8
[formerly 45ad0cbb85
] [formerly 0de50ae786
] [formerly ea3e7c21c8
[formerly 45ad0cbb85
] [formerly 0de50ae786
] [formerly 7562ac5edc
[formerly 0de50ae786
[formerly ec6edaaad3943caf55f97e8f7fd9974086e3b360]]]]
Former-commit-id: 7562ac5edc
Former-commit-id: ca24226a6f
[formerly c79c2ce16e
] [formerly 613d32cf54b8dbeb26ba86029009ed3f0717a0d9 [formerly 25dfadb872
]]
Former-commit-id: 549f2cd24998031d18101f3dbe4381638174af7e [formerly bd1913e040
]
Former-commit-id: 87555a8dae
2013-04-18 10:15:57 -05:00
Ben Steffensmeier
39073beefb
Issue #1912 Initial bulk hdf5 access for ffmp
...
Change-Id: If2b9afbd23d0388c16f05ddaaf47a1ac8dc6b339
Former-commit-id: bc87fa8d05
[formerly 7a5835a43a
] [formerly 4db55d9a58
] [formerly bc87fa8d05
[formerly 7a5835a43a
] [formerly 4db55d9a58
] [formerly fada8ae7dd
[formerly 4db55d9a58
[formerly 972ca525d04ca13eb43816bdfeb9bf4fb4786d76]]]]
Former-commit-id: fada8ae7dd
Former-commit-id: 4243136ec9
[formerly 09c34a3eae
] [formerly f246618fbf986ef5924afdd2acd62190209c724f [formerly 84ee23cc58
]]
Former-commit-id: 3dfc17eb401243023ee5e958670c32ecada96013 [formerly 9582c84385
]
Former-commit-id: dc914ac07c
2013-04-17 16:35:50 -05:00
Nate Jensen
1573745970
Issue #1916 overrode getDataTimes() to boost efficiency
...
Change-Id: Ic9b3c6ddd2885f3fdef56910cb1e829387d48872
Former-commit-id: 8e34962ce6
[formerly df2823edea
] [formerly 834d36e1a9
] [formerly 8e34962ce6
[formerly df2823edea
] [formerly 834d36e1a9
] [formerly f2b383d4d6
[formerly 834d36e1a9
[formerly cd6133708f29ea162ae3fe5456a2d8463e60dce3]]]]
Former-commit-id: f2b383d4d6
Former-commit-id: 1d0479b97f
[formerly d4273c8b41
] [formerly 5ccda62a353eef9ec22c9bbfe3fc406c3e88822d [formerly 181b717cf2
]]
Former-commit-id: 56ee1d0b2905e90fe13208268a0e39855221cd57 [formerly 245fcec165
]
Former-commit-id: 93868c334c
2013-04-17 16:21:20 -05:00
Dustin Johnson
76907bd13d
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: db353e6f2d
[formerly eb096536b3
] [formerly c2cdafa265
] [formerly db353e6f2d
[formerly eb096536b3
] [formerly c2cdafa265
] [formerly f6a63050a1
[formerly c2cdafa265
[formerly 4adb0045f3a22d9b07e2cca5630feebc78981492]]]]
Former-commit-id: f6a63050a1
Former-commit-id: ed715e30ab
[formerly c6c0e2cd5a
] [formerly cbf95d970036e37b651dbe1c823a64c4fd2e0459 [formerly f2e4d0c743
]]
Former-commit-id: 9ab46fc38dbce126f080f70d9a270564d1ce9f7c [formerly b526eaadc8
]
Former-commit-id: cc23ed1760
2013-04-17 13:03:16 -05:00
Richard Peter
465f0783d7
Merge "Issue #1868 Rewrite mergeAll in PluginDao Change-Id: I5f5706229029c9fe11c8b6a057e871aaf10baf9d" into omaha_13.4.1
...
Former-commit-id: e3004c3e16
[formerly 98021fc2be
] [formerly c35d7575dc
] [formerly e3004c3e16
[formerly 98021fc2be
] [formerly c35d7575dc
] [formerly ad5757729f
[formerly c35d7575dc
[formerly 636d54e9ac473d59a8293ade9814161ec06e6b50]]]]
Former-commit-id: ad5757729f
Former-commit-id: e82e7246ea
[formerly c534c9eb36
] [formerly 277484bdbf5839f46fcfa39b4f65b1dcdd9737c2 [formerly 35db65a6c1
]]
Former-commit-id: 52a752999785b60e29afb0574a15083385bf7c51 [formerly bd3d8d0a85
]
Former-commit-id: 3e427dc3c4
2013-04-17 12:46:02 -05:00
Greg Armendariz
eba54468e5
Merge "Issue #1835 - update LDM to 6.11.2" into omaha_13.4.1
...
Former-commit-id: 2872e384ed
[formerly f87951189b
] [formerly 18a660f406
] [formerly 2872e384ed
[formerly f87951189b
] [formerly 18a660f406
] [formerly e67819dbdc
[formerly 18a660f406
[formerly a7a457820a74b1d9810b7e4112ede8885d5c7905]]]]
Former-commit-id: e67819dbdc
Former-commit-id: 4207ca887a
[formerly 6e4fddd6c6
] [formerly 7d426223034f342f4ac25cbbf0c848f9855d4778 [formerly 2af1a197aa
]]
Former-commit-id: 089c28c896d94e9185488800286803d71adb19a4 [formerly 99b9ef5719
]
Former-commit-id: 9a6d08ab4b
2013-04-17 12:03:22 -05:00
Ben Steffensmeier
63b7319cef
Issue #1868 Rewrite mergeAll in PluginDao
...
Change-Id: I5f5706229029c9fe11c8b6a057e871aaf10baf9d
Former-commit-id: 3091b7614b
[formerly d21778dbfb
] [formerly 7dc1e34f1b
] [formerly 3091b7614b
[formerly d21778dbfb
] [formerly 7dc1e34f1b
] [formerly 3e83b37afd
[formerly 7dc1e34f1b
[formerly 93a4bc3f6e7ae7de959a25a563778f424d53f2d1]]]]
Former-commit-id: 3e83b37afd
Former-commit-id: a6d64052bd
[formerly 0be0b444e4
] [formerly dbb6fc7a3c04ac03c6ef33dc542236d4dad7d0e5 [formerly bf72ff3d37
]]
Former-commit-id: bef4782cc94047fbd8e6097b25e51550ec3ac9ba [formerly 5779912e87
]
Former-commit-id: f7adb5a99d
2013-04-17 11:58:41 -05:00
Mike Duff
ea920be92f
Issue #1786 - Modify status handler to log to default handler if PlatformUI is not up.
...
Peer review comments
Change-Id: Idf195398fdfcf7f52abf0ce203b048c3ac1186cb
Former-commit-id: 13ab57916e
[formerly 0935bc3e30
] [formerly 1f80f38e8a
] [formerly 13ab57916e
[formerly 0935bc3e30
] [formerly 1f80f38e8a
] [formerly 866e27825f
[formerly 1f80f38e8a
[formerly dbdfc33769f7b179f9f4a3a2a2f9d509facb78d8]]]]
Former-commit-id: 866e27825f
Former-commit-id: 0f1f46b7fa
[formerly e1e3449c71
] [formerly e54fad69d6eabd08572e0f49ae8a05e83994c713 [formerly 17d3ed8fde
]]
Former-commit-id: 7ccc204f41c35004cfc7fb3de6b5c45c78cc3390 [formerly 61c9dde6d0
]
Former-commit-id: 9ff19270a5
2013-04-17 10:48:25 -05:00
Richard Peter
d8bfcb53e7
Merge "Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes." into omaha_13.4.1
...
Former-commit-id: eed58acdf9
[formerly 61c22f6715
] [formerly 577c9c144d
] [formerly eed58acdf9
[formerly 61c22f6715
] [formerly 577c9c144d
] [formerly 5b1df2ba1a
[formerly 577c9c144d
[formerly 81a40e8324f38f819039d179889b4b7c016d3dfe]]]]
Former-commit-id: 5b1df2ba1a
Former-commit-id: 1b8f7e9ef0
[formerly a4bbf3c07a
] [formerly fcb496edc220202e948fdedecf6d596a4b97b012 [formerly c614e29a9c
]]
Former-commit-id: c940d91b16949930da8875b2c1b5b34710b0d542 [formerly 8641f8617a
]
Former-commit-id: 37ac8759d5
2013-04-17 09:33:06 -05:00
Bryan Kowal
ad6f08881b
Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
...
Former-commit-id: 3ce54b57bf
[formerly 3ac089fbf8
] [formerly 0a92ecca56
] [formerly 3ce54b57bf
[formerly 3ac089fbf8
] [formerly 0a92ecca56
] [formerly a2cd90e16a
[formerly 0a92ecca56
[formerly 43f7cd079a103ad11d21a903438aac5736d88654]]]]
Former-commit-id: a2cd90e16a
Former-commit-id: 3d3978671a
[formerly 2f4b108057
] [formerly c2f6ca580b63c3a27433272e519e77d2f90aa042 [formerly 74ba9ebc3f
]]
Former-commit-id: b596fbc17046fee12a16eb3e8b0d6b949d814d8b [formerly 15af31e90f
]
Former-commit-id: 69c1d4c465
2013-04-16 17:01:45 -05:00
Bryan Kowal
621a9a740d
Issue #1835 - update LDM to 6.11.2
...
- fixed hard-coded 6.8.1 version
Change-Id: Id201ea8703dd67e3b7aaadd9787fa97be2da8890
Former-commit-id: d7fba83690
[formerly dfd75571f3
] [formerly 890a6c0afb
] [formerly d7fba83690
[formerly dfd75571f3
] [formerly 890a6c0afb
] [formerly ba3a0ad7d5
[formerly 890a6c0afb
[formerly 72ffc3204a1fa40fe2ae17801013cb93cd2961b8]]]]
Former-commit-id: ba3a0ad7d5
Former-commit-id: 6e93716097
[formerly fc4e0af835
] [formerly 988bbc7b5ea322a6008397048e527d3ad02d4508 [formerly 6ef61185c9
]]
Former-commit-id: 1df7a38db89e811b2b9b8f633d4055536286ffa9 [formerly 77242640b8
]
Former-commit-id: 8cc6de9e57
2013-04-16 16:32:58 -05:00
Brad Gonzales
9ac62c4895
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: c7318522e1
[formerly 005c935be6
] [formerly dc37712fda
] [formerly c7318522e1
[formerly 005c935be6
] [formerly dc37712fda
] [formerly b75ef08190
[formerly dc37712fda
[formerly 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95]]]]
Former-commit-id: b75ef08190
Former-commit-id: 2c2f7f7edf
[formerly a21b495206
] [formerly a9e91f46554d9caefb1866f0820680559c325801 [formerly 16f030294d
]]
Former-commit-id: 2d564f9f951487593ec967d020cee8f30658ea64 [formerly 00c0f59b6b
]
Former-commit-id: 4a086703ea
2013-04-16 14:44:06 -05:00
Mike Duff
3ffce069e0
Issue #1786 - fix null pointer
...
Change-Id: Ie7bf3aa9afe6a8dcd9d288afc0e6dc537fdf043d
Former-commit-id: bc8ea0c031
[formerly ad08e0a6ac
] [formerly 6b909c7902
] [formerly bc8ea0c031
[formerly ad08e0a6ac
] [formerly 6b909c7902
] [formerly 7701902083
[formerly 6b909c7902
[formerly 6f14dfd04a696c71e2b2c9d12b86549287e7f0de]]]]
Former-commit-id: 7701902083
Former-commit-id: 53d8d2052c
[formerly 69dd972313
] [formerly f124021c7e3b89007a640c8dc93ef8657c1055a5 [formerly 53c87a865c
]]
Former-commit-id: bfb2f8e9478544c3c4bb17de5b41b9a3cfa499c6 [formerly 4c9edcec56
]
Former-commit-id: 6cbaa20526
2013-04-16 14:21:28 -05:00
Richard Peter
02428a03c0
Merge "Issue #1787 Fixed to support changes to D2D grid location" into omaha_13.4.1
...
Former-commit-id: 244e7ab8da
[formerly 30e77171ab
] [formerly 390bf03c39
] [formerly 244e7ab8da
[formerly 30e77171ab
] [formerly 390bf03c39
] [formerly 5a11d3cc1c
[formerly 390bf03c39
[formerly 73e3a04a98ced3670c61b5debacdfc79d494ab29]]]]
Former-commit-id: 5a11d3cc1c
Former-commit-id: 865883a366
[formerly 4ed90bf67a
] [formerly d87a04feb7e6045446d19ab85351d3ff8bbcfc93 [formerly 6be394ba64
]]
Former-commit-id: 34fb3acaa8ea91a8bc7f1711b794a9c11e20ef9e [formerly d2354e13ec
]
Former-commit-id: e4c7161748
2013-04-16 09:35:12 -05:00
Ron Anderson
c0f2c84b19
Issue #1787 Fixed to support changes to D2D grid location
...
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c
Former-commit-id: f0e2bf8755
[formerly 4ea01a29ce
] [formerly c233ce042d
] [formerly f0e2bf8755
[formerly 4ea01a29ce
] [formerly c233ce042d
] [formerly 4cd87f2726
[formerly c233ce042d
[formerly 5a15d9add4f47cb2016bbd453008039cef8f765f]]]]
Former-commit-id: 4cd87f2726
Former-commit-id: f10107fef4
[formerly 24a6a3590f
] [formerly c8230f228e91a9f3155cde9baf0651765c522e16 [formerly e9f674a575
]]
Former-commit-id: f8d56d18af251880f893a19b401fdc01b452c187 [formerly 89a2d99bfe
]
Former-commit-id: 4dd37ae7cd
2013-04-15 18:02:47 -05:00
Dave Hladky
99d0c3901c
Issue #1890 moved date keys to references in FFMPRecord instead of hard object in FFMPBasin
...
Change-Id: I840e0805422686856744f0d39dda0aeac4755bb8
Former-commit-id: bb6814beef
[formerly c52445652a
] [formerly 60fa768195
] [formerly bb6814beef
[formerly c52445652a
] [formerly 60fa768195
] [formerly 978e68d893
[formerly 60fa768195
[formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]]]
Former-commit-id: 978e68d893
Former-commit-id: 1ca77b427f
[formerly d0ec4f0d87
] [formerly c72d0a748e1272940a038261a3b8315e8fd1eeee [formerly 5789936212
]]
Former-commit-id: a2225196ae722fa9348d20acb31f2d406f2af39b [formerly 0f7843f0b7
]
Former-commit-id: 14a08d6f66
2013-04-15 17:58:06 -05:00
Bryan Kowal
de0546ca99
Issue #1814 - use the AWIPS II log4j.xml for qpid
...
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1
Former-commit-id: 715befa75c
[formerly e720bf74b5
] [formerly e00a6207a5
] [formerly 715befa75c
[formerly e720bf74b5
] [formerly e00a6207a5
] [formerly 35b956fc4c
[formerly e00a6207a5
[formerly b7297cb67055cafdef19595e0e0a481a33a9552e]]]]
Former-commit-id: 35b956fc4c
Former-commit-id: 02f01470fc
[formerly 49b9046bb4
] [formerly a0bd420b00b18b43fbffb1d90f2d5c751a02e44a [formerly cbc2742070
]]
Former-commit-id: f2ac9bf75c2eac62c3ddae97b705ade27423325b [formerly 39bae3cc54
]
Former-commit-id: 6ad82744d2
2013-04-15 16:38:00 -05:00
Lee Venable
99bf297190
Merge "Issue #1902 - FFMP permormance/cleanup peer review comments" into omaha_13.4.1
...
Former-commit-id: c23b6d31d5
[formerly 9ae56e2172
] [formerly 8723d88a19
] [formerly c23b6d31d5
[formerly 9ae56e2172
] [formerly 8723d88a19
] [formerly 8c8709f4a6
[formerly 8723d88a19
[formerly 042819679ba8e0d22695b41059772da841619f29]]]]
Former-commit-id: 8c8709f4a6
Former-commit-id: 953d3f79fb
[formerly b18fa4f6bf
] [formerly 3ebd30bd68f66548fee71c2096f5598c7cdba3aa [formerly 1674a59ed3
]]
Former-commit-id: b694b850da12576a75b20bb91bfeb2f285ef290a [formerly ec3f0c0a11
]
Former-commit-id: 783df0394c
2013-04-15 15:33:53 -05:00
Richard Peter
06b54e67c5
Issue #1814 : Change baseline memory configuration and baseline default log configuration
...
Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3
Former-commit-id: 81749b9af5
[formerly c10d2f7520
] [formerly 0c869ee231
] [formerly 81749b9af5
[formerly c10d2f7520
] [formerly 0c869ee231
] [formerly 78b230aaaf
[formerly 0c869ee231
[formerly 6ce6d876a153a6fe0fd1c4939dae8b719ec470e3]]]]
Former-commit-id: 78b230aaaf
Former-commit-id: 227dcdbd81
[formerly a281d26608
] [formerly 9271b9a667b720d809e7d8db48bb876251b35cf8 [formerly d967301cfc
]]
Former-commit-id: b526a87e57e2ff9413674036431ad8b679510a09 [formerly 4e9789f56d
]
Former-commit-id: ec77d423fe
2013-04-15 12:52:40 -05:00
Mike Duff
c53f202b19
Issue #1902 - FFMP permormance/cleanup
...
peer review comments
Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15
Former-commit-id: dc8e37c0df
[formerly 8271eaf328
] [formerly 020713663a
] [formerly dc8e37c0df
[formerly 8271eaf328
] [formerly 020713663a
] [formerly 85f1aba297
[formerly 020713663a
[formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]]]
Former-commit-id: 85f1aba297
Former-commit-id: 41b00b0d6d
[formerly 7a1809afca
] [formerly 3c48d99b3e2289bad30a4264bbe35a37469181cf [formerly f61bae1c3e
]]
Former-commit-id: 4b99fb61085242237b0321d02bcd5fb3d32fea55 [formerly 812599d8db
]
Former-commit-id: feb9fc93ef
2013-04-15 09:40:07 -05:00
Steve Harris
0d89c11bf1
Merge branch 'master_13.3.1' into omaha_13.4.1
...
Former-commit-id: bc46b3803f
[formerly 97790b0d3e
] [formerly 6dc19411c1
] [formerly bc46b3803f
[formerly 97790b0d3e
] [formerly 6dc19411c1
] [formerly bdefa9f20f
[formerly 6dc19411c1
[formerly cb0c44c44331d64e566905a166abf132f6a5817b]]]]
Former-commit-id: bdefa9f20f
Former-commit-id: c425411d92
[formerly a6ccaf52d4
] [formerly 8c3599e7ee240df84defae2bc7978ccea1279afd [formerly 85bebd026e
]]
Former-commit-id: 8f17443f179dc02a6109a68f0452c0dbc8b41a4e [formerly 7144ec32e9
]
Former-commit-id: b446c96698
2013-04-15 09:37:29 -05:00
Steve Harris
aded012c47
Merge branch 'master_13.3.1' into master_13.4.1
...
Former-commit-id: 9d57ad1675
[formerly 035878a846
] [formerly 7957c52dec
] [formerly 9d57ad1675
[formerly 035878a846
] [formerly 7957c52dec
] [formerly e6d37f3e6d
[formerly 7957c52dec
[formerly 59bd064351a843fd514514de9dc942d13c6d7793]]]]
Former-commit-id: e6d37f3e6d
Former-commit-id: f5ccd224d4
[formerly e11088fefd
] [formerly 0cf541c2cb1fdf3ce52a0d77346996fa9e50b39b [formerly ad51361408
]]
Former-commit-id: 715a0385d4823349042ed884044c65dde8a975bf [formerly 01dfc19f60
]
Former-commit-id: 7dbffd78a1
2013-04-15 09:34:45 -05:00
Steve Harris
99d89adc2e
13.3.1-20 baseline
...
Former-commit-id: 9e73c3f1ed
[formerly 07f7e6e2b4
] [formerly 25432cc388
] [formerly 9e73c3f1ed
[formerly 07f7e6e2b4
] [formerly 25432cc388
] [formerly 446bec6f49
[formerly 25432cc388
[formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]]]
Former-commit-id: 446bec6f49
Former-commit-id: 1749ff8a3c
[formerly 8535bceb4c
] [formerly 48c43f807cd6cab814e5d057a67effdc5c9ea638 [formerly 4b71131386
]]
Former-commit-id: 03e22585dd1936fc2af32023a5ae3b65d4f222f9 [formerly 44cd8d47fb
]
Former-commit-id: 953ffdab87
2013-04-15 08:58:59 -05:00
Ron Anderson
f96fdd67ef
Merge "Issue #1845 : Fix gfeNotify with java qpid broker" into omaha_13.4.1
...
Former-commit-id: e129ae4a36
[formerly 4e62fbdd54
] [formerly df06966a09
] [formerly e129ae4a36
[formerly 4e62fbdd54
] [formerly df06966a09
] [formerly 428fdebd9e
[formerly df06966a09
[formerly f23561f863b623b230b19ef2075560507fc61fb6]]]]
Former-commit-id: 428fdebd9e
Former-commit-id: c831fc3292
[formerly b60c6b19e6
] [formerly 7037a1c300eb4f108baf28b024ae5151c842fd6c [formerly c4d754d75e
]]
Former-commit-id: 5aadb48146ad8988f94e7065e62dd3b1f0cc181f [formerly e01f6a0f7f
]
Former-commit-id: dca0eeb302
2013-04-15 08:27:42 -05:00
Nate Jensen
4ea7202999
Merge "Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil." into omaha_13.4.1
...
Former-commit-id: d3517fbb70
[formerly ea2c0e6c40
] [formerly b24ccfd7a3
] [formerly d3517fbb70
[formerly ea2c0e6c40
] [formerly b24ccfd7a3
] [formerly a422709ab6
[formerly b24ccfd7a3
[formerly bc12d9c818b72ae16c485a33719817bd15301bca]]]]
Former-commit-id: a422709ab6
Former-commit-id: 0e59bce548
[formerly bee4f5fafd
] [formerly e364f2da4f532bb4457a194e508a8bcd3c974e67 [formerly 32ea01b8b8
]]
Former-commit-id: cd1b8414b4907b1d08d2be7d5ff13465b1732892 [formerly e2f072f2d5
]
Former-commit-id: f1c3f25368
2013-04-12 12:39:12 -05:00
Richard Peter
f9e73b5287
Issue #1845 : Fix gfeNotify with java qpid broker
...
Change-Id: I792b4598a296dcd7a8bafbd89c184dc709fdc193
Former-commit-id: efe0dce3ed
[formerly 4e3e044281
] [formerly 025600f4cb
] [formerly efe0dce3ed
[formerly 4e3e044281
] [formerly 025600f4cb
] [formerly a6ffc663a9
[formerly 025600f4cb
[formerly 9f3806e9579cef66d0a40a290d9d36a089f2b3d6]]]]
Former-commit-id: a6ffc663a9
Former-commit-id: 1900f948ea
[formerly c613cfb4da
] [formerly 39f79af483b4fc0c6b07a413de9dad0dd3860164 [formerly 207b4cafcc
]]
Former-commit-id: 73092e863762bde5401473994af6d738c9656237 [formerly 153e552f8a
]
Former-commit-id: 2110908015
2013-04-12 12:04:54 -05:00
Roger Ferrel
1d036eb29c
Issue #1735 Speed ups for AcarsSoundingRecords and conversion to ThriftClient in MonitorDataUtil.
...
Change-Id: Iaa88a15c0406bf5b0c9ffeb5af7f31701be226a9
Former-commit-id: 04ab641171
[formerly 1258e12e11
] [formerly 842852d975
] [formerly 04ab641171
[formerly 1258e12e11
] [formerly 842852d975
] [formerly 4c15be46a0
[formerly 842852d975
[formerly 7cf9c217010a260281480eccdcc4e0b8d83fcd1f]]]]
Former-commit-id: 4c15be46a0
Former-commit-id: a8534ec26f
[formerly 0b7d85a43f
] [formerly 7701c00608738698fe5760f22807ef2cffec9b97 [formerly e3bacfb9f0
]]
Former-commit-id: c26b591296e8b58697fbaeae88fdab31fbcd248d [formerly 94c372088d
]
Former-commit-id: 5a6926dfa3
2013-04-12 11:10:13 -05:00
Bryan Kowal
646d4f067b
Issue #1901 - EDEX will no longer automatically be killed during shutdown
...
Former-commit-id: 45b8575578
[formerly fabebb7adf
] [formerly 36fa6f932b
] [formerly 45b8575578
[formerly fabebb7adf
] [formerly 36fa6f932b
] [formerly 81423bdca1
[formerly 36fa6f932b
[formerly 5b6452684b4a64620586e265f54dbcfa15c974ff]]]]
Former-commit-id: 81423bdca1
Former-commit-id: 90a8ca12d2
[formerly d2cb482ead
] [formerly 609c94b5216a83b09b52f79feb470218cac58979 [formerly 694e7fe9ee
]]
Former-commit-id: 8c1a7fda765eab54cc27b183d9a9717bfa14e11c [formerly 28570210c6
]
Former-commit-id: 272441938c
2013-04-12 10:36:15 -05:00
David Gillingham
e7e405a2b8
Issue #1898 : Modify service backup export_configuration script to also include site's map bundles.
...
Former-commit-id: a3003e5e07
[formerly 967ec40df6
] [formerly d5c8ecc6d3
] [formerly a3003e5e07
[formerly 967ec40df6
] [formerly d5c8ecc6d3
] [formerly 7303425900
[formerly d5c8ecc6d3
[formerly d197bc7fef0ca97f533d5270625b5e696ab29dca]]]]
Former-commit-id: 7303425900
Former-commit-id: 48f984f712
[formerly d9035f421c
] [formerly 39ff6f5c3e931b1e24bfdda8798342c2b31f95c8 [formerly b6201bba2f
]]
Former-commit-id: 6e7ea9ae22125510690ad51699dbbc6463ee34ef [formerly 30493697f8
]
Former-commit-id: 73ea61a34d
2013-04-12 09:50:47 -05:00