Nate Jensen
|
043cc9f661
|
Issue #1989 remove high memory mode, reorganize wrapper.conf
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 6a6484cbb2 [formerly 7059967ae9] [formerly caf414bab0] [formerly 148b20f57c [formerly caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]]]
Former-commit-id: 148b20f57c
Former-commit-id: 6fba3fb4deea335c4acb90a32e69115895b885af [formerly 72ed3e21b3]
Former-commit-id: 47d2bf99b9
|
2013-05-29 12:06:15 -05:00 |
|
Benjamin Phillippe
|
a05a910ef9
|
Issue #2036 Implemented federated query capabilities
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69
Former-commit-id: ec9881b914 [formerly e16dc02a54] [formerly e7f17cb73caba0c3830169a9b341f90b58134c89 [formerly 4747f7d319]] [formerly d5263b2b75 [formerly 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]]]
Former-commit-id: d5263b2b75
Former-commit-id: c7f0b0ec8eb2ed167a7e9c3286f24e4c5995969f [formerly 7cca4d8794]
Former-commit-id: c6af8b4d7c
|
2013-05-29 10:34:22 -05:00 |
|
Dustin Johnson
|
6567c1b6ef
|
Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
Former-commit-id: 605f2d6136 [formerly 7ca6f18405] [formerly 66c941fc3f] [formerly ac292f1242 [formerly 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]]
Former-commit-id: ac292f1242
Former-commit-id: af8ec40bf2a2deea1a0f9f9b2f678d19fe42a9df [formerly ef43634c56]
Former-commit-id: b6c87f42b1
|
2013-05-29 09:27:30 -05:00 |
|
Nate Jensen
|
768a7dad60
|
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 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]
Former-commit-id: 452858b86f
|
2013-05-29 09:20:53 -05:00 |
|
Dustin Johnson
|
fb15a3e115
|
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 31e01a9f9a [formerly 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: c0c794b2f4803e4344ff77a743a2e92ff060ff70 [formerly 187a1e49ef]
Former-commit-id: fff0172786
|
2013-05-29 09:02:47 -05:00 |
|
Roger Ferrel
|
618feeda6d
|
Issue #1966 Changes to CategoryConfig to make parsing more efficent.
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87
Former-commit-id: 24f1c70168 [formerly 365af6b7ce] [formerly cbee731447] [formerly 9263b54845 [formerly cbee731447 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]]
Former-commit-id: 9263b54845
Former-commit-id: e443885c0974b7dc457a2ea698d05b926b780848 [formerly fce5c2ca1e]
Former-commit-id: 838eacc802
|
2013-05-28 13:21:08 -05:00 |
|
Max Schenkelberg
|
ae669fec59
|
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 807e4501c8 [formerly 1bc4437154 [formerly 9fb8f08aa2068b9249b09ccba555907c40541217]]]
Former-commit-id: 807e4501c8
Former-commit-id: 1bee1ded94bdf16e7d08cd81e11f8d384dfa0585 [formerly 036b11c84e]
Former-commit-id: 6c9fedb312
|
2013-05-28 12:59:27 -05:00 |
|
Dustin Johnson
|
d8cdc3c8c5
|
Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development
Former-commit-id: c694d523db [formerly f4ad0218f2] [formerly 2b1f75f702] [formerly 197a5cef1b [formerly 2b1f75f702 [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]]
Former-commit-id: 197a5cef1b
Former-commit-id: 5e3e07d672821d4ad14f8aa22c072b6f5438ab36 [formerly a8fc7295ef]
Former-commit-id: 8d00ba1978
|
2013-05-28 06:43:35 -05:00 |
|
Ben Steffensmeier
|
84eac56ea0
|
Issue #1869 Fix unique checking for things without dataURI and with subtables.
Former-commit-id: c2ca1551f6 [formerly cdf8e7daaa] [formerly 37df42633ad7fbcc51bf28d03f3ac6f82040b570 [formerly 3b6156843e]] [formerly 7be9ad1f8b [formerly 3b6156843e [formerly 3f600c5e7b0fb53aff7c8c594e5ca58c4f8250ef]]]
Former-commit-id: 7be9ad1f8b
Former-commit-id: dc6540df2c7c7dee778134e44e92281971fe7bb5 [formerly 2a8a87e564]
Former-commit-id: c71afc4198
|
2013-05-24 16:40:21 -05:00 |
|
Mike Duff
|
e7790088ac
|
Issue #2020 - Implement Shared Subscriptions Cave-side.
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf
Former-commit-id: e3804d48ec [formerly 80b1f95f0c] [formerly 9cee487b71f7329909bd95a36c355637b4bb4978 [formerly 192ce891d0]] [formerly b6b01c3e81 [formerly 192ce891d0 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]]
Former-commit-id: b6b01c3e81
Former-commit-id: bbd9728434e2386f696b8016882158b60232d706 [formerly a9004667b7]
Former-commit-id: 6ee0ef55ff
|
2013-05-24 09:20:55 -05:00 |
|
Nate Jensen
|
3b56918970
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]
Former-commit-id: a84a6fe6ae
|
2013-05-23 11:20:40 -05:00 |
|
Nate Jensen
|
a9a2c23e23
|
Merge "Issue #1989 use camel's built-in DirectVm component" into development
Former-commit-id: d7f5eea402 [formerly 876d741ab8] [formerly b8f3307f50] [formerly 3b058175fe [formerly b8f3307f50 [formerly f608d0ec297d85ba3e72c23905375f086fef2477]]]
Former-commit-id: 3b058175fe
Former-commit-id: 8e6e7a123de7f2be6cbdd2bdeddbc88cf44a27ef [formerly 71d9076fe2]
Former-commit-id: 3287b6ace2
|
2013-05-23 10:43:15 -05:00 |
|
Richard Peter
|
b087cac180
|
Merge "Issue #1989 fix clustered routes suspending/starting" into development
Former-commit-id: 25ace04a31 [formerly edd70dfe47] [formerly 57933400b9] [formerly 9ca63e7d26 [formerly 57933400b9 [formerly 6b013a490dd450de349fbe40f0fd5b8ca7a86efa]]]
Former-commit-id: 9ca63e7d26
Former-commit-id: e52295b07065a9723da62e04d0bd89a3ddba7ec9 [formerly 7a02b90690]
Former-commit-id: e150a51871
|
2013-05-23 10:10:51 -05:00 |
|
Nate Jensen
|
b8e6b1a083
|
Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: c6fc510360ab5dfd2d963fcd65966cfc3d7993fa [formerly 91c8b9ac1d]
Former-commit-id: 882296f823
|
2013-05-23 10:06:28 -05:00 |
|
Greg Armendariz
|
806a417f0f
|
Merge "Issue #1927 - patch ant includegen task" into development
Former-commit-id: cabcb3e574 [formerly dc9623df11] [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 2fe2b0c5fb [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]]
Former-commit-id: a4457f8c83
Former-commit-id: 8b49a871cbda6887cd2b43c7a35a68e7f16bf20e [formerly 270269219c]
Former-commit-id: 7c97422501
|
2013-05-23 09:10:11 -05:00 |
|
Roger Ferrel
|
3aa439216d
|
Issue #1966 Feature place holders for the dialogs.
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f
Former-commit-id: 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]]
Former-commit-id: d35424df4f
Former-commit-id: 71942aa83d41336218c476f9a4456699fc337e09 [formerly 2d4434119d]
Former-commit-id: 760b0f3366
|
2013-05-23 07:36:15 -05:00 |
|
Bryan Kowal
|
0f23a3a390
|
Issue #1927 - patch ant includegen task
Former-commit-id: fba4b33fe1 [formerly 575944f70d] [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 40e8f544ea [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]
Former-commit-id: 24c0728db9
Former-commit-id: 9b61bbda811981fe5d3e4a80ed88b6107b650443 [formerly 2a17b35e83]
Former-commit-id: e6cfad1759
|
2013-05-22 18:00:43 -05:00 |
|
Nate Jensen
|
1aa7bda4f9
|
Issue #1989 fix clustered routes suspending/starting
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a
Former-commit-id: 516eca979e [formerly 57e560b745] [formerly 4ab1d90d67] [formerly a6d525ec96 [formerly 4ab1d90d67 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]]]
Former-commit-id: a6d525ec96
Former-commit-id: b2203d5e824a80b3594b409d049bc1148ae5c2d7 [formerly 431e97742d]
Former-commit-id: 5525412779
|
2013-05-22 16:39:24 -05:00 |
|
Steve Harris
|
d477564678
|
Merge branch 'omaha_13.4.1' into development
Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]
Former-commit-id: 3590310f17
Former-commit-id: 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d]
Former-commit-id: 389eefd1f9
|
2013-05-22 16:13:08 -05:00 |
|
Steve Harris
|
a6bb8b38dd
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: df612396fb [formerly dce0dc3692] [formerly 097617fa26] [formerly 462652e31e [formerly 097617fa26 [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]
Former-commit-id: 462652e31e
Former-commit-id: 19cf9a00ac458922c15640956ecdf8f46546e349 [formerly 299690a202]
Former-commit-id: 026674d0b2
|
2013-05-22 16:10:04 -05:00 |
|
Steve Harris
|
fb41995981
|
13.4.1-12 baseline
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]
Former-commit-id: b745b332ae
|
2013-05-22 16:42:39 -04:00 |
|
Benjamin Phillippe
|
09126056a6
|
Issue #2022 Removed data delivery project from feature
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd
Former-commit-id: feeb6126bb [formerly 0308f217d6] [formerly 4d1252523e] [formerly 3e9fe9892e [formerly 4d1252523e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]]]
Former-commit-id: 3e9fe9892e
Former-commit-id: fa6325803c190e9467895d087ac2f99cbe7f7004 [formerly ce20ead9e7]
Former-commit-id: 8cae1b56f1
|
2013-05-22 12:49:46 -05:00 |
|
David Gillingham
|
60850d6f8a
|
Issue #1759: Fix regression to ISC request reply due to missing import.
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80
Former-commit-id: 511098fffd [formerly 2555cf9819] [formerly fc3c7eb9fbf37bb7d9daf99d556d79bdf45aeb63 [formerly 5cba0f5e40]] [formerly 801c659108 [formerly 5cba0f5e40 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]]]
Former-commit-id: 801c659108
Former-commit-id: 7464c78970ff1efe18387d6d2105db0eb2e2d4ad [formerly 60aeb71652]
Former-commit-id: 1471a7fa34
|
2013-05-22 11:42:08 -05:00 |
|
Benjamin Phillippe
|
99ed99e6d3
|
Issue #2022 Added registry federation capabilities
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028
Former-commit-id: aab1aa57d4 [formerly 7a908bbeaf] [formerly b9f2bde20e] [formerly c3a376475b [formerly b9f2bde20e [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]]]
Former-commit-id: c3a376475b
Former-commit-id: 97b5016d0f29b44e02a2e20c7079fd9348e0adf5 [formerly ad039bae0c]
Former-commit-id: 1c50a8b9d3
|
2013-05-22 11:38:42 -05:00 |
|
Richard Peter
|
b3c32889b1
|
Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: 8fac7f2fd9 [formerly 62c8176486] [formerly c9c1570960] [formerly b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]
Former-commit-id: b4344d3c04
Former-commit-id: 8928a3d0297f1d5a036e9cf68ec32e5d793580ad [formerly 489fdf49b1]
Former-commit-id: 1bbddf8fdf
|
2013-05-21 13:07:51 -05:00 |
|
Richard Peter
|
ffe0b35085
|
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 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]
Former-commit-id: 76f11f00ae
|
2013-05-21 12:11:21 -05:00 |
|
Richard Peter
|
8e252f89f0
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878]
Former-commit-id: 21b87e9ea7
|
2013-05-21 10:35:00 -05:00 |
|
Dustin Johnson
|
bf3f162fc9
|
Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 150ae88eba [formerly fef73ac960] [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 195cd5f210 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]
Former-commit-id: 8fcc958d84
Former-commit-id: 5235790c12e2dc92a8f2ee23097bc55d4324c17f [formerly 5695c4f967]
Former-commit-id: bd65447c9f
|
2013-05-21 08:19:34 -05:00 |
|
Steve Harris
|
5db95cce55
|
13.4.1-11 baseline
Former-commit-id: 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]
Former-commit-id: c0376ce9ed
Former-commit-id: d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48]
Former-commit-id: 4d88863515
|
2013-05-21 09:19:25 -04:00 |
|
Ben Steffensmeier
|
bd89419f5e
|
Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9
Former-commit-id: 5219bd8426 [formerly c11631c7da] [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]
Former-commit-id: 931e76ae59
Former-commit-id: b4adabb2d10268100118534040b4fed536be1378 [formerly 5147eb18d4]
Former-commit-id: 30eb486e45
|
2013-05-20 18:00:32 -05:00 |
|
Richard Peter
|
5efe58df0b
|
Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: c699240a1b [formerly 8b2ecd5771] [formerly e0740990ce] [formerly 59c38fdb78 [formerly e0740990ce [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]
Former-commit-id: 59c38fdb78
Former-commit-id: 36148f00d4aad37c667d7244e309f001bd6335f8 [formerly 8b7cf1beb8]
Former-commit-id: 72206676ee
|
2013-05-20 17:49:22 -05:00 |
|
Roger Ferrel
|
0db7741ce5
|
Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac
Former-commit-id: 0b4fb8d04c [formerly e3c06b643b] [formerly 16c7de874a] [formerly dfd586fca6 [formerly 16c7de874a [formerly 57a43dfefb79d49895beace44930db630cd502be]]]
Former-commit-id: dfd586fca6
Former-commit-id: 4c43796fabb9d77c96bd1af9250c9c7f64374a79 [formerly c9e6e367fe]
Former-commit-id: 4a5073902f
|
2013-05-20 17:43:47 -05:00 |
|
Ben Steffensmeier
|
a075a5d665
|
Issue #1869 Remove DataURI column from sat plot types.
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb
Former-commit-id: 7d52bbbaa0 [formerly aa3b8c80f4] [formerly 26e80bbd18] [formerly 885b106652 [formerly 26e80bbd18 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]]
Former-commit-id: 885b106652
Former-commit-id: cbee870e9d200703dc59998e51a5ad2251e0852a [formerly 13b2b4afef]
Former-commit-id: a03dbd284b
|
2013-05-20 17:27:15 -05:00 |
|
Dustin Johnson
|
4d30dc16c6
|
Issue #2000 Subscription overlap configuration GUI
Amend:
Peer review comments.
Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6
Former-commit-id: 095acb5ac3 [formerly 554347f17c] [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly 5b62669f8e [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 97b3d509a5df6b5067753a00490a5ec5d5462760 [formerly 7858a3b57f]
Former-commit-id: 3a504d1e7b
|
2013-05-20 17:12:47 -05:00 |
|
Bryan Kowal
|
0ad544cd3e
|
Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
Former-commit-id: 3a5ae717cb [formerly 081d1c724a] [formerly 99ba7adfe7] [formerly e4874a873a [formerly 99ba7adfe7 [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]]]
Former-commit-id: e4874a873a
Former-commit-id: e1ec52afdddf5b48f29ce53fbeaaa24e087bb331 [formerly 31605b7a94]
Former-commit-id: 3f20eed975
|
2013-05-20 15:03:33 -05:00 |
|
Richard Peter
|
5cfae97674
|
Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 0d7f36c84c [formerly 8079561032] [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 30a61c3e17 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]]
Former-commit-id: 3d861eca69
Former-commit-id: 8cf1fe91f6ba1e424448c5cb7262a1998e5c2cfc [formerly 0ced8c87e4]
Former-commit-id: e03cf56895
|
2013-05-20 14:48:47 -05:00 |
|
Steve Harris
|
ac83fff244
|
13.4.1-10 baseline
Former-commit-id: 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b]
Former-commit-id: 7e04d8cd13
|
2013-05-20 10:52:47 -04:00 |
|
Richard Peter
|
f186912fe1
|
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 a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]
Former-commit-id: aff520d61b
|
2013-05-17 10:33:18 -05:00 |
|
Ben Steffensmeier
|
7651920be7
|
Issue #1869 Remove DataURI column from qc.
Former-commit-id: c7b7f58de8 [formerly 89b4bd571a] [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly c0d8dad8ae [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 50574b57e3d993a195cef03df3a9392ebf66dafd [formerly 6353b7e04b]
Former-commit-id: 777f12fbad
|
2013-05-16 17:48:37 -05:00 |
|
Nate Jensen
|
009ed8605d
|
Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019
Former-commit-id: 2c6fbd0c68 [formerly bc8d798973] [formerly bfcdcb607a] [formerly d905453660 [formerly bfcdcb607a [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]]
Former-commit-id: d905453660
Former-commit-id: 29c74ab437171949434e0b34fa54e7aeadcdb266 [formerly c3bafc88cd]
Former-commit-id: b57c84d12b
|
2013-05-16 17:13:46 -05:00 |
|
Steve Harris
|
9b898a6478
|
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 b76d359695 [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: 499736d4d7405319cf1c0593daa813e5d6e14ff6 [formerly 26664e6615]
Former-commit-id: b5d3ff1867
|
2013-05-16 13:45:58 -05:00 |
|
Nate Jensen
|
d71f246645
|
Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266
Former-commit-id: b01f942e66 [formerly 9f8654e4ff] [formerly 1ecdd989df] [formerly ce2579a289 [formerly 1ecdd989df [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]]
Former-commit-id: ce2579a289
Former-commit-id: 2076bee14faf74bd27ac75d44642ca376db29ce9 [formerly 04c7c4a4da]
Former-commit-id: 53f994c0a8
|
2013-05-16 10:25:38 -05:00 |
|
Steve Harris
|
7d55d0e959
|
13.4.1-9 baseline
Former-commit-id: 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd]
Former-commit-id: 67a95d07d2
|
2013-05-16 11:12:07 -04:00 |
|
Nate Jensen
|
c90f9d93c4
|
Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 3777b1bdec [formerly 5b4c91d734] [formerly 03f93712a2] [formerly 367784bd99 [formerly 03f93712a2 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]]
Former-commit-id: 367784bd99
Former-commit-id: 02ae66490caf635a65f4c6e90eb7bba1df7b05a1 [formerly e4b47d1eb9]
Former-commit-id: 1355010c38
|
2013-05-16 09:27:48 -05:00 |
|
Richard Peter
|
d3dc818b4d
|
Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
Former-commit-id: 55bface874 [formerly 9a8bc5871f] [formerly fc5b621973] [formerly a073bf2702 [formerly fc5b621973 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]]]
Former-commit-id: a073bf2702
Former-commit-id: af31e934cdfd6faede0ff3cfe67eded5377faa3f [formerly 57698cc95b]
Former-commit-id: 671aaba9d9
|
2013-05-15 18:14:00 -05:00 |
|
Dustin Johnson
|
f1217c2623
|
Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
Former-commit-id: 29bdf1cf7e [formerly 28a4f02216] [formerly 8eeb2f4f9c] [formerly d62e51ad7e [formerly 8eeb2f4f9c [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]]]
Former-commit-id: d62e51ad7e
Former-commit-id: 3b08746afcd2e96a955f14302d482d194318a5f7 [formerly 00e9f3305d]
Former-commit-id: 6fa299ecd8
|
2013-05-15 17:06:42 -05:00 |
|
Dustin Johnson
|
7f1f50d8b9
|
Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c
Former-commit-id: 38714c1547 [formerly 695c64a9f4] [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 8a9e1f643a [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]]
Former-commit-id: ef1e80b61f
Former-commit-id: c86021e68028c259d0aabec26dbd9c639da89626 [formerly b8d6f54206]
Former-commit-id: 31fbf71aa2
|
2013-05-15 16:54:40 -05:00 |
|
Nate Jensen
|
eb47297ab1
|
Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4
Former-commit-id: a818b84f5f [formerly b7076f6947] [formerly 2abccdfe2b] [formerly 662fac5b31 [formerly 2abccdfe2b [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]]
Former-commit-id: 662fac5b31
Former-commit-id: 2ff5c10f02a0d7646fee845f2165008d3070734a [formerly ae5df55dba]
Former-commit-id: 8b1298777c
|
2013-05-15 16:25:23 -05:00 |
|
Ben Steffensmeier
|
6afa65fd07
|
Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: 84e531ba2c [formerly 89fe0b301d] [formerly 080b43444a] [formerly bbe2667522 [formerly 080b43444a [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]]
Former-commit-id: bbe2667522
Former-commit-id: 2d0c00b44c52062e4bb1a079d156e9a7a0b2bbdf [formerly f813b40379]
Former-commit-id: b3a2cd22c7
|
2013-05-15 15:35:02 -05:00 |
|
Nate Jensen
|
fb7be885b0
|
Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301
Former-commit-id: 25c2e983c1 [formerly c75bfeb9a5] [formerly 9c2b6bad3e] [formerly f4b8c0dc60 [formerly 9c2b6bad3e [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]]
Former-commit-id: f4b8c0dc60
Former-commit-id: 9069cdd6843363f31f735d05691b1d9c3ac3ae91 [formerly 0234e6788b]
Former-commit-id: 6caa681ed3
|
2013-05-15 14:44:30 -05:00 |
|