Nate Jensen
|
65b9bafed7
|
Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: d7b8e04bb7 [formerly 90397159ef98097da0754a846d1f67d4839a300d]
Former-commit-id: d74936ef3e
|
2013-05-23 10:06:28 -05:00 |
|
Nate Jensen
|
57e560b745
|
Issue #1989 fix clustered routes suspending/starting
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a
Former-commit-id: a6d525ec96 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]
Former-commit-id: 4ab1d90d67
|
2013-05-22 16:39:24 -05:00 |
|
Steve Harris
|
570128b986
|
Merge branch 'omaha_13.4.1' into development
Former-commit-id: 3590310f17 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]
Former-commit-id: 8496832064
|
2013-05-22 16:13:08 -05:00 |
|
Steve Harris
|
dce0dc3692
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 462652e31e [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]
Former-commit-id: 097617fa26
|
2013-05-22 16:10:04 -05:00 |
|
Steve Harris
|
397bbf674a
|
13.4.1-12 baseline
Former-commit-id: e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]
Former-commit-id: 6a97b4325a
|
2013-05-22 16:42:39 -04:00 |
|
Benjamin Phillippe
|
0308f217d6
|
Issue #2022 Removed data delivery project from feature
Change-Id: I6e4d35cb4e58e98e228aa9a59f630ddc9a41e6cd
Former-commit-id: 3e9fe9892e [formerly 9a7aded3bb60bf3828a4b7746f4cb18fa79ea94e]
Former-commit-id: 4d1252523e
|
2013-05-22 12:49:46 -05:00 |
|
David Gillingham
|
2555cf9819
|
Issue #1759: Fix regression to ISC request reply due to missing import.
Change-Id: I7b02c482d3a8f231a32a2a176773aa7a3be74c80
Former-commit-id: 801c659108 [formerly fecafacad11ac0099d161bb8b7ba2b9b6c56e4ca]
Former-commit-id: 5cba0f5e40
|
2013-05-22 11:42:08 -05:00 |
|
Benjamin Phillippe
|
7a908bbeaf
|
Issue #2022 Added registry federation capabilities
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028
Former-commit-id: c3a376475b [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]
Former-commit-id: b9f2bde20e
|
2013-05-22 11:38:42 -05:00 |
|
Richard Peter
|
62c8176486
|
Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development
Former-commit-id: b4344d3c04 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]
Former-commit-id: c9c1570960
|
2013-05-21 13:07:51 -05:00 |
|
Richard Peter
|
3d84e1dd53
|
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: 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]
Former-commit-id: 8aa4b0025c
|
2013-05-21 12:11:21 -05:00 |
|
Richard Peter
|
4809b3c15b
|
Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: 77a08ebd31 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]
Former-commit-id: 73372622f7
|
2013-05-21 10:35:00 -05:00 |
|
Dustin Johnson
|
fef73ac960
|
Merge "Issue #2000 Subscription overlap configuration GUI" into development
Former-commit-id: 8fcc958d84 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]
Former-commit-id: 195cd5f210
|
2013-05-21 08:19:34 -05:00 |
|
Steve Harris
|
d6319a2ca6
|
13.4.1-11 baseline
Former-commit-id: c0376ce9ed [formerly e414ae01ab52b3940647e46e22bba3b89790c142]
Former-commit-id: 2edee36158
|
2013-05-21 09:19:25 -04:00 |
|
Ben Steffensmeier
|
c11631c7da
|
Issue #1869 Rewrite dataURI property mappings.
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9
Former-commit-id: 931e76ae59 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]
Former-commit-id: 1a31aa2211
|
2013-05-20 18:00:32 -05:00 |
|
Richard Peter
|
8b2ecd5771
|
Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development
Former-commit-id: 59c38fdb78 [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]
Former-commit-id: e0740990ce
|
2013-05-20 17:49:22 -05:00 |
|
Roger Ferrel
|
e3c06b643b
|
Issue #1966 Interim changes Brad needs for his work.
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac
Former-commit-id: dfd586fca6 [formerly 57a43dfefb79d49895beace44930db630cd502be]
Former-commit-id: 16c7de874a
|
2013-05-20 17:43:47 -05:00 |
|
Ben Steffensmeier
|
aa3b8c80f4
|
Issue #1869 Remove DataURI column from sat plot types.
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb
Former-commit-id: 885b106652 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]
Former-commit-id: 26e80bbd18
|
2013-05-20 17:27:15 -05:00 |
|
Dustin Johnson
|
554347f17c
|
Issue #2000 Subscription overlap configuration GUI
Amend:
Peer review comments.
Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6
Former-commit-id: 38249cd7b9 [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]
Former-commit-id: 5b62669f8e
|
2013-05-20 17:12:47 -05:00 |
|
Bryan Kowal
|
081d1c724a
|
Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
Former-commit-id: e4874a873a [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]
Former-commit-id: 99ba7adfe7
|
2013-05-20 15:03:33 -05:00 |
|
Richard Peter
|
8079561032
|
Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 3d861eca69 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]
Former-commit-id: 30a61c3e17
|
2013-05-20 14:48:47 -05:00 |
|
Steve Harris
|
68fe2134b8
|
13.4.1-10 baseline
Former-commit-id: 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]
Former-commit-id: 9a403b3615
|
2013-05-20 10:52:47 -04:00 |
|
Richard Peter
|
648a1b25ae
|
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: a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]
Former-commit-id: a33ddbd1a6
|
2013-05-17 10:33:18 -05:00 |
|
Ben Steffensmeier
|
89b4bd571a
|
Issue #1869 Remove DataURI column from qc.
Former-commit-id: f2b11b8a49 [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]
Former-commit-id: c0d8dad8ae
|
2013-05-16 17:48:37 -05:00 |
|
Nate Jensen
|
bc8d798973
|
Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019
Former-commit-id: d905453660 [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]
Former-commit-id: bfcdcb607a
|
2013-05-16 17:13:46 -05:00 |
|
Steve Harris
|
87a31f9990
|
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: b76d359695 [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]
Former-commit-id: 16ba74496d
|
2013-05-16 13:45:58 -05:00 |
|
Nate Jensen
|
9f8654e4ff
|
Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266
Former-commit-id: ce2579a289 [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]
Former-commit-id: 1ecdd989df
|
2013-05-16 10:25:38 -05:00 |
|
Steve Harris
|
88eee9cbfa
|
13.4.1-9 baseline
Former-commit-id: aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]
Former-commit-id: bcf7f15c90
|
2013-05-16 11:12:07 -04:00 |
|
Nate Jensen
|
5b4c91d734
|
Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 367784bd99 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]
Former-commit-id: 03f93712a2
|
2013-05-16 09:27:48 -05:00 |
|
Richard Peter
|
9a8bc5871f
|
Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
Former-commit-id: a073bf2702 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]
Former-commit-id: fc5b621973
|
2013-05-15 18:14:00 -05:00 |
|
Dustin Johnson
|
28a4f02216
|
Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
Former-commit-id: d62e51ad7e [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]
Former-commit-id: 8eeb2f4f9c
|
2013-05-15 17:06:42 -05:00 |
|
Dustin Johnson
|
695c64a9f4
|
Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c
Former-commit-id: ef1e80b61f [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]
Former-commit-id: 8a9e1f643a
|
2013-05-15 16:54:40 -05:00 |
|
Nate Jensen
|
b7076f6947
|
Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4
Former-commit-id: 662fac5b31 [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]
Former-commit-id: 2abccdfe2b
|
2013-05-15 16:25:23 -05:00 |
|
Ben Steffensmeier
|
89fe0b301d
|
Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: bbe2667522 [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]
Former-commit-id: 080b43444a
|
2013-05-15 15:35:02 -05:00 |
|
Nate Jensen
|
c75bfeb9a5
|
Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301
Former-commit-id: f4b8c0dc60 [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]
Former-commit-id: 9c2b6bad3e
|
2013-05-15 14:44:30 -05:00 |
|
Richard Peter
|
186f7169af
|
Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: bcbe24f489 [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]
Former-commit-id: 286ec23fab
|
2013-05-15 14:41:04 -05:00 |
|
David Gillingham
|
0cbf36df79
|
Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.
Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d
Former-commit-id: 84158e76c7 [formerly 13d5d8dd7c59fcf399d62e83c9eb7021bca4c2d1]
Former-commit-id: 9c688f7070
|
2013-05-15 13:56:53 -05:00 |
|
Ben Steffensmeier
|
22b20b5f8e
|
Issue #1869 Remove DataURI from goes/poes soundings.
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416
Former-commit-id: 1c3e60a5ff [formerly 836239896aace50e37896f6219015a75aea117b7]
Former-commit-id: b905ee013c
|
2013-05-15 12:50:08 -05:00 |
|
Richard Peter
|
d81cee387b
|
Merge "Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen." into development
Former-commit-id: 82ccd32ee0 [formerly 3abbb84fdb4b2a9e52757d4b5f2e8cb9fb94899e]
Former-commit-id: 0523d790f8
|
2013-05-15 12:44:48 -05:00 |
|
Richard Peter
|
b687ddef04
|
Merge "Issue #1869 Revert changes to bufrmos types used by ncep." into development
Former-commit-id: 48b67522d5 [formerly ce880367eb70abdd85664841e3775142f6e28c50]
Former-commit-id: f1d65e7028
|
2013-05-15 12:44:28 -05:00 |
|
Ben Steffensmeier
|
507ce28888
|
Issue #1869 Revert changes to bufrmos types used by ncep.
Former-commit-id: dd320f2a56 [formerly 71808a9d82233a395c5e5a394b0708b07405f553]
Former-commit-id: 62b85f3afe
|
2013-05-15 11:45:51 -05:00 |
|
Dustin Johnson
|
a00364b294
|
Merge "Issue #2000 Fix reinitializing of bandwidth manager" into development
Former-commit-id: c88be3579c [formerly f300554c735266999f57e0331eda63420e5a6ef3]
Former-commit-id: 8a70a773d5
|
2013-05-15 10:50:53 -05:00 |
|
Dustin Johnson
|
b700ef7a95
|
Issue #2000 Fix reinitializing of bandwidth manager
Change-Id: I8af056eea7d40a13e9189afa81414f7088690267
Former-commit-id: e374011c49 [formerly 1073806e6f0a84da0538160d83ee3c12b92d84d5]
Former-commit-id: e38e8d7dc5
|
2013-05-15 10:24:33 -05:00 |
|
Richard Peter
|
1a7fbec35e
|
Merge "Issue #1869 Remove DataURI column from bufrmos. Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e" into development
Former-commit-id: 47124d2411 [formerly 5c73f61cf2401ccc901771f92147bfb4bc6d9c25]
Former-commit-id: f1920eb8d9
|
2013-05-15 10:00:19 -05:00 |
|
Ben Steffensmeier
|
cad31c0ce6
|
Issue #1869 Remove DataURI column from bufrmos.
Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e
Former-commit-id: fabbc29fe8 [formerly 5b740e5d614d9cac2476335a0754ccd0e1185c84]
Former-commit-id: 026a824e60
|
2013-05-15 09:40:05 -05:00 |
|
Nate Jensen
|
0c718e1cd1
|
Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89
Former-commit-id: 4e63b88031 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]
Former-commit-id: 5280b54277
|
2013-05-15 09:22:16 -05:00 |
|
Nate Jensen
|
ce19737a49
|
Issue #1989 jetty fixes
Change-Id: I01c00ee8f754132b9c57d84f971d744c16dda07d
Former-commit-id: 958ed1f6a2 [formerly fecb2dc4da19aba5a188834780e33c791d312e1b]
Former-commit-id: d894aca768
|
2013-05-14 18:27:00 -05:00 |
|
Nate Jensen
|
8c03ad79d6
|
Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development
Former-commit-id: 44cfe00b5e [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]
Former-commit-id: a6f8174d0c
|
2013-05-14 16:36:47 -05:00 |
|
Nate Jensen
|
1fcbeb41c9
|
Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158
Former-commit-id: 6f1684b85c [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]
Former-commit-id: 08b9ce4c62
|
2013-05-14 16:16:13 -05:00 |
|
Dustin Johnson
|
c302fafbd2
|
Merge "Issue #2000 Subscription duplication/overlap detection" into development
Former-commit-id: a5a0e3e280 [formerly db10de3aca3d0ef373df68a3de9871483128b645]
Former-commit-id: 341ce0c8c2
|
2013-05-14 15:48:58 -05:00 |
|
Dustin Johnson
|
3447a3726b
|
Issue #2000 Subscription duplication/overlap detection
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5
Former-commit-id: fdf3ac7897 [formerly 95df3d38914f451471f10d6095ad2bc6badbab72]
Former-commit-id: db2e3cd9bb
|
2013-05-14 15:34:08 -05:00 |
|