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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Nate Jensen
|
9637af4b1c
|
Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019
Former-commit-id: 2c6fbd0c68 [formerly bc8d798973] [formerly bfcdcb607a] [formerly 2c6fbd0c68 [formerly bc8d798973] [formerly bfcdcb607a] [formerly d905453660 [formerly bfcdcb607a [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]]]
Former-commit-id: d905453660
Former-commit-id: 009ed8605d [formerly b57c84d12b] [formerly 29c74ab437171949434e0b34fa54e7aeadcdb266 [formerly c3bafc88cd]]
Former-commit-id: 63ab17d89857f4c72875a4b36cdcf089deec1a18 [formerly 75499add43]
Former-commit-id: 2396b63eda
|
2013-05-16 17:13:46 -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 |
|
Nate Jensen
|
298b3ed015
|
Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266
Former-commit-id: b01f942e66 [formerly 9f8654e4ff] [formerly 1ecdd989df] [formerly b01f942e66 [formerly 9f8654e4ff] [formerly 1ecdd989df] [formerly ce2579a289 [formerly 1ecdd989df [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]]]
Former-commit-id: ce2579a289
Former-commit-id: d71f246645 [formerly 53f994c0a8] [formerly 2076bee14faf74bd27ac75d44642ca376db29ce9 [formerly 04c7c4a4da]]
Former-commit-id: 3719af426331d3f6e0af07178ef4589133d1d3c9 [formerly b9bfcead05]
Former-commit-id: 6a1c713e6f
|
2013-05-16 10:25:38 -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 |
|
Richard Peter
|
b273bbc62e
|
Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
Former-commit-id: 55bface874 [formerly 9a8bc5871f] [formerly fc5b621973] [formerly 55bface874 [formerly 9a8bc5871f] [formerly fc5b621973] [formerly a073bf2702 [formerly fc5b621973 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]]]]
Former-commit-id: a073bf2702
Former-commit-id: d3dc818b4d [formerly 671aaba9d9] [formerly af31e934cdfd6faede0ff3cfe67eded5377faa3f [formerly 57698cc95b]]
Former-commit-id: 38615ab734b29000de74fb917a15e321fd838928 [formerly da0fc8057c]
Former-commit-id: ff16d49977
|
2013-05-15 18:14:00 -05:00 |
|
Dustin Johnson
|
3a9c527c52
|
Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
Former-commit-id: 29bdf1cf7e [formerly 28a4f02216] [formerly 8eeb2f4f9c] [formerly 29bdf1cf7e [formerly 28a4f02216] [formerly 8eeb2f4f9c] [formerly d62e51ad7e [formerly 8eeb2f4f9c [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]]]]
Former-commit-id: d62e51ad7e
Former-commit-id: f1217c2623 [formerly 6fa299ecd8] [formerly 3b08746afcd2e96a955f14302d482d194318a5f7 [formerly 00e9f3305d]]
Former-commit-id: 66af9d7b31af34412d5e4dfb1226fa1ecc7dbabb [formerly ab15adabe2]
Former-commit-id: 0f69c0b64d
|
2013-05-15 17:06:42 -05:00 |
|
Dustin Johnson
|
cc22cc26f5
|
Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c
Former-commit-id: 38714c1547 [formerly 695c64a9f4] [formerly 8a9e1f643a] [formerly 38714c1547 [formerly 695c64a9f4] [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 8a9e1f643a [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]]]
Former-commit-id: ef1e80b61f
Former-commit-id: 7f1f50d8b9 [formerly 31fbf71aa2] [formerly c86021e68028c259d0aabec26dbd9c639da89626 [formerly b8d6f54206]]
Former-commit-id: dba720af9d4803f1f30ad86c52b06ec7de70c160 [formerly 6db9b3f8d9]
Former-commit-id: a7a948bf3a
|
2013-05-15 16:54:40 -05:00 |
|
Nate Jensen
|
55e1bc3c3c
|
Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4
Former-commit-id: a818b84f5f [formerly b7076f6947] [formerly 2abccdfe2b] [formerly a818b84f5f [formerly b7076f6947] [formerly 2abccdfe2b] [formerly 662fac5b31 [formerly 2abccdfe2b [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]]]
Former-commit-id: 662fac5b31
Former-commit-id: eb47297ab1 [formerly 8b1298777c] [formerly 2ff5c10f02a0d7646fee845f2165008d3070734a [formerly ae5df55dba]]
Former-commit-id: f0cc9509547a8408a39b42e1b6bcfdd0b303dcd8 [formerly 8cffed1451]
Former-commit-id: 99bd7bc4eb
|
2013-05-15 16:25:23 -05:00 |
|
Ben Steffensmeier
|
d747955f91
|
Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: 84e531ba2c [formerly 89fe0b301d] [formerly 080b43444a] [formerly 84e531ba2c [formerly 89fe0b301d] [formerly 080b43444a] [formerly bbe2667522 [formerly 080b43444a [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]]]
Former-commit-id: bbe2667522
Former-commit-id: 6afa65fd07 [formerly b3a2cd22c7] [formerly 2d0c00b44c52062e4bb1a079d156e9a7a0b2bbdf [formerly f813b40379]]
Former-commit-id: 79b3d6cecdc82a411f33e7b4a0cf38659cb9b6fd [formerly 6333ed4841]
Former-commit-id: 1824606f71
|
2013-05-15 15:35:02 -05:00 |
|
Nate Jensen
|
75548c60a0
|
Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301
Former-commit-id: 25c2e983c1 [formerly c75bfeb9a5] [formerly 9c2b6bad3e] [formerly 25c2e983c1 [formerly c75bfeb9a5] [formerly 9c2b6bad3e] [formerly f4b8c0dc60 [formerly 9c2b6bad3e [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]]]
Former-commit-id: f4b8c0dc60
Former-commit-id: fb7be885b0 [formerly 6caa681ed3] [formerly 9069cdd6843363f31f735d05691b1d9c3ac3ae91 [formerly 0234e6788b]]
Former-commit-id: db84ddfbe9fc0fca2f629a37b1125a0264b003d1 [formerly 2b72b5c530]
Former-commit-id: 546249897b
|
2013-05-15 14:44:30 -05:00 |
|
Richard Peter
|
b9fb88aa95
|
Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: 9112e3b2b0 [formerly 186f7169af] [formerly 286ec23fab] [formerly 9112e3b2b0 [formerly 186f7169af] [formerly 286ec23fab] [formerly bcbe24f489 [formerly 286ec23fab [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]]]]
Former-commit-id: bcbe24f489
Former-commit-id: 54bde542cd [formerly 589fcada8b] [formerly 7f3ecaa744db0e047ec3e78cd18a3055a56c4668 [formerly ce6452daac]]
Former-commit-id: 3ebcf7ea8588f9e68e7ca960f1c0e0ac9a590f92 [formerly 89fc805bfe]
Former-commit-id: 6117554b65
|
2013-05-15 14:41:04 -05:00 |
|
David Gillingham
|
548460bba4
|
Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.
Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d
Former-commit-id: df43f4a624 [formerly 0cbf36df79] [formerly 9c688f7070] [formerly df43f4a624 [formerly 0cbf36df79] [formerly 9c688f7070] [formerly 84158e76c7 [formerly 9c688f7070 [formerly 13d5d8dd7c59fcf399d62e83c9eb7021bca4c2d1]]]]
Former-commit-id: 84158e76c7
Former-commit-id: cde903747e [formerly 9f79748cd2] [formerly a8636a4e98415e0e3d55ec975e4e04cbd7c92415 [formerly ca10ac1598]]
Former-commit-id: 64bc35705c55219582fe0567cdb66be892479739 [formerly fab4021ce4]
Former-commit-id: 7f956add77
|
2013-05-15 13:56:53 -05:00 |
|
Ben Steffensmeier
|
330f048d66
|
Issue #1869 Remove DataURI from goes/poes soundings.
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416
Former-commit-id: 61b468a9f5 [formerly 22b20b5f8e] [formerly b905ee013c] [formerly 61b468a9f5 [formerly 22b20b5f8e] [formerly b905ee013c] [formerly 1c3e60a5ff [formerly b905ee013c [formerly 836239896aace50e37896f6219015a75aea117b7]]]]
Former-commit-id: 1c3e60a5ff
Former-commit-id: 676bd25f45 [formerly cb335861c2] [formerly 20ed4a4554d6c5b51d73a5b064aa0c228a1bc816 [formerly 8ea143a147]]
Former-commit-id: 37ce01ea9d49382306b604a118d3474e0c68f44b [formerly ff9ce2b7c4]
Former-commit-id: 7a8b41876e
|
2013-05-15 12:50:08 -05:00 |
|
Richard Peter
|
0f429b89e0
|
Merge "Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen." into development
Former-commit-id: 5714866fc5 [formerly d81cee387b] [formerly 0523d790f8] [formerly 5714866fc5 [formerly d81cee387b] [formerly 0523d790f8] [formerly 82ccd32ee0 [formerly 0523d790f8 [formerly 3abbb84fdb4b2a9e52757d4b5f2e8cb9fb94899e]]]]
Former-commit-id: 82ccd32ee0
Former-commit-id: 9b717cdeea [formerly e0c4287959] [formerly 27cc1cc3fc9fe261074c7a9de671269bbc5b9df3 [formerly b40e0ca1c9]]
Former-commit-id: eda0a11482b84ccb38cc8a9693c5ea13d48b7463 [formerly 69ce5d7529]
Former-commit-id: d847f413af
|
2013-05-15 12:44:48 -05:00 |
|
Richard Peter
|
56cc89710e
|
Merge "Issue #1869 Revert changes to bufrmos types used by ncep." into development
Former-commit-id: 60a4188f71 [formerly b687ddef04] [formerly f1d65e7028] [formerly 60a4188f71 [formerly b687ddef04] [formerly f1d65e7028] [formerly 48b67522d5 [formerly f1d65e7028 [formerly ce880367eb70abdd85664841e3775142f6e28c50]]]]
Former-commit-id: 48b67522d5
Former-commit-id: 9ad1a480b7 [formerly 11b33a5b14] [formerly b8c78f36b1d54e7e04b3aaf573e5c0adf1294f6f [formerly aa3ef28527]]
Former-commit-id: d625e98fc125a6d40146cef2354875f5b5f31846 [formerly 3e60ceec03]
Former-commit-id: 04be1d3807
|
2013-05-15 12:44:28 -05:00 |
|
Ben Steffensmeier
|
303f78c36c
|
Issue #1869 Revert changes to bufrmos types used by ncep.
Former-commit-id: b4d305a294 [formerly 507ce28888] [formerly 62b85f3afe] [formerly b4d305a294 [formerly 507ce28888] [formerly 62b85f3afe] [formerly dd320f2a56 [formerly 62b85f3afe [formerly 71808a9d82233a395c5e5a394b0708b07405f553]]]]
Former-commit-id: dd320f2a56
Former-commit-id: ba431afe94 [formerly 884922687e] [formerly 2e8fafbd0cebabab9a93928b43dce63087f74a5a [formerly 27b0b4a289]]
Former-commit-id: db209fe116e60bf2d98255a94ca37075cceafab8 [formerly 7ce819184a]
Former-commit-id: 1846170387
|
2013-05-15 11:45:51 -05:00 |
|
Dustin Johnson
|
4b96e46b34
|
Merge "Issue #2000 Fix reinitializing of bandwidth manager" into development
Former-commit-id: c6fa2f32bf [formerly a00364b294] [formerly 8a70a773d5] [formerly c6fa2f32bf [formerly a00364b294] [formerly 8a70a773d5] [formerly c88be3579c [formerly 8a70a773d5 [formerly f300554c735266999f57e0331eda63420e5a6ef3]]]]
Former-commit-id: c88be3579c
Former-commit-id: 481448d7e5 [formerly bd7c38a160] [formerly cdf0ad13731bf68d4757c42695e449473ae213b4 [formerly 8c26413d23]]
Former-commit-id: 8825a05e4b32a73bac97ca0e563cb9ad5f2ad61a [formerly 8276c2a9c9]
Former-commit-id: dbde58d5eb
|
2013-05-15 10:50:53 -05:00 |
|
Dustin Johnson
|
07e46d67b1
|
Issue #2000 Fix reinitializing of bandwidth manager
Change-Id: I8af056eea7d40a13e9189afa81414f7088690267
Former-commit-id: 0116e7d8eb [formerly b700ef7a95] [formerly e38e8d7dc5] [formerly 0116e7d8eb [formerly b700ef7a95] [formerly e38e8d7dc5] [formerly e374011c49 [formerly e38e8d7dc5 [formerly 1073806e6f0a84da0538160d83ee3c12b92d84d5]]]]
Former-commit-id: e374011c49
Former-commit-id: f8f13e2df7 [formerly b6a3c3ae80] [formerly 2a13a12e33f3def4628a8d4825d9db80db97e449 [formerly 98d99250b2]]
Former-commit-id: 1307f944d20ca6686d6659f27ae54e1ed3a729d6 [formerly c2c849fe7e]
Former-commit-id: 7240a99ce7
|
2013-05-15 10:24:33 -05:00 |
|
Richard Peter
|
a01285caea
|
Merge "Issue #1869 Remove DataURI column from bufrmos. Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e" into development
Former-commit-id: c5fd30cc75 [formerly 1a7fbec35e] [formerly f1920eb8d9] [formerly c5fd30cc75 [formerly 1a7fbec35e] [formerly f1920eb8d9] [formerly 47124d2411 [formerly f1920eb8d9 [formerly 5c73f61cf2401ccc901771f92147bfb4bc6d9c25]]]]
Former-commit-id: 47124d2411
Former-commit-id: 988b13568b [formerly 1a5bb1a9d5] [formerly 0cbdc780eedd77f2c627579858cde2eb3b5dca17 [formerly f4974ebd19]]
Former-commit-id: 1d8e1b961915c722d5a41f096bf38b55d01237cb [formerly 6cc24d855f]
Former-commit-id: a9a4b2cfcc
|
2013-05-15 10:00:19 -05:00 |
|