Nate Jensen
|
88f9c45cf0
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: 3a41ae85b4 [formerly b025262dc1] [formerly d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]]
Former-commit-id: 080efd3540895c64fe9887513267aae9011cea8d [formerly 4eb941dacb]
Former-commit-id: e4bbe70d57
|
2013-05-29 14:49:43 -05:00 |
|
Nate Jensen
|
8e02ecb717
|
Issue #1989 remove high memory mode, reorganize wrapper.conf
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 6a6484cbb2 [formerly 7059967ae9] [formerly caf414bab0] [formerly 6a6484cbb2 [formerly 7059967ae9] [formerly caf414bab0] [formerly 148b20f57c [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]]]
Former-commit-id: 148b20f57c
Former-commit-id: 043cc9f661 [formerly 47d2bf99b9] [formerly 6fba3fb4deea335c4acb90a32e69115895b885af [formerly 72ed3e21b3]]
Former-commit-id: 3a1b89b6c0c6710bbfe86ce98af9d45d855ff058 [formerly 1fe16c9553]
Former-commit-id: 121dd032bf
|
2013-05-29 12:06:15 -05:00 |
|
Benjamin Phillippe
|
719500006d
|
Issue #2036 Implemented federated query capabilities
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69
Former-commit-id: ec9881b914 [formerly e16dc02a54] [formerly 4747f7d319] [formerly ec9881b914 [formerly e16dc02a54] [formerly 4747f7d319] [formerly d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]]]
Former-commit-id: d5263b2b75
Former-commit-id: a05a910ef9 [formerly c6af8b4d7c] [formerly c7f0b0ec8eb2ed167a7e9c3286f24e4c5995969f [formerly 7cca4d8794]]
Former-commit-id: 3ac8fa77e8866587dc197078d335aef507c7d6d8 [formerly c441b20ddb]
Former-commit-id: a75821e0a6
|
2013-05-29 10:34:22 -05:00 |
|
Dustin Johnson
|
73f483ef24
|
Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
Former-commit-id: 605f2d6136 [formerly 7ca6f18405] [formerly 66c941fc3f] [formerly 605f2d6136 [formerly 7ca6f18405] [formerly 66c941fc3f] [formerly ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]]]
Former-commit-id: ac292f1242
Former-commit-id: 6567c1b6ef [formerly b6c87f42b1] [formerly af8ec40bf2a2deea1a0f9f9b2f678d19fe42a9df [formerly ef43634c56]]
Former-commit-id: 85655b09cdfa7dd8699c15134ee1a6d4eba5b722 [formerly bae8a2436d]
Former-commit-id: 233d827c9c
|
2013-05-29 09:27:30 -05:00 |
|
Richard Peter
|
bd1fa68c70
|
Merge "Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables" into development
Former-commit-id: 16c3723df8 [formerly 6dd22b6dfa] [formerly bc0f1c88fc] [formerly 16c3723df8 [formerly 6dd22b6dfa] [formerly bc0f1c88fc] [formerly 19272c9f28 [formerly bc0f1c88fc [formerly 3a8cb92490910e22e3a9f9247de1748a18686c84]]]]
Former-commit-id: 19272c9f28
Former-commit-id: 6d11397746 [formerly d26eac7bdf] [formerly f547c20d9919ea9e58a5d840b157b5c4ea811426 [formerly 4be6514b57]]
Former-commit-id: e604a80cdf0185bf15c4ef6b7329f0b34fd6b9fb [formerly 3550d07a9c]
Former-commit-id: 6ceeb324e1
|
2013-05-29 09:26:10 -05:00 |
|
Nate Jensen
|
8777604fdd
|
Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c
Former-commit-id: cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: 768a7dad60 [formerly 452858b86f] [formerly db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]]
Former-commit-id: 4de98fe7068aa6e779321f9fb2a37687751247da [formerly 74081dd140]
Former-commit-id: f9d85ac8a9
|
2013-05-29 09:20:53 -05:00 |
|
Mike Duff
|
b1c0253e8e
|
Issue #2016 - fix TS Trace toggle
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4
Former-commit-id: 0babd4d9b4 [formerly 51de726e49] [formerly afbe294f4a] [formerly 0babd4d9b4 [formerly 51de726e49] [formerly afbe294f4a] [formerly 5919687484 [formerly afbe294f4a [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]]]
Former-commit-id: 5919687484
Former-commit-id: d292cfcca0 [formerly d9fd9d297b] [formerly 22647bf8f0aa609c257a8ef84d9b763053337b5e [formerly 66f4e6fe87]]
Former-commit-id: 1b3ef4bdb7d3f5414dce0f0a4ed51881857a7fc6 [formerly 5e3fa8852b]
Former-commit-id: 4d43e81158
|
2013-05-29 09:15:46 -05:00 |
|
Dustin Johnson
|
30ef11dc35
|
Issue #2038 More information when bandwidth manager can't schedule a subscription
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: eef3b4c750 [formerly c76fa3bc2a] [formerly 0a9e7ed740] [formerly eef3b4c750 [formerly c76fa3bc2a] [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: fb15a3e115 [formerly fff0172786] [formerly c0c794b2f4803e4344ff77a743a2e92ff060ff70 [formerly 187a1e49ef]]
Former-commit-id: 5348c297fe02bf4aac1eac5eff84f944b168cb83 [formerly 1fab733472]
Former-commit-id: 4ac1c2cbdb
|
2013-05-29 09:02:47 -05:00 |
|
Nate Jensen
|
05bb7decb3
|
Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development
Former-commit-id: d7391928f9 [formerly ba5e69c7ff] [formerly 7c1e6e8b09] [formerly d7391928f9 [formerly ba5e69c7ff] [formerly 7c1e6e8b09] [formerly 256a67a9f9 [formerly 7c1e6e8b09 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]]]
Former-commit-id: 256a67a9f9
Former-commit-id: 8c756705c5 [formerly ac838f62dd] [formerly 729de173162ed2d04e927cd7b463d674c8aac59e [formerly 2fe1960ebb]]
Former-commit-id: 27996a676d65d2e64694d96a7b8e1865cf87f9f7 [formerly 99a1938d36]
Former-commit-id: 4ac4250fe3
|
2013-05-28 15:43:31 -05:00 |
|
Nate Jensen
|
7327ed122e
|
Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development
Former-commit-id: 5748201316 [formerly cba08666e6] [formerly 053e37ee76] [formerly 5748201316 [formerly cba08666e6] [formerly 053e37ee76] [formerly e846e539fb [formerly 053e37ee76 [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]]]
Former-commit-id: e846e539fb
Former-commit-id: 74bce32a88 [formerly 607e980d45] [formerly 00638cbac9800172a1c3e7bb571d3fdb66dc2446 [formerly 5c60582df2]]
Former-commit-id: fe04e5e5a3405d946477333c1198d488a6c68690 [formerly f1b34d9fdd]
Former-commit-id: 95ddeeb10a
|
2013-05-28 15:43:23 -05:00 |
|
Max Schenkelberg
|
11ea3ffd90
|
Issue #1638 Fixed text box drawn to be correct size with padding around text
Amend: Fixed format string issues with topo resource and colorbar labels
Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114
Former-commit-id: 98bdd5f786 [formerly a88ca5e983] [formerly 13ff44fdee] [formerly 98bdd5f786 [formerly a88ca5e983] [formerly 13ff44fdee] [formerly 3175563336 [formerly 13ff44fdee [formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]]]
Former-commit-id: 3175563336
Former-commit-id: b2a9cba9c7 [formerly 4e8d25b317] [formerly dd33ea8ed195002c13b9b3e4e8d6d9dda70e2d8e [formerly 9932114218]]
Former-commit-id: 67c399b32ce88eaaf485b0b76683adab982ff78e [formerly b3bae339be]
Former-commit-id: 062c4e90cd
|
2013-05-28 15:00:59 -05:00 |
|
Nate Jensen
|
ee18f936c4
|
Issue #1967 fix annoying warnings, remove unused preferences page
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0
Former-commit-id: d479912981 [formerly bd8431b986] [formerly ed7b0fc8c5] [formerly d479912981 [formerly bd8431b986] [formerly ed7b0fc8c5] [formerly 3f85aeb00a [formerly ed7b0fc8c5 [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]]]
Former-commit-id: 3f85aeb00a
Former-commit-id: e94a5b5494 [formerly f7817d7c41] [formerly 755dd253bb4939ea763815cd0328c8e0a0f2daca [formerly 0b48f54f47]]
Former-commit-id: cffae6c820b21f70627ccef42419758b373339fc [formerly e7f6bee025]
Former-commit-id: 4469346bc5
|
2013-05-28 14:30:26 -05:00 |
|
Roger Ferrel
|
c893efdf90
|
Issue #1966 Changes to CategoryConfig to make parsing more efficent.
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87
Former-commit-id: 24f1c70168 [formerly 365af6b7ce] [formerly cbee731447] [formerly 24f1c70168 [formerly 365af6b7ce] [formerly cbee731447] [formerly 9263b54845 [formerly cbee731447 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]]]
Former-commit-id: 9263b54845
Former-commit-id: 618feeda6d [formerly 838eacc802] [formerly e443885c0974b7dc457a2ea698d05b926b780848 [formerly fce5c2ca1e]]
Former-commit-id: fbce5d830fc8e98edbac0da24e3e7e58b05c38b0 [formerly a5db5a53b3]
Former-commit-id: 60820cf776
|
2013-05-28 13:21:08 -05:00 |
|
Max Schenkelberg
|
12b0f3078f
|
Issue #1638 Added support for null search constraints for updates
Amend: Fixed comment, added SW history
Change-Id: Ie8fb8b308bc77976838c6fa36fba9746cfb0a515
Former-commit-id: a91db9c1e3 [formerly 21693d6913] [formerly 1bc4437154] [formerly a91db9c1e3 [formerly 21693d6913] [formerly 1bc4437154] [formerly 807e4501c8 [formerly 1bc4437154 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]]]
Former-commit-id: 807e4501c8
Former-commit-id: ae669fec59 [formerly 6c9fedb312] [formerly 1bee1ded94bdf16e7d08cd81e11f8d384dfa0585 [formerly 036b11c84e]]
Former-commit-id: a51945ee16e3a4a8b670aff1110506b34f67e638 [formerly bafad63987]
Former-commit-id: 0cb45bc6c9
|
2013-05-28 12:59:27 -05:00 |
|
Nate Jensen
|
08d1a83933
|
Issue #2037 made imageMap concurrent to fix memory leak
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f
Former-commit-id: e3caafe7ad [formerly 84444b6ba9] [formerly f77f350eb3] [formerly e3caafe7ad [formerly 84444b6ba9] [formerly f77f350eb3] [formerly 68eba61c28 [formerly f77f350eb3 [formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]]]
Former-commit-id: 68eba61c28
Former-commit-id: 4cb8b766b5 [formerly 50d981285d] [formerly 6b1d9083d66d59225023a96ec8b6bbd68b7d1d44 [formerly af7fcf7e8e]]
Former-commit-id: 6a5f643fac33b5f7beb703ca7155c5d62a9013c2 [formerly 95371e7ec0]
Former-commit-id: 1ee22de2db
|
2013-05-28 09:21:57 -05:00 |
|
Dustin Johnson
|
52d6561920
|
Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
Former-commit-id: c694d523db [formerly f4ad0218f2] [formerly 2b1f75f702] [formerly c694d523db [formerly f4ad0218f2] [formerly 2b1f75f702] [formerly 197a5cef1b [formerly 2b1f75f702 [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]]]
Former-commit-id: 197a5cef1b
Former-commit-id: d8cdc3c8c5 [formerly 8d00ba1978] [formerly 5e3e07d672821d4ad14f8aa22c072b6f5438ab36 [formerly a8fc7295ef]]
Former-commit-id: a12b5f91e880cf22814f5ee0a449226094f531ec [formerly 19274fb903]
Former-commit-id: 834ffed160
|
2013-05-28 06:43:35 -05:00 |
|
Ben Steffensmeier
|
43e8012ad5
|
Issue #1869 Fix unique checking for things without dataURI and with subtables.
Former-commit-id: c2ca1551f6 [formerly cdf8e7daaa] [formerly 3b6156843e] [formerly c2ca1551f6 [formerly cdf8e7daaa] [formerly 3b6156843e] [formerly 7be9ad1f8b [formerly 3b6156843e [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]]]
Former-commit-id: 7be9ad1f8b
Former-commit-id: 84eac56ea0 [formerly c71afc4198] [formerly dc6540df2c7c7dee778134e44e92281971fe7bb5 [formerly 2a8a87e564]]
Former-commit-id: f8a90ff9e375e3bc4319eb7bf4480153d66af25d [formerly b7014d1570]
Former-commit-id: c0e3037695
|
2013-05-24 16:40:21 -05:00 |
|
Mike Duff
|
c99170b497
|
Issue #2020 - Implement Shared Subscriptions Cave-side.
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf
Former-commit-id: e3804d48ec [formerly 80b1f95f0c] [formerly 192ce891d0] [formerly e3804d48ec [formerly 80b1f95f0c] [formerly 192ce891d0] [formerly b6b01c3e81 [formerly 192ce891d0 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]]]
Former-commit-id: b6b01c3e81
Former-commit-id: e7790088ac [formerly 6ee0ef55ff] [formerly bbd9728434e2386f696b8016882158b60232d706 [formerly a9004667b7]]
Former-commit-id: 1a67b61c05159bc4081f57926a9ff0be90dec414 [formerly 53ca005836]
Former-commit-id: 5b21a6cfa4
|
2013-05-24 09:20:55 -05:00 |
|
Nate Jensen
|
cc2e4f8295
|
Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53
Former-commit-id: 29b3e508e2 [formerly 631567ced9] [formerly 7d1fc954f6] [formerly 29b3e508e2 [formerly 631567ced9] [formerly 7d1fc954f6] [formerly 7d233ff590 [formerly 7d1fc954f6 [formerly ef313253ec669167b9e1deb2562170c117123937]]]]
Former-commit-id: 7d233ff590
Former-commit-id: 7fa0ba3069 [formerly e976a4c94e] [formerly 6b94d7fe2342db507b4bed04b7cd4e98b8e66316 [formerly 9e37d21dc6]]
Former-commit-id: f01b8647daca1eedd6ca3dbbfa015814e459bd93 [formerly 543e0c7746]
Former-commit-id: afcf650681
|
2013-05-24 09:13:10 -05:00 |
|
Bryan Kowal
|
af765c36fa
|
Issue #1927 - mimic the EDEX pde build capability for building features outside of the common baseline
Amend: do not run the clean task after building any wa features
Change-Id: I0e6d72b82f4badf49d1d616519cf8d9fc8405f1a
Former-commit-id: 45c9e4d203 [formerly b3d40951ba] [formerly 8145305580] [formerly 45c9e4d203 [formerly b3d40951ba] [formerly 8145305580] [formerly a2148650b4 [formerly 8145305580 [formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]]]
Former-commit-id: a2148650b4
Former-commit-id: 1f0ad9a4a0 [formerly c658131c84] [formerly ee8cf990b046e62c310f31e4215068b2761e859e [formerly 66cf28ab84]]
Former-commit-id: c6d3e0b25cd254abf0cfcea7aeb19ca4159340f6 [formerly 9392da9041]
Former-commit-id: 8998e5cb8f
|
2013-05-23 23:52:35 -05:00 |
|
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 |
|