Richard Peter
|
9845d2e8b7
|
Merge "Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period." into omaha_13.4.1
Former-commit-id: 7aec695890 [formerly 344765c61d] [formerly 979cc8c181] [formerly 7aec695890 [formerly 344765c61d] [formerly 979cc8c181] [formerly 732ae3c832 [formerly 979cc8c181 [formerly 09ec82babbc567bea671b606f3b45e8923c6e831]]]]
Former-commit-id: 732ae3c832
Former-commit-id: 8289c96d1c [formerly e65237b93f] [formerly e8b165061195e5604181a03f4c2901e70131c927 [formerly ec8c77f6f3]]
Former-commit-id: 17ca6fde337547147fb039f0781ab9144af1853f [formerly d48c54529f]
Former-commit-id: f3b67f0d33
|
2013-05-23 18:10:58 -05:00 |
|
Lee Venable
|
05f50370b4
|
Issue #1964 - inital GUI creation
Change-Id: I47d58880066fa2ef284e8911390163624b873381
Former-commit-id: 082df6ccd5 [formerly 4ecb65e4a2] [formerly ae020d3960] [formerly 082df6ccd5 [formerly 4ecb65e4a2] [formerly ae020d3960] [formerly c3328077c8 [formerly ae020d3960 [formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]]]
Former-commit-id: c3328077c8
Former-commit-id: dea017445b [formerly 041d612ea2] [formerly b12a8641a04e64e274355ad4f613a4d32ce96f80 [formerly 9a72abf083]]
Former-commit-id: ee98709e56d28c656d560d652d14192e6decadef [formerly eb7c8a4d93]
Former-commit-id: 9a6c295b62
|
2013-05-23 17:16:31 -05:00 |
|
Roger Ferrel
|
771cc43fb9
|
Issue #1966 Feature plugin for archive.
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771
Former-commit-id: ff1dac4143 [formerly 75a2fc4723] [formerly 9533bb686d] [formerly ff1dac4143 [formerly 75a2fc4723] [formerly 9533bb686d] [formerly e5867cbb79 [formerly 9533bb686d [formerly 4c305c58752e8b974b3f469f82432c92d5acb1f7]]]]
Former-commit-id: e5867cbb79
Former-commit-id: 2e54bc5af6 [formerly ef14a57411] [formerly 3c4155b82503781781c7dbf83bdca26072bfdbec [formerly bdecc2f309]]
Former-commit-id: 03eae2560300f6bba7f282d4697b6083e00a4da8 [formerly 9b90237bcf]
Former-commit-id: a5378d6ba7
|
2013-05-23 13:43:53 -05:00 |
|
Ron Anderson
|
bc0ece31ba
|
Merge "Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest." into omaha_13.4.1
Former-commit-id: f9bedd3aec [formerly 1eb1cffa15] [formerly c0fffc630d] [formerly f9bedd3aec [formerly 1eb1cffa15] [formerly c0fffc630d] [formerly 57c452b085 [formerly c0fffc630d [formerly 339fa8409866f8464eebaf982cdbfc3ae37a8b6b]]]]
Former-commit-id: 57c452b085
Former-commit-id: 0462d29a0f [formerly 9cdf34184d] [formerly 782f51d6eb68810b024cac4035d52bed928b399f [formerly 59d823bf7b]]
Former-commit-id: f44b1ca1fcbc4a1a341f24d6e09c8b80575f1fa6 [formerly e33fd0c95f]
Former-commit-id: 3a44fb51ca
|
2013-05-23 12:12:39 -05:00 |
|
Richard Peter
|
8d69735af5
|
Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period.
Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c
Former-commit-id: cbfe9772c5 [formerly d5c0b86b7a] [formerly b599745012] [formerly cbfe9772c5 [formerly d5c0b86b7a] [formerly b599745012] [formerly 7349808131 [formerly b599745012 [formerly a48084f6cd99a440fcaab025c0178cf1fa17c9bb]]]]
Former-commit-id: 7349808131
Former-commit-id: d4eb77b248 [formerly 53190601f6] [formerly 58c6245c0b25ac72406612c59ba4ec5f003980c0 [formerly f3e0966966]]
Former-commit-id: 7b9c4e5c34cbc503c4e1e2d503397fafc52e7632 [formerly c51e6750b4]
Former-commit-id: 62191a8d82
|
2013-05-23 11:50:34 -05:00 |
|
Nate Jensen
|
de2f575c94
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 3b56918970 [formerly a84a6fe6ae] [formerly f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]]
Former-commit-id: 897e2914605390b57d9f2b46e9b29f5c116a73d9 [formerly 9689640192]
Former-commit-id: eaaf8d1b8a
|
2013-05-23 11:20:40 -05:00 |
|
Nate Jensen
|
b9d9474e7f
|
Merge "Issue #1989 use camel's built-in DirectVm component" into development
Former-commit-id: d7f5eea402 [formerly 876d741ab8] [formerly b8f3307f50] [formerly d7f5eea402 [formerly 876d741ab8] [formerly b8f3307f50] [formerly 3b058175fe [formerly b8f3307f50 [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]]]
Former-commit-id: 3b058175fe
Former-commit-id: a9a2c23e23 [formerly 3287b6ace2] [formerly 8e6e7a123de7f2be6cbdd2bdeddbc88cf44a27ef [formerly 71d9076fe2]]
Former-commit-id: fc20512c805a4b562e8fb3e489335250c0a21817 [formerly 41403a55ed]
Former-commit-id: 7843d83e0d
|
2013-05-23 10:43:15 -05:00 |
|
Richard Peter
|
6d4c39f5e3
|
Merge "Issue #1989 fix clustered routes suspending/starting" into development
Former-commit-id: 25ace04a31 [formerly edd70dfe47] [formerly 57933400b9] [formerly 25ace04a31 [formerly edd70dfe47] [formerly 57933400b9] [formerly 9ca63e7d26 [formerly 57933400b9 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]]]
Former-commit-id: 9ca63e7d26
Former-commit-id: b087cac180 [formerly e150a51871] [formerly e52295b07065a9723da62e04d0bd89a3ddba7ec9 [formerly 7a02b90690]]
Former-commit-id: 53002a55063a4431fa52fbab2658eaf5b6b9bf4c [formerly 6660e05379]
Former-commit-id: 3d65441ec4
|
2013-05-23 10:10:51 -05:00 |
|
Nate Jensen
|
94c13665a9
|
Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: b8e6b1a083 [formerly 882296f823] [formerly c6fc510360ab5dfd2d963fcd65966cfc3d7993fa [formerly 91c8b9ac1d]]
Former-commit-id: ec0257ca11e61995af3a0f051f104254321c312f [formerly 0f319b9721]
Former-commit-id: 73290b1bb6
|
2013-05-23 10:06:28 -05:00 |
|
Mike Duff
|
afc3142888
|
Issue #1902 - fix to forced guidance
Peer review comments
Change-Id: I5c42fad454e42e5697d32e183702de535ecc3e5e
Former-commit-id: 44ef119c41 [formerly b331a68a08] [formerly 11423a7465] [formerly 44ef119c41 [formerly b331a68a08] [formerly 11423a7465] [formerly 2a733fa5f8 [formerly 11423a7465 [formerly ebd633109a62e7a2d8a0b8e3083aaf5680766739]]]]
Former-commit-id: 2a733fa5f8
Former-commit-id: f603c80988 [formerly 2878cde676] [formerly 3698ac621952b956b533e97d2a14a12f002e3478 [formerly 7d177607bf]]
Former-commit-id: 9f4ea3bc120ccb55677c8ae5d8fce8572a9a2e4f [formerly a1dd9d73ba]
Former-commit-id: 12bad74ca8
|
2013-05-23 09:52:07 -05:00 |
|
Greg Armendariz
|
a2725cc46d
|
Merge "Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui" into development
Former-commit-id: 362195f3a3 [formerly 8cf9ef2527] [formerly 2089732453] [formerly 362195f3a3 [formerly 8cf9ef2527] [formerly 2089732453] [formerly db8cf0d35f [formerly 2089732453 [formerly 1b071a6258127495f9f8c419abae65b27519cf6e]]]]
Former-commit-id: db8cf0d35f
Former-commit-id: ddb7f13f18 [formerly c7e028a6ff] [formerly a53888056ffd5a6cde39461a7854aaf44b0cb313 [formerly 287f078150]]
Former-commit-id: 5056bc806c5cced87ed5edae5fb094e830ed4f91 [formerly ba12811ed9]
Former-commit-id: e5c6e02f05
|
2013-05-23 09:10:41 -05:00 |
|
Greg Armendariz
|
f0f31d2c81
|
Merge "Issue #1927 - patch ant includegen task" into development
Former-commit-id: cabcb3e574 [formerly dc9623df11] [formerly 2fe2b0c5fb] [formerly cabcb3e574 [formerly dc9623df11] [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 2fe2b0c5fb [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]]]
Former-commit-id: a4457f8c83
Former-commit-id: 806a417f0f [formerly 7c97422501] [formerly 8b49a871cbda6887cd2b43c7a35a68e7f16bf20e [formerly 270269219c]]
Former-commit-id: 1cc75374aa871e0feaf7158e22e192dd600ac395 [formerly 28475200b6]
Former-commit-id: b0e11947dd
|
2013-05-23 09:10:11 -05:00 |
|
Matt Nash
|
497b73eda1
|
Issue #1871 fix for 64 bit ints from Python to Java
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae
Former-commit-id: 1ecf5d26af [formerly bbc7406812] [formerly bd64f70d1a] [formerly 1ecf5d26af [formerly bbc7406812] [formerly bd64f70d1a] [formerly 30c7ca8d36 [formerly bd64f70d1a [formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]]]
Former-commit-id: 30c7ca8d36
Former-commit-id: e9735dc410 [formerly 230e3d149e] [formerly 98364944a63f530252908f2eab510fc15f4a9823 [formerly ca208f913c]]
Former-commit-id: d5ca4e682343b0d9d3563f3267a259d7b0dc4c84 [formerly 1bfa549b40]
Former-commit-id: 63a4dd32c0
|
2013-05-23 09:07:56 -05:00 |
|
Lee Venable
|
bf70165d9a
|
Merge "Issue #1966 Feature place holders for the dialogs." into development
Former-commit-id: 8f2b44a49e [formerly 6e7ed9e02b] [formerly cb156533f4] [formerly 8f2b44a49e [formerly 6e7ed9e02b] [formerly cb156533f4] [formerly 7245dff8b9 [formerly cb156533f4 [formerly b86a90abaa162805c2790ce007fcf38ea80d9779]]]]
Former-commit-id: 7245dff8b9
Former-commit-id: 664405e247 [formerly a551d4b586] [formerly 1e5540cfa0e146921b014d691a8a622f845a82f2 [formerly 8b13517100]]
Former-commit-id: 3c8249dfee63a01dd63cfaad02b5394672004945 [formerly 415d9b74f7]
Former-commit-id: 236e7b39db
|
2013-05-23 09:05:11 -05:00 |
|
Richard Peter
|
fa9319f65a
|
Merge "Issue #1965 Add org.apache.commons.io package to cots." into development
Former-commit-id: 4dc4b4131d [formerly 895866b6d9] [formerly df415f7088] [formerly 4dc4b4131d [formerly 895866b6d9] [formerly df415f7088] [formerly 041c0ad948 [formerly df415f7088 [formerly 0338f3bb4ccace045099b6b60f338e18e5d05913]]]]
Former-commit-id: 041c0ad948
Former-commit-id: f43c2d9d61 [formerly b28bb05fde] [formerly 261ad7af85056f8723367c153d62ac7a260ce0a3 [formerly 08f45fe832]]
Former-commit-id: a725ed8c8949aca9b5ac7fd4ddecfce5c2dfd765 [formerly 7f4e17f1ae]
Former-commit-id: e54a8c5c78
|
2013-05-23 08:52:47 -05:00 |
|
Roger Ferrel
|
1282bbbe35
|
Issue #1966 Feature place holders for the dialogs.
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f
Former-commit-id: 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]]]
Former-commit-id: d35424df4f
Former-commit-id: 3aa439216d [formerly 760b0f3366] [formerly 71942aa83d41336218c476f9a4456699fc337e09 [formerly 2d4434119d]]
Former-commit-id: 4b447312fbfd772bb147bae920d49ac18c6c401c [formerly 6d3604e629]
Former-commit-id: 3ac1658261
|
2013-05-23 07:36:15 -05:00 |
|
Bryan Kowal
|
c0683ac24d
|
Issue #2019 - the rpm installation will now unpack the correct versions of swt and eclipse ui
Change-Id: Ifce51032be28b17cb8cc2d057863dce1c57922f8
Former-commit-id: a73d607544 [formerly 73dfc7a5e1] [formerly bfd08efaa9] [formerly a73d607544 [formerly 73dfc7a5e1] [formerly bfd08efaa9] [formerly 8061922b70 [formerly bfd08efaa9 [formerly 87f9ac72782df2bd133ac415a28d2c56a984cd07]]]]
Former-commit-id: 8061922b70
Former-commit-id: b85da4c89f [formerly 1469cb15d6] [formerly 7f883b486090bea47bbfeee228a09574a9b949d0 [formerly 83c1e3127e]]
Former-commit-id: 5ccd1f8765d2002b05016968c6cf55d77e21f10a [formerly f13a7f7ca5]
Former-commit-id: 27ad63100f
|
2013-05-22 22:34:45 -05:00 |
|
Bryan Kowal
|
c08dd6be23
|
Issue #1927 - patch ant includegen task
Former-commit-id: fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 40e8f544ea [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]]
Former-commit-id: 24c0728db9
Former-commit-id: 0f23a3a390 [formerly e6cfad1759] [formerly 9b61bbda811981fe5d3e4a80ed88b6107b650443 [formerly 2a17b35e83]]
Former-commit-id: 6660f13270d1f9b3caee0a5a45c859ddb79247bd [formerly 897c70d90c]
Former-commit-id: 58b7ec2195
|
2013-05-22 18:00:43 -05:00 |
|
Nate Jensen
|
ff379da23c
|
Issue #1989 fix clustered routes suspending/starting
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a
Former-commit-id: 516eca979e [formerly 57e560b745] [formerly 4ab1d90d67] [formerly 516eca979e [formerly 57e560b745] [formerly 4ab1d90d67] [formerly a6d525ec96 [formerly 4ab1d90d67 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]]]
Former-commit-id: a6d525ec96
Former-commit-id: 1aa7bda4f9 [formerly 5525412779] [formerly b2203d5e824a80b3594b409d049bc1148ae5c2d7 [formerly 431e97742d]]
Former-commit-id: 935206237ecf216154eb0bf6a019586fdbd80f9a [formerly f1bef6a3ac]
Former-commit-id: 0b6011bc36
|
2013-05-22 16:39:24 -05:00 |
|
Steve Harris
|
6a5b97e11e
|
Merge branch 'omaha_13.4.1' into development
Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]]
Former-commit-id: 3590310f17
Former-commit-id: d477564678 [formerly 389eefd1f9] [formerly 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d]]
Former-commit-id: 95db422c792e933bcfe1e19c2b8955eb8698bece [formerly c184d31779]
Former-commit-id: 61debd93bf
|
2013-05-22 16:13:08 -05:00 |
|
Steve Harris
|
32c2d3e5e9
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]]
Former-commit-id: 462652e31e
Former-commit-id: a6bb8b38dd [formerly 026674d0b2] [formerly 19cf9a00ac458922c15640956ecdf8f46546e349 [formerly 299690a202]]
Former-commit-id: 1b7b8110c512177341c86e9272a2b79f0ae52bbb [formerly bd9b2e493e]
Former-commit-id: 6dbe80b1af
|
2013-05-22 16:10:04 -05:00 |
|
David Gillingham
|
6af35c977c
|
Issue #2025: Re-implement GetLatestDbTimeRequest and GetLatestModelDbIdRequest.
Change-Id: Ie9e58a139eed869a0483a475974ed4b733711bac
Former-commit-id: 63ea2808eb [formerly cf1f45d77f] [formerly 8e8d71dc2f] [formerly 63ea2808eb [formerly cf1f45d77f] [formerly 8e8d71dc2f] [formerly d5895e23c7 [formerly 8e8d71dc2f [formerly d6c6f3f9a6d7d37f22af82984d0d75937b4415cc]]]]
Former-commit-id: d5895e23c7
Former-commit-id: 82e61b31f6 [formerly 2e6f7c8250] [formerly 1cd8a6a6ca2d726353932c69d7adfc7def2761c1 [formerly 0e1135ac1f]]
Former-commit-id: f07ebe70943583bbe914ac2937013617e62bb895 [formerly 135ed9899f]
Former-commit-id: 8706da5f02
|
2013-05-22 15:48:32 -05:00 |
|
Steve Harris
|
cf67535a3a
|
13.4.1-12 baseline
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]]
Former-commit-id: e53ada66b8
Former-commit-id: fb41995981 [formerly b745b332ae] [formerly 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]]
Former-commit-id: 0563320c3a39f9ddb056e9b1876ed4108f818501 [formerly 0d9e71aee2]
Former-commit-id: 71e13c4d4d
|
2013-05-22 16:42:39 -04:00 |
|
Benjamin Phillippe
|
761156f3f5
|
Issue #2022 Removed data delivery project from feature
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd
Former-commit-id: feeb6126bb [formerly 0308f217d6] [formerly 4d1252523e] [formerly feeb6126bb [formerly 0308f217d6] [formerly 4d1252523e] [formerly 3e9fe9892e [formerly 4d1252523e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]]]
Former-commit-id: 3e9fe9892e
Former-commit-id: 09126056a6 [formerly 8cae1b56f1] [formerly fa6325803c190e9467895d087ac2f99cbe7f7004 [formerly ce20ead9e7]]
Former-commit-id: f4b732e2020a95440bd16d9cd4a0fd83e7cf107f [formerly c77d747199]
Former-commit-id: 1b42f5d177
|
2013-05-22 12:49:46 -05:00 |
|
David Gillingham
|
77ccf79293
|
Issue #1759: Fix regression to ISC request reply due to missing import.
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80
Former-commit-id: 511098fffd [formerly 2555cf9819] [formerly 5cba0f5e40] [formerly 511098fffd [formerly 2555cf9819] [formerly 5cba0f5e40] [formerly 801c659108 [formerly 5cba0f5e40 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]]
Former-commit-id: 801c659108
Former-commit-id: 60850d6f8a [formerly 1471a7fa34] [formerly 7464c78970ff1efe18387d6d2105db0eb2e2d4ad [formerly 60aeb71652]]
Former-commit-id: d28086240a58a1bd453231bbbeda47190441083b [formerly dca867b77c]
Former-commit-id: 016ea4ec14
|
2013-05-22 11:42:08 -05:00 |
|
Benjamin Phillippe
|
fbab80357b
|
Issue #2022 Added registry federation capabilities
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028
Former-commit-id: aab1aa57d4 [formerly 7a908bbeaf] [formerly b9f2bde20e] [formerly aab1aa57d4 [formerly 7a908bbeaf] [formerly b9f2bde20e] [formerly c3a376475b [formerly b9f2bde20e [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]]]
Former-commit-id: c3a376475b
Former-commit-id: 99ed99e6d3 [formerly 1c50a8b9d3] [formerly 97b5016d0f29b44e02a2e20c7079fd9348e0adf5 [formerly ad039bae0c]]
Former-commit-id: 03832c7f7c90364359c090a1dfa92e3b5d3e065f [formerly 5fe0928121]
Former-commit-id: bb8c38e9c0
|
2013-05-22 11:38:42 -05:00 |
|
Brad Gonzales
|
16343b603b
|
Issue #1965 Add org.apache.commons.io package to cots.
Change-Id: Ib444054da83b7e7d6062c84e3e1a705a3d4f63ed
Former-commit-id: 819160fcde [formerly 33045d73a6] [formerly 4bc98160ab] [formerly 819160fcde [formerly 33045d73a6] [formerly 4bc98160ab] [formerly 598a7a221e [formerly 4bc98160ab [formerly e04606333b5dd3248a7b7cdb3056d29c15a0036a]]]]
Former-commit-id: 598a7a221e
Former-commit-id: 6811365078 [formerly 6d483764e3] [formerly ca35c74668d7cc1c2b516ca39d37aeba84ced527 [formerly 858f68fc5c]]
Former-commit-id: a9f6bb5c0e2cb1ffd111c07fd21bf4e8649585a6 [formerly 0edf6a9b5e]
Former-commit-id: 52b1009539
|
2013-05-21 16:29:01 -05:00 |
|
Richard Peter
|
c7eba20f0a
|
Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]]
Former-commit-id: b4344d3c04
Former-commit-id: b3c32889b1 [formerly 1bbddf8fdf] [formerly 8928a3d0297f1d5a036e9cf68ec32e5d793580ad [formerly 489fdf49b1]]
Former-commit-id: a7440882bd726d94a23b78fb9f3b0850a75ef7d5 [formerly b3688d78d1]
Former-commit-id: 7d73a32b0a
|
2013-05-21 13:07:51 -05:00 |
|
Greg Armendariz
|
e8e48bfc3a
|
Merge "Issue #1952 - remove duplicate filesystem hierarchy" into development
Former-commit-id: da4e717772 [formerly fce1512b37] [formerly 20a9ad95e5] [formerly da4e717772 [formerly fce1512b37] [formerly 20a9ad95e5] [formerly eecbf2718a [formerly 20a9ad95e5 [formerly 8bc14d47d1ff5ee7314f9dfb71627d97fdec39a3]]]]
Former-commit-id: eecbf2718a
Former-commit-id: bb67a4fe0a [formerly cd96d6d2e6] [formerly faf103cebb41e879d86ec60b59e142420585d7d2 [formerly 525cd5c751]]
Former-commit-id: fffa0de90778de5f8bc468bdfcf5bbba9adf9ed6 [formerly 065e9bd1f9]
Former-commit-id: 8c4a634c5a
|
2013-05-21 12:24:19 -05:00 |
|
Richard Peter
|
c8484145dd
|
Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java
Former-commit-id: efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]]
Former-commit-id: 930ff50fb8
Former-commit-id: ffe0b35085 [formerly 76f11f00ae] [formerly 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]]
Former-commit-id: ec9c4ee8853532d468f5912a752730400ce59ccd [formerly 046de916fd]
Former-commit-id: 7966576f23
|
2013-05-21 12:11:21 -05:00 |
|
Bryan Kowal
|
a8764771b3
|
Issue #1952 - remove duplicate filesystem hierarchy
Former-commit-id: b14dd898ac [formerly e9abe7185b] [formerly 4b8868ca54] [formerly b14dd898ac [formerly e9abe7185b] [formerly 4b8868ca54] [formerly 7027f97e2a [formerly 4b8868ca54 [formerly 51d97b526a708d896c2935baeab27a0ae627960a]]]]
Former-commit-id: 7027f97e2a
Former-commit-id: 1d462b582b [formerly 61a613b490] [formerly 82aa40c3c40fcbbba4f5844ff450074ef0571e57 [formerly 62d21498a6]]
Former-commit-id: 861525a7d8f1ead43051b983132cfd42b9534b4e [formerly 1052f6cd98]
Former-commit-id: f1b7607385
|
2013-05-21 11:09:57 -05:00 |
|
Nate Jensen
|
3d617629d1
|
Merge "Issue #2001 fix message handling" into development
Former-commit-id: 2bf84e9044 [formerly 8438eb1b4a] [formerly 737b265c34] [formerly 2bf84e9044 [formerly 8438eb1b4a] [formerly 737b265c34] [formerly 4d519da3a9 [formerly 737b265c34 [formerly 50ea25c2563c109b92e4251c05174b9b3d077909]]]]
Former-commit-id: 4d519da3a9
Former-commit-id: e464b37ce3 [formerly 0fc260728b] [formerly 23644d491fafa6221b12115945c203db822dd9d5 [formerly d2cccd342b]]
Former-commit-id: c073cebd8d0c14644885dbd3a51e1bf536e2de71 [formerly 9ef848d0c7]
Former-commit-id: 741abd24bb
|
2013-05-21 11:00:32 -05:00 |
|
Richard Peter
|
27c6d6f318
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 8e252f89f0 [formerly 21b87e9ea7] [formerly 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878]]
Former-commit-id: 7abbd80f0599361a183f199c4e0c507ff370195e [formerly 69e6ea4847]
Former-commit-id: 2a8115770f
|
2013-05-21 10:35:00 -05:00 |
|
Nate Jensen
|
53916d0ddf
|
Issue #2001 fix message handling
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b
Former-commit-id: deea93d7e7 [formerly 56309efafe] [formerly 1ab118958f] [formerly deea93d7e7 [formerly 56309efafe] [formerly 1ab118958f] [formerly 960bc6db69 [formerly 1ab118958f [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]]
Former-commit-id: 960bc6db69
Former-commit-id: 22d9440b6a [formerly a06bb176ba] [formerly c70110d442b8e122c8572c0d2850cbac6c42bc1a [formerly e575c19ab6]]
Former-commit-id: 94baa73a7594f7d3c225dc43954967a9ffe4758e [formerly 942855e9f8]
Former-commit-id: c183650ebd
|
2013-05-21 10:26:18 -05:00 |
|
Nate Jensen
|
fc5ea8785a
|
Merge "Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries" into development
Former-commit-id: 8e7905197a [formerly 18e6f84418] [formerly f16606cfba] [formerly 8e7905197a [formerly 18e6f84418] [formerly f16606cfba] [formerly d02ce9d389 [formerly f16606cfba [formerly a6b4bd31146009e3d958efde759408daec52d2f4]]]]
Former-commit-id: d02ce9d389
Former-commit-id: 1c581fd607 [formerly 51a31a08ca] [formerly 8f11dd9f2fd571f626dc03f0b07328cca234dcf7 [formerly 80b1a9d18c]]
Former-commit-id: 217f34cf4252d39aa1e77feeb804500063f84670 [formerly d19e7f9c39]
Former-commit-id: 256721e481
|
2013-05-21 10:22:24 -05:00 |
|
Dustin Johnson
|
7dc0125c17
|
Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]]
Former-commit-id: 8fcc958d84
Former-commit-id: bf3f162fc9 [formerly bd65447c9f] [formerly 5235790c12e2dc92a8f2ee23097bc55d4324c17f [formerly 5695c4f967]]
Former-commit-id: fda3573ffd9d2ba70777c5464631155544a07d85 [formerly 566273cf69]
Former-commit-id: 2cf8ffac1a
|
2013-05-21 08:19:34 -05:00 |
|
Steve Harris
|
603bc2535a
|
13.4.1-11 baseline
Former-commit-id: 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]]
Former-commit-id: c0376ce9ed
Former-commit-id: 5db95cce55 [formerly 4d88863515] [formerly d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48]]
Former-commit-id: b076884dd48bff50b64587e186d178820fa5b5cf [formerly 2767fd893c]
Former-commit-id: d9f967c811
|
2013-05-21 09:19:25 -04:00 |
|
Ben Steffensmeier
|
20d086140b
|
Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9
Former-commit-id: 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]]
Former-commit-id: 931e76ae59
Former-commit-id: bd89419f5e [formerly 30eb486e45] [formerly b4adabb2d10268100118534040b4fed536be1378 [formerly 5147eb18d4]]
Former-commit-id: 2c5b16494b7aca40f1b0a8f7493dcb483fd2f2cf [formerly 9bac8c566c]
Former-commit-id: 4687ddcd62
|
2013-05-20 18:00:32 -05:00 |
|
Richard Peter
|
e797da83e1
|
Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly 59c38fdb78 [formerly e0740990ce [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]]
Former-commit-id: 59c38fdb78
Former-commit-id: 5efe58df0b [formerly 72206676ee] [formerly 36148f00d4aad37c667d7244e309f001bd6335f8 [formerly 8b7cf1beb8]]
Former-commit-id: 53ab371d1386f1626ee68b7d6007336d6c3b7dc8 [formerly 1418dbf556]
Former-commit-id: a664883d97
|
2013-05-20 17:49:22 -05:00 |
|
Roger Ferrel
|
51f7ee1219
|
Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac
Former-commit-id: 0b4fb8d04c [formerly e3c06b643b] [formerly 16c7de874a] [formerly 0b4fb8d04c [formerly e3c06b643b] [formerly 16c7de874a] [formerly dfd586fca6 [formerly 16c7de874a [formerly 57a43dfefb79d49895beace44930db630cd502be]]]]
Former-commit-id: dfd586fca6
Former-commit-id: 0db7741ce5 [formerly 4a5073902f] [formerly 4c43796fabb9d77c96bd1af9250c9c7f64374a79 [formerly c9e6e367fe]]
Former-commit-id: 8cdd9bb974d0abf9d1ed8790138a767f823d702a [formerly 7bf7c508b0]
Former-commit-id: 84b75ff489
|
2013-05-20 17:43:47 -05:00 |
|
Ben Steffensmeier
|
bfd9f1fee4
|
Issue #1869 Remove DataURI column from sat plot types.
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb
Former-commit-id: 7d52bbbaa0 [formerly aa3b8c80f4] [formerly 26e80bbd18] [formerly 7d52bbbaa0 [formerly aa3b8c80f4] [formerly 26e80bbd18] [formerly 885b106652 [formerly 26e80bbd18 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]]]
Former-commit-id: 885b106652
Former-commit-id: a075a5d665 [formerly a03dbd284b] [formerly cbee870e9d200703dc59998e51a5ad2251e0852a [formerly 13b2b4afef]]
Former-commit-id: f653c2ef8daf7d4821708bdf23ecdfcb1ea97798 [formerly 8c9db38335]
Former-commit-id: 4f575058e0
|
2013-05-20 17:27:15 -05:00 |
|
Dustin Johnson
|
97d7d8a52b
|
Issue #2000 Subscription overlap configuration GUI
Amend:
Peer review comments.
Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6
Former-commit-id: 095acb5ac3 [formerly 554347f17c] [formerly 5b62669f8e] [formerly 095acb5ac3 [formerly 554347f17c] [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly 5b62669f8e [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 4d30dc16c6 [formerly 3a504d1e7b] [formerly 97b3d509a5df6b5067753a00490a5ec5d5462760 [formerly 7858a3b57f]]
Former-commit-id: 89d6680a67c8ed3519146cf6dc8353ec7345e96c [formerly d12b26ac1d]
Former-commit-id: a314bd8f4a
|
2013-05-20 17:12:47 -05:00 |
|
Bryan Kowal
|
21b56b64d8
|
Issue #1952 - second modification that will not require re-compilation or upgrades of system libraries
- removed only python 2.5 native libraries
- removed old scripts utilized by IzPack
Former-commit-id: 4452ec48d9 [formerly 5b6fa4e360] [formerly e4cdc64c07] [formerly 4452ec48d9 [formerly 5b6fa4e360] [formerly e4cdc64c07] [formerly 35be00792e [formerly e4cdc64c07 [formerly cf94670fe9807a5253209da892f7305defaf32a8]]]]
Former-commit-id: 35be00792e
Former-commit-id: 075f4bdd6a [formerly 07188502aa] [formerly f6db456f7652fc448445374bbe6b5e50cb0f12a8 [formerly 13febf859e]]
Former-commit-id: 7dea3a2bfc4255427c02513677e61bb635727efc [formerly 1710cd9a3f]
Former-commit-id: 7fd5d33b7c
|
2013-05-20 16:58:56 -05:00 |
|
Bryan Kowal
|
fbdf4d0b7a
|
Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
Former-commit-id: 3a5ae717cb [formerly 081d1c724a] [formerly 99ba7adfe7] [formerly 3a5ae717cb [formerly 081d1c724a] [formerly 99ba7adfe7] [formerly e4874a873a [formerly 99ba7adfe7 [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]]]]
Former-commit-id: e4874a873a
Former-commit-id: 0ad544cd3e [formerly 3f20eed975] [formerly e1ec52afdddf5b48f29ce53fbeaaa24e087bb331 [formerly 31605b7a94]]
Former-commit-id: 21740cdb2416f391e72bba7d9de0075901bb1aad [formerly fbdcd29129]
Former-commit-id: ce778c45ea
|
2013-05-20 15:03:33 -05:00 |
|
Richard Peter
|
653714f52e
|
Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 0d7f36c84c [formerly 8079561032] [formerly 30a61c3e17] [formerly 0d7f36c84c [formerly 8079561032] [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 30a61c3e17 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]]]
Former-commit-id: 3d861eca69
Former-commit-id: 5cfae97674 [formerly e03cf56895] [formerly 8cf1fe91f6ba1e424448c5cb7262a1998e5c2cfc [formerly 0ced8c87e4]]
Former-commit-id: 5da2c4b21999884ff9e2a6246faba4e63d76be99 [formerly b032b405ed]
Former-commit-id: 6a6b25ebda
|
2013-05-20 14:48:47 -05:00 |
|
Steve Harris
|
0b9bf76434
|
13.4.1-10 baseline
Former-commit-id: 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]]
Former-commit-id: 92152778b9
Former-commit-id: ac83fff244 [formerly 7e04d8cd13] [formerly 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b]]
Former-commit-id: 3963e7aafef444157e59ab93198e8eb33ab5acb5 [formerly 322036ea82]
Former-commit-id: b41118326c
|
2013-05-20 10:52:47 -04:00 |
|
Bryan Kowal
|
d21a109185
|
Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
Former-commit-id: dd508d5bdd [formerly db9b06cc9d] [formerly d8ce0f369c] [formerly dd508d5bdd [formerly db9b06cc9d] [formerly d8ce0f369c] [formerly a070d28ecc [formerly d8ce0f369c [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]]]
Former-commit-id: a070d28ecc
Former-commit-id: 1e095fc20b [formerly a52363e2df] [formerly 6bbd21751b1aa7bfaacb409592f0ad2110b3d569 [formerly 7dd9b1e1c0]]
Former-commit-id: f8879e22ec690c4bfa0a9df5cebb8a03091ee44b [formerly bef3b4c74f]
Former-commit-id: 7425d2c695
|
2013-05-17 18:21:03 -05:00 |
|
Richard Peter
|
4a410e92b9
|
Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt
Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c
Former-commit-id: d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]]
Former-commit-id: a9869f07ba
Former-commit-id: f186912fe1 [formerly aff520d61b] [formerly fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]]
Former-commit-id: 597cb507dad744955c6d4c7e9004386c40c57fbc [formerly 969fa704e5]
Former-commit-id: fb910196c0
|
2013-05-17 10:33:18 -05:00 |
|
Bryan Kowal
|
8b2615ae3c
|
Issue #1927 - handle common base until new build implementation
Former-commit-id: 3f924f74b8 [formerly 84c3c114a9] [formerly 63f57de31f] [formerly 3f924f74b8 [formerly 84c3c114a9] [formerly 63f57de31f] [formerly 79816de308 [formerly 63f57de31f [formerly 977de6e3ab58905fada220a766039ff6e014b9ec]]]]
Former-commit-id: 79816de308
Former-commit-id: 0694a91485 [formerly 5d21fa1fd7] [formerly f7807c86dc7b6a81272596cbb22664b42ab2bec4 [formerly 9ea4bab577]]
Former-commit-id: 4d6f6353600e1ebe12d7747fd55afa7f6963342e [formerly 3f4e377f05]
Former-commit-id: bb0432ea77
|
2013-05-16 23:56:47 -05:00 |
|
Max Schenkelberg
|
7e752cffa0
|
Issue #1638 Fixed updates for resource datas that override update without checking update object
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f
Former-commit-id: 71624ccda3 [formerly 4d435d3dd5] [formerly c421240835] [formerly 71624ccda3 [formerly 4d435d3dd5] [formerly c421240835] [formerly d07de0870f [formerly c421240835 [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]]]
Former-commit-id: d07de0870f
Former-commit-id: 0c954fc284 [formerly 7ce0b7ef13] [formerly ccf927342ef0766ab38c884f7d5b2cc881d0fb52 [formerly a94469df82]]
Former-commit-id: 35a8dce332b5100cbbddbe7f715be4d0882e97d4 [formerly 6adbb139ab]
Former-commit-id: 9921ea5cb1
|
2013-05-16 18:04:26 -05:00 |
|