Steve Harris
7e31d1a9a1
13.4.1-13 baseline
...
Former-commit-id: 9a7ef48967
[formerly e3b8086bd0
] [formerly 87b9712009
] [formerly 9a7ef48967
[formerly e3b8086bd0
] [formerly 87b9712009
] [formerly de476791fb
[formerly 87b9712009
[formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]]
Former-commit-id: de476791fb
Former-commit-id: 70ecafa237
[formerly 418f8aef56
] [formerly 0455657ac09be5391a236a0b109f8e55687afaa3 [formerly b58cf237bf
]]
Former-commit-id: 28cd3469f8ef78216f243c61430c36c1ad67dd52 [formerly c9155c1631
]
Former-commit-id: 176f4d392f
2013-05-29 16:30:09 -04:00
Ben Steffensmeier
554e1183f8
Issue #1869 fix plot updates, broken by earlier commit.
...
Former-commit-id: a3b2efc2b4
[formerly b32a5b1c00
] [formerly d2e01ee1f2
] [formerly a3b2efc2b4
[formerly b32a5b1c00
] [formerly d2e01ee1f2
] [formerly cbc3b0a9a4
[formerly d2e01ee1f2
[formerly a9240b60e4643b43880d2be76580dc85999eb897]]]]
Former-commit-id: cbc3b0a9a4
Former-commit-id: 4555ef990c
[formerly 6b7958c834
] [formerly 060cda1b75778126734603e80699b9f5cae37ac8 [formerly d90ca1696e
]]
Former-commit-id: fe301abd5674c07e7a298d2109bed20421ccea2a [formerly 47dba49e8d
]
Former-commit-id: 75b800be90
2013-05-29 15:00:04 -05:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Nate Jensen
9a18e30b74
Merge "Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource." into development
...
Former-commit-id: c7868a028e
[formerly 9a3f855a1a
] [formerly 39543d7ee0
] [formerly c7868a028e
[formerly 9a3f855a1a
] [formerly 39543d7ee0
] [formerly 6ef214f1b8
[formerly 39543d7ee0
[formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]]]
Former-commit-id: 6ef214f1b8
Former-commit-id: 8ff1aae296
[formerly 7f58e8a568
] [formerly 45406f4e5394c5620f8f9c11ae40ea432dc3982e [formerly ffa74c3bdb
]]
Former-commit-id: 92cae226d845513b55b72a82416dfd545fb6e6d6 [formerly 3f2bb17ce4
]
Former-commit-id: 779a299440
2013-05-16 18:02:20 -05:00
Ben Steffensmeier
5c26308dca
Issue #1869 Remove DataURI column from qc.
...
Former-commit-id: c7b7f58de8
[formerly 89b4bd571a
] [formerly c0d8dad8ae
] [formerly c7b7f58de8
[formerly 89b4bd571a
] [formerly c0d8dad8ae
] [formerly f2b11b8a49
[formerly c0d8dad8ae
[formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 7651920be7
[formerly 777f12fbad
] [formerly 50574b57e3d993a195cef03df3a9392ebf66dafd [formerly 6353b7e04b
]]
Former-commit-id: adc1338b1816b6406b4e3a457d2c77661d6cb3a7 [formerly 998330955a
]
Former-commit-id: ea3d3660f3
2013-05-16 17:48:37 -05:00
Steve Harris
721e568859
Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
Former-commit-id: f9535abb10
[formerly 87a31f9990
] [formerly 16ba74496d
] [formerly f9535abb10
[formerly 87a31f9990
] [formerly 16ba74496d
] [formerly b76d359695
[formerly 16ba74496d
[formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]]
Former-commit-id: b76d359695
Former-commit-id: 9b898a6478
[formerly b5d3ff1867
] [formerly 499736d4d7405319cf1c0593daa813e5d6e14ff6 [formerly 26664e6615
]]
Former-commit-id: da72fecb259457811b70cacd5d31fd4a085b41bd [formerly 4827d8f1d9
]
Former-commit-id: 34145afafe
2013-05-16 13:45:58 -05:00
Bryan Kowal
0e982dd20b
Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds
...
- The new p2 director is not able to install zipped repositories; so, each repository
is now unzipped before installation during the CAVE Assembly phase of the Windows
32-bit build
- Adjusted the order of the p2 repositories are built so Windows will install them
in the correct order during the CAVE Assembly phase of the Windows 32-bit build
Former-commit-id: da601e2c35
[formerly dccc6e4a96
] [formerly 7e849f0af3
] [formerly da601e2c35
[formerly dccc6e4a96
] [formerly 7e849f0af3
] [formerly 22d4494918
[formerly 7e849f0af3
[formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]]]
Former-commit-id: 22d4494918
Former-commit-id: ad92c1c79e
[formerly 88cc3a6011
] [formerly bc694aaf1872e8bd9a930f4cc339550e297ab627 [formerly 560fb81038
]]
Former-commit-id: 9ec6370be28f2b472c45e03272645e471c1fe428 [formerly e95c2d36b4
]
Former-commit-id: 7446376b42
2013-05-16 11:01:40 -05:00
Max Schenkelberg
64b917ed3b
Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource.
...
Amend: Corrected ticket number
Change-Id: Ice336b6b4fb286dd4905f43b6f16259f23dea0c6
Former-commit-id: 33f7156a45
[formerly 62efca5041
] [formerly 67e0d17aed
] [formerly 33f7156a45
[formerly 62efca5041
] [formerly 67e0d17aed
] [formerly 8b4d47c690
[formerly 67e0d17aed
[formerly dad0108065ac5f208f59ce6bc6493000278e2c21]]]]
Former-commit-id: 8b4d47c690
Former-commit-id: 6ddb455763
[formerly a3ad1c7c45
] [formerly 9c30edc05a7e1827e11b53976977decdf367c0eb [formerly 0038138fdc
]]
Former-commit-id: 40f28fd18b2fab46805a6d5d8bcf4d24c169b81c [formerly 91d38b1e87
]
Former-commit-id: 012be9fc97
2013-05-16 10:54:52 -05:00
Steve Harris
202e373f01
13.4.1-9 baseline
...
Former-commit-id: 301821988e
[formerly 88eee9cbfa
] [formerly bcf7f15c90
] [formerly 301821988e
[formerly 88eee9cbfa
] [formerly bcf7f15c90
] [formerly aff41713f9
[formerly bcf7f15c90
[formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]]
Former-commit-id: aff41713f9
Former-commit-id: 7d55d0e959
[formerly 67a95d07d2
] [formerly b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd
]]
Former-commit-id: a7c4bec32a032d07ef14566103e744b20ea31401 [formerly 3f87ea1a15
]
Former-commit-id: 1730b6c41e
2013-05-16 11:12:07 -04:00
Nate Jensen
d88235afb8
Merge "Issue #1989 removing dead plugins from repo" into development
...
Former-commit-id: 3777b1bdec
[formerly 5b4c91d734
] [formerly 03f93712a2
] [formerly 3777b1bdec
[formerly 5b4c91d734
] [formerly 03f93712a2
] [formerly 367784bd99
[formerly 03f93712a2
[formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]]]
Former-commit-id: 367784bd99
Former-commit-id: c90f9d93c4
[formerly 1355010c38
] [formerly 02ae66490caf635a65f4c6e90eb7bba1df7b05a1 [formerly e4b47d1eb9
]]
Former-commit-id: 2785a34bbe8a1c607b8c364ffe9c42d09ffc2745 [formerly 6408ef5425
]
Former-commit-id: 7549733d5d
2013-05-16 09:27:48 -05:00
Ben Steffensmeier
40a94337d0
Issue #1869 Switch acars back to original plot resource.
...
Change-Id: I7da1e53f7626c73cfb6a9d6e38f0716634db1a85
Former-commit-id: da6bf90b2d
[formerly 5a8118b5a8
] [formerly 51015cd592
] [formerly da6bf90b2d
[formerly 5a8118b5a8
] [formerly 51015cd592
] [formerly 1a1592ea3d
[formerly 51015cd592
[formerly 567b7b5baeb7bbc6b37b5f03927c9f3f34255ebf]]]]
Former-commit-id: 1a1592ea3d
Former-commit-id: 7c5e49cf35
[formerly 4fa2a21323
] [formerly 039dcec9a1c91a057d7e28627ea17b7cb99824f6 [formerly 4a8a5b16af
]]
Former-commit-id: 601b971edf39643b03ec3724bb9b4c3795ab4cab [formerly 3b5a3a8a3b
]
Former-commit-id: 017e025cc6
2013-05-15 18:22:25 -05:00