Dustin Johnson
|
a314bd8f4a
|
Issue #2000 Subscription overlap configuration GUI
Amend:
Peer review comments.
Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6
Former-commit-id: 554347f17c [formerly 5b62669f8e] [formerly 554347f17c [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 3a504d1e7b [formerly 7858a3b57f]
Former-commit-id: d12b26ac1d
|
2013-05-20 17:12:47 -05:00 |
|
Bryan Kowal
|
ce778c45ea
|
Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
Former-commit-id: 081d1c724a [formerly 99ba7adfe7] [formerly 081d1c724a [formerly 99ba7adfe7] [formerly e4874a873a [formerly 5d7bf83507e91f9dc6b748c54ad00d010f3f790a]]]
Former-commit-id: e4874a873a
Former-commit-id: 3f20eed975 [formerly 31605b7a94]
Former-commit-id: fbdcd29129
|
2013-05-20 15:03:33 -05:00 |
|
Richard Peter
|
6a6b25ebda
|
Merge "Issue #1869 Remove DataURI column from qc." into development
Former-commit-id: 8079561032 [formerly 30a61c3e17] [formerly 8079561032 [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]]
Former-commit-id: 3d861eca69
Former-commit-id: e03cf56895 [formerly 0ced8c87e4]
Former-commit-id: b032b405ed
|
2013-05-20 14:48:47 -05:00 |
|
Steve Harris
|
b41118326c
|
13.4.1-10 baseline
Former-commit-id: 68fe2134b8 [formerly 9a403b3615] [formerly 68fe2134b8 [formerly 9a403b3615] [formerly 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 7e04d8cd13 [formerly b1fc4e625b]
Former-commit-id: 322036ea82
|
2013-05-20 10:52:47 -04:00 |
|
Richard Peter
|
fb910196c0
|
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: 648a1b25ae [formerly a33ddbd1a6] [formerly 648a1b25ae [formerly a33ddbd1a6] [formerly a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: aff520d61b [formerly c47eb36e43]
Former-commit-id: 969fa704e5
|
2013-05-17 10:33:18 -05:00 |
|
Ben Steffensmeier
|
ea3d3660f3
|
Issue #1869 Remove DataURI column from qc.
Former-commit-id: 89b4bd571a [formerly c0d8dad8ae] [formerly 89b4bd571a [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 777f12fbad [formerly 6353b7e04b]
Former-commit-id: 998330955a
|
2013-05-16 17:48:37 -05:00 |
|
Nate Jensen
|
2396b63eda
|
Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019
Former-commit-id: bc8d798973 [formerly bfcdcb607a] [formerly bc8d798973 [formerly bfcdcb607a] [formerly d905453660 [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]]]
Former-commit-id: d905453660
Former-commit-id: b57c84d12b [formerly c3bafc88cd]
Former-commit-id: 75499add43
|
2013-05-16 17:13:46 -05:00 |
|
Steve Harris
|
34145afafe
|
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: 87a31f9990 [formerly 16ba74496d] [formerly 87a31f9990 [formerly 16ba74496d] [formerly b76d359695 [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: b5d3ff1867 [formerly 26664e6615]
Former-commit-id: 4827d8f1d9
|
2013-05-16 13:45:58 -05:00 |
|
Nate Jensen
|
6a1c713e6f
|
Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266
Former-commit-id: 9f8654e4ff [formerly 1ecdd989df] [formerly 9f8654e4ff [formerly 1ecdd989df] [formerly ce2579a289 [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]]
Former-commit-id: ce2579a289
Former-commit-id: 53f994c0a8 [formerly 04c7c4a4da]
Former-commit-id: b9bfcead05
|
2013-05-16 10:25:38 -05:00 |
|
Steve Harris
|
1730b6c41e
|
13.4.1-9 baseline
Former-commit-id: 88eee9cbfa [formerly bcf7f15c90] [formerly 88eee9cbfa [formerly bcf7f15c90] [formerly aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: 67a95d07d2 [formerly 0766ae20dd]
Former-commit-id: 3f87ea1a15
|
2013-05-16 11:12:07 -04:00 |
|
Nate Jensen
|
7549733d5d
|
Merge "Issue #1989 removing dead plugins from repo" into development
Former-commit-id: 5b4c91d734 [formerly 03f93712a2] [formerly 5b4c91d734 [formerly 03f93712a2] [formerly 367784bd99 [formerly b73e894be50830c40f774a56bc47a91f10b1cfec]]]
Former-commit-id: 367784bd99
Former-commit-id: 1355010c38 [formerly e4b47d1eb9]
Former-commit-id: 6408ef5425
|
2013-05-16 09:27:48 -05:00 |
|
Richard Peter
|
ff16d49977
|
Merge "Issue #1869 Remove DataURI column from ldadmesonet." into development
Former-commit-id: 9a8bc5871f [formerly fc5b621973] [formerly 9a8bc5871f [formerly fc5b621973] [formerly a073bf2702 [formerly 52cf035fb73af40aa04008ebc6a1627ad377566f]]]
Former-commit-id: a073bf2702
Former-commit-id: 671aaba9d9 [formerly 57698cc95b]
Former-commit-id: da0fc8057c
|
2013-05-15 18:14:00 -05:00 |
|
Dustin Johnson
|
0f69c0b64d
|
Merge "Issue #2000 Fix broken stuff after Spring 3 upgrade" into development
Former-commit-id: 28a4f02216 [formerly 8eeb2f4f9c] [formerly 28a4f02216 [formerly 8eeb2f4f9c] [formerly d62e51ad7e [formerly 59cd748665d90aa98d228f23a058bdb13eb65850]]]
Former-commit-id: d62e51ad7e
Former-commit-id: 6fa299ecd8 [formerly 00e9f3305d]
Former-commit-id: ab15adabe2
|
2013-05-15 17:06:42 -05:00 |
|
Dustin Johnson
|
a7a948bf3a
|
Issue #2000 Fix broken stuff after Spring 3 upgrade
Change-Id: I9d063c5807f00a4af161d4f0dc47008c79f94e3c
Former-commit-id: 695c64a9f4 [formerly 8a9e1f643a] [formerly 695c64a9f4 [formerly 8a9e1f643a] [formerly ef1e80b61f [formerly 0f0d3c53b3644d977560b3067535c012c9ac5228]]]
Former-commit-id: ef1e80b61f
Former-commit-id: 31fbf71aa2 [formerly b8d6f54206]
Former-commit-id: 6db9b3f8d9
|
2013-05-15 16:54:40 -05:00 |
|
Nate Jensen
|
99bd7bc4eb
|
Issue #1989 removing dead plugins from repo
Change-Id: I3323f008b9b1868bd8bc4e580591f6562c1a0cc4
Former-commit-id: b7076f6947 [formerly 2abccdfe2b] [formerly b7076f6947 [formerly 2abccdfe2b] [formerly 662fac5b31 [formerly 9c3af9f942621a5636a3ec725ffa6a7cb943fdf9]]]
Former-commit-id: 662fac5b31
Former-commit-id: 8b1298777c [formerly ae5df55dba]
Former-commit-id: 8cffed1451
|
2013-05-15 16:25:23 -05:00 |
|
Ben Steffensmeier
|
1824606f71
|
Issue #1869 Remove DataURI column from ldadmesonet.
Former-commit-id: 89fe0b301d [formerly 080b43444a] [formerly 89fe0b301d [formerly 080b43444a] [formerly bbe2667522 [formerly 6bf797d6e0b3334f15c1ac68c9433b9e3ec39c79]]]
Former-commit-id: bbe2667522
Former-commit-id: b3a2cd22c7 [formerly f813b40379]
Former-commit-id: 6333ed4841
|
2013-05-15 15:35:02 -05:00 |
|
Nate Jensen
|
546249897b
|
Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301
Former-commit-id: c75bfeb9a5 [formerly 9c2b6bad3e] [formerly c75bfeb9a5 [formerly 9c2b6bad3e] [formerly f4b8c0dc60 [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]]]
Former-commit-id: f4b8c0dc60
Former-commit-id: 6caa681ed3 [formerly 0234e6788b]
Former-commit-id: 2b72b5c530
|
2013-05-15 14:44:30 -05:00 |
|
Richard Peter
|
6117554b65
|
Merge "Issue #1869 Remove DataURI from goes/poes soundings. Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416" into development
Former-commit-id: 186f7169af [formerly 286ec23fab] [formerly 186f7169af [formerly 286ec23fab] [formerly bcbe24f489 [formerly 3b822a67f95e98b4b56d66fde64d9065f0b29a11]]]
Former-commit-id: bcbe24f489
Former-commit-id: 589fcada8b [formerly ce6452daac]
Former-commit-id: 89fc805bfe
|
2013-05-15 14:41:04 -05:00 |
|
David Gillingham
|
7f956add77
|
Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.
Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d
Former-commit-id: 0cbf36df79 [formerly 9c688f7070] [formerly 0cbf36df79 [formerly 9c688f7070] [formerly 84158e76c7 [formerly 13d5d8dd7c59fcf399d62e83c9eb7021bca4c2d1]]]
Former-commit-id: 84158e76c7
Former-commit-id: 9f79748cd2 [formerly ca10ac1598]
Former-commit-id: fab4021ce4
|
2013-05-15 13:56:53 -05:00 |
|
Ben Steffensmeier
|
7a8b41876e
|
Issue #1869 Remove DataURI from goes/poes soundings.
Change-Id: Ib13c7537c94e15d70588d75f546586e6d1f08416
Former-commit-id: 22b20b5f8e [formerly b905ee013c] [formerly 22b20b5f8e [formerly b905ee013c] [formerly 1c3e60a5ff [formerly 836239896aace50e37896f6219015a75aea117b7]]]
Former-commit-id: 1c3e60a5ff
Former-commit-id: cb335861c2 [formerly 8ea143a147]
Former-commit-id: ff9ce2b7c4
|
2013-05-15 12:50:08 -05:00 |
|
Richard Peter
|
d847f413af
|
Merge "Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen." into development
Former-commit-id: d81cee387b [formerly 0523d790f8] [formerly d81cee387b [formerly 0523d790f8] [formerly 82ccd32ee0 [formerly 3abbb84fdb4b2a9e52757d4b5f2e8cb9fb94899e]]]
Former-commit-id: 82ccd32ee0
Former-commit-id: e0c4287959 [formerly b40e0ca1c9]
Former-commit-id: 69ce5d7529
|
2013-05-15 12:44:48 -05:00 |
|
Richard Peter
|
04be1d3807
|
Merge "Issue #1869 Revert changes to bufrmos types used by ncep." into development
Former-commit-id: b687ddef04 [formerly f1d65e7028] [formerly b687ddef04 [formerly f1d65e7028] [formerly 48b67522d5 [formerly ce880367eb70abdd85664841e3775142f6e28c50]]]
Former-commit-id: 48b67522d5
Former-commit-id: 11b33a5b14 [formerly aa3ef28527]
Former-commit-id: 3e60ceec03
|
2013-05-15 12:44:28 -05:00 |
|
Ben Steffensmeier
|
1846170387
|
Issue #1869 Revert changes to bufrmos types used by ncep.
Former-commit-id: 507ce28888 [formerly 62b85f3afe] [formerly 507ce28888 [formerly 62b85f3afe] [formerly dd320f2a56 [formerly 71808a9d82233a395c5e5a394b0708b07405f553]]]
Former-commit-id: dd320f2a56
Former-commit-id: 884922687e [formerly 27b0b4a289]
Former-commit-id: 7ce819184a
|
2013-05-15 11:45:51 -05:00 |
|
Dustin Johnson
|
dbde58d5eb
|
Merge "Issue #2000 Fix reinitializing of bandwidth manager" into development
Former-commit-id: a00364b294 [formerly 8a70a773d5] [formerly a00364b294 [formerly 8a70a773d5] [formerly c88be3579c [formerly f300554c735266999f57e0331eda63420e5a6ef3]]]
Former-commit-id: c88be3579c
Former-commit-id: bd7c38a160 [formerly 8c26413d23]
Former-commit-id: 8276c2a9c9
|
2013-05-15 10:50:53 -05:00 |
|
Dustin Johnson
|
7240a99ce7
|
Issue #2000 Fix reinitializing of bandwidth manager
Change-Id: I8af056eea7d40a13e9189afa81414f7088690267
Former-commit-id: b700ef7a95 [formerly e38e8d7dc5] [formerly b700ef7a95 [formerly e38e8d7dc5] [formerly e374011c49 [formerly 1073806e6f0a84da0538160d83ee3c12b92d84d5]]]
Former-commit-id: e374011c49
Former-commit-id: b6a3c3ae80 [formerly 98d99250b2]
Former-commit-id: c2c849fe7e
|
2013-05-15 10:24:33 -05:00 |
|
Richard Peter
|
a9a4b2cfcc
|
Merge "Issue #1869 Remove DataURI column from bufrmos. Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e" into development
Former-commit-id: 1a7fbec35e [formerly f1920eb8d9] [formerly 1a7fbec35e [formerly f1920eb8d9] [formerly 47124d2411 [formerly 5c73f61cf2401ccc901771f92147bfb4bc6d9c25]]]
Former-commit-id: 47124d2411
Former-commit-id: 1a5bb1a9d5 [formerly f4974ebd19]
Former-commit-id: 6cc24d855f
|
2013-05-15 10:00:19 -05:00 |
|
Ben Steffensmeier
|
2ffe811d07
|
Issue #1869 Remove DataURI column from bufrmos.
Change-Id: Ic1a25588a45c2dc8a1a089332a4d6a33c41e205e
Former-commit-id: cad31c0ce6 [formerly 026a824e60] [formerly cad31c0ce6 [formerly 026a824e60] [formerly fabbc29fe8 [formerly 5b740e5d614d9cac2476335a0754ccd0e1185c84]]]
Former-commit-id: fabbc29fe8
Former-commit-id: 6acaa99256 [formerly 3f540d16f0]
Former-commit-id: 5dc7de691b
|
2013-05-15 09:40:05 -05:00 |
|
Nate Jensen
|
338bbc4216
|
Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89
Former-commit-id: 0c718e1cd1 [formerly 5280b54277] [formerly 0c718e1cd1 [formerly 5280b54277] [formerly 4e63b88031 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]]
Former-commit-id: 4e63b88031
Former-commit-id: 65fdf84101 [formerly 1e059ee8d9]
Former-commit-id: 4973acb807
|
2013-05-15 09:22:16 -05:00 |
|
Nate Jensen
|
122aea2c8e
|
Issue #1989 jetty fixes
Change-Id: I01c00ee8f754132b9c57d84f971d744c16dda07d
Former-commit-id: ce19737a49 [formerly d894aca768] [formerly ce19737a49 [formerly d894aca768] [formerly 958ed1f6a2 [formerly fecb2dc4da19aba5a188834780e33c791d312e1b]]]
Former-commit-id: 958ed1f6a2
Former-commit-id: a121523049 [formerly 1b62b066c9]
Former-commit-id: 58eeca454a
|
2013-05-14 18:27:00 -05:00 |
|
Nate Jensen
|
8ca2d65342
|
Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development
Former-commit-id: 8c03ad79d6 [formerly a6f8174d0c] [formerly 8c03ad79d6 [formerly a6f8174d0c] [formerly 44cfe00b5e [formerly eba0d622076180e2443e4dc71c8c2215ece28da7]]]
Former-commit-id: 44cfe00b5e
Former-commit-id: eb75eaf6ce [formerly e7f638ce3b]
Former-commit-id: dc98eb524f
|
2013-05-14 16:36:47 -05:00 |
|
Nate Jensen
|
0080d492e2
|
Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158
Former-commit-id: 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]
Former-commit-id: 6f1684b85c
Former-commit-id: dac803ca07 [formerly 22c23492c4]
Former-commit-id: 925339b84c
|
2013-05-14 16:16:13 -05:00 |
|
Dustin Johnson
|
bf3655da4c
|
Merge "Issue #2000 Subscription duplication/overlap detection" into development
Former-commit-id: c302fafbd2 [formerly 341ce0c8c2] [formerly c302fafbd2 [formerly 341ce0c8c2] [formerly a5a0e3e280 [formerly db10de3aca3d0ef373df68a3de9871483128b645]]]
Former-commit-id: a5a0e3e280
Former-commit-id: 66126d5411 [formerly 21e66394be]
Former-commit-id: f625b26373
|
2013-05-14 15:48:58 -05:00 |
|
Dustin Johnson
|
1503e4c8e5
|
Issue #2000 Subscription duplication/overlap detection
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5
Former-commit-id: 3447a3726b [formerly db2e3cd9bb] [formerly 3447a3726b [formerly db2e3cd9bb] [formerly fdf3ac7897 [formerly 95df3d38914f451471f10d6095ad2bc6badbab72]]]
Former-commit-id: fdf3ac7897
Former-commit-id: 5f2de42ebe [formerly 085058e788]
Former-commit-id: aa591995c6
|
2013-05-14 15:34:08 -05:00 |
|
Roger Ferrel
|
4dbb2fda4a
|
Issue #1966 Initial setup.
Change-Id: I9b63433524fe419099e5646d028391377784d193
Former-commit-id: fad208e0ee [formerly 0a02d5e018] [formerly fad208e0ee [formerly 0a02d5e018] [formerly 9f9f85f875 [formerly e36e62d3c146f10ef20a0d84abd26a96b9740827]]]
Former-commit-id: 9f9f85f875
Former-commit-id: fb15e2d0a6 [formerly ab75cd5107]
Former-commit-id: 532787c043
|
2013-05-14 13:49:53 -05:00 |
|
Richard Peter
|
848cd582e9
|
Merge "Issue #1869 Remove DataURI column from GFE. Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488" into development
Former-commit-id: 9bf35d621a [formerly 2f4b1d54a1] [formerly 9bf35d621a [formerly 2f4b1d54a1] [formerly b76d402c98 [formerly f7d2c39ca0c70b627b2e72f5982fba11a6a683bd]]]
Former-commit-id: b76d402c98
Former-commit-id: 824407f930 [formerly 17407e863a]
Former-commit-id: b7fc98ce28
|
2013-05-14 09:37:18 -05:00 |
|
Steve Harris
|
5bdcf5c0a1
|
13.4.1-8 baseline
Former-commit-id: 576a74fe0b [formerly 19866e7032] [formerly 576a74fe0b [formerly 19866e7032] [formerly c59b52a266 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]
Former-commit-id: c59b52a266
Former-commit-id: 5465764527 [formerly a1c4cd2a39]
Former-commit-id: 395d21565f
|
2013-05-14 09:21:41 -04:00 |
|
Ben Steffensmeier
|
ba5555930e
|
Issue #1869 Remove DataURI column from GFE.
Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488
Former-commit-id: 35da7528bf [formerly 2536042f6d] [formerly 35da7528bf [formerly 2536042f6d] [formerly 8661bde0cc [formerly 4c35aa22bdd5058992984eca824083e927d8deda]]]
Former-commit-id: 8661bde0cc
Former-commit-id: c6d8809f87 [formerly 039a92d9b9]
Former-commit-id: d78e7bcd78
|
2013-05-13 17:35:00 -05:00 |
|
Richard Peter
|
fe2e894307
|
Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea
Former-commit-id: c63a4882e7 [formerly 99391cfe12] [formerly c63a4882e7 [formerly 99391cfe12] [formerly d4135dba62 [formerly 883a51484d03900852ed84820aa559e088c97335]]]
Former-commit-id: d4135dba62
Former-commit-id: 43a90c062c [formerly a02955e40c]
Former-commit-id: 81ece036ac
|
2013-05-13 17:16:57 -05:00 |
|
Richard Peter
|
c7755a649b
|
Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862
Former-commit-id: 2c009eb618 [formerly a12830f762] [formerly 2c009eb618 [formerly a12830f762] [formerly c5040038d3 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]
Former-commit-id: c5040038d3
Former-commit-id: 6c09ab9bdf [formerly bcf4dcc810]
Former-commit-id: f7470fbd8f
|
2013-05-13 17:11:05 -05:00 |
|
Richard Peter
|
9623d4c82e
|
Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
nativeLib/files.native/adapt/climate/bin/Linux/build_f6
nativeLib/files.native/adapt/climate/bin/Linux/create_climate
nativeLib/files.native/adapt/climate/bin/Linux/display_climate
nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
nativeLib/files.native/adapt/climate/bin/Linux/format_climate
nativeLib/files.native/adapt/climate/bin/Linux/init_climate
nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
nativeLib/files.native/edex/lib/native/linux32/libXm.so
nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
nativeLib/files.native/edex/lib/native/linux32/libecpg.so
nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
nativeLib/files.native/edex/lib/native/linux32/libjasper.so
nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
nativeLib/files.native/edex/lib/native/linux32/libtcl.so
nativeLib/files.native/edex/lib/native/linux32/libtk.so
rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e
Former-commit-id: 4ae23b93d9 [formerly 8062c38b71] [formerly 4ae23b93d9 [formerly 8062c38b71] [formerly ba590e2f93 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]]
Former-commit-id: ba590e2f93
Former-commit-id: faf22cc925 [formerly 8e5929406c]
Former-commit-id: 4b5869684b
|
2013-05-13 16:33:50 -05:00 |
|
Dustin Johnson
|
c284d00e3d
|
Merge "Issue #1948 Modified registry permgen memory size to accomodate additional Spring container" into development
Former-commit-id: 23fa59f25b [formerly 0b2bdf1848] [formerly 23fa59f25b [formerly 0b2bdf1848] [formerly ab755981a9 [formerly 46b88ec783b7721448940f158e5eb2ad168a3a97]]]
Former-commit-id: ab755981a9
Former-commit-id: 82a35120b8 [formerly 0796694014]
Former-commit-id: a6532af8c9
|
2013-05-13 15:26:19 -05:00 |
|
Benjamin Phillippe
|
38caf6c225
|
Issue #1948 Modified registry permgen memory size to accomodate additional Spring container
Change-Id: I0492d5440f6753896fa6b278f0cf642a2ef13d65
Former-commit-id: 037b40e59a [formerly 5a113f1c43] [formerly 037b40e59a [formerly 5a113f1c43] [formerly 4165759e58 [formerly 4e375316f389f1db4b21708893c0087587c3f3e9]]]
Former-commit-id: 4165759e58
Former-commit-id: 9768a187f9 [formerly 2768c62541]
Former-commit-id: b8a47cc9be
|
2013-05-13 15:20:28 -05:00 |
|
Matt Nash
|
e1ad78266c
|
Issue #1870 add python localization to base feature
Change-Id: I55149865870bc24995b267574ce2163b3c8f905c
Former-commit-id: 3d877ce704 [formerly 88365319b5] [formerly 3d877ce704 [formerly 88365319b5] [formerly 60d46cded8 [formerly 49b08468c487c8895c7fd59712936a79cf2b1999]]]
Former-commit-id: 60d46cded8
Former-commit-id: 80f62930ff [formerly 183c1a589a]
Former-commit-id: 086696f386
|
2013-05-13 14:54:50 -05:00 |
|
Steve Harris
|
c7c6ea343e
|
13.4.1-7 baseline
Former-commit-id: 8072752c77 [formerly 4c6ff79e71] [formerly 8072752c77 [formerly 4c6ff79e71] [formerly 8347bed50e [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]
Former-commit-id: 8347bed50e
Former-commit-id: ff7a21ac37 [formerly b35027f661]
Former-commit-id: dffa6d3bdc
|
2013-05-13 12:58:10 -04:00 |
|
Richard Peter
|
aa83bde84c
|
Merge "Issue #1869 Modified D2D time series of point data to work without dataURI. Change-Id: I80f39877903e50338add58700f6ffeb39e848a32" into development
Former-commit-id: f8881f6e02 [formerly 18c5ad2727] [formerly f8881f6e02 [formerly 18c5ad2727] [formerly 045a8c0b5d [formerly ac7b7bdf702eb75bb41631febe433354acf78589]]]
Former-commit-id: 045a8c0b5d
Former-commit-id: e6c820c2c5 [formerly c598cd3be0]
Former-commit-id: 570a330497
|
2013-05-13 11:42:23 -05:00 |
|
Ben Steffensmeier
|
c917c7f592
|
Issue #1869 Modified D2D time series of point data to work without dataURI.
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32
Former-commit-id: 8e550124f4 [formerly 2b4dd1521b] [formerly 8e550124f4 [formerly 2b4dd1521b] [formerly baf051a27e [formerly 3f246d2d473050ae89a4db65bc01d7729dc0aa01]]]
Former-commit-id: baf051a27e
Former-commit-id: c862d04d57 [formerly 9aab9c6034]
Former-commit-id: e17c6f6857
|
2013-05-13 11:26:47 -05:00 |
|
Matt Nash
|
8c58a5b367
|
Issue #1991 change hydro database in setup.env to reflect new one
Change-Id: I2d7759ea34c4c8a63b484288603bd4988844c1dd
Former-commit-id: 023e9a0bb8 [formerly f5fe72f776] [formerly 023e9a0bb8 [formerly f5fe72f776] [formerly 1e354eddc4 [formerly 8aac19338c40e2f278709c8bdbe85ec0b84c75d6]]]
Former-commit-id: 1e354eddc4
Former-commit-id: f839dcb3be [formerly c389c77256]
Former-commit-id: 2db79b7608
|
2013-05-13 09:05:30 -05:00 |
|
Mike Duff
|
3df65a2ad9
|
Issue #1919 - Fix VGBs in FFMP
Former-commit-id: d087b03eb3 [formerly f887a41875] [formerly d087b03eb3 [formerly f887a41875] [formerly 7874521269 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]]
Former-commit-id: 7874521269
Former-commit-id: 311ce09129 [formerly d262dc63f0]
Former-commit-id: 83304c3e4c
|
2013-05-10 09:58:02 -05:00 |
|
Nate Jensen
|
d4789e5e87
|
Issue #1967 undo mistake
Change-Id: Ib74893b356edf16b045e1f8f5165bef59388422b
Former-commit-id: f149e3f645 [formerly 250548dc66] [formerly f149e3f645 [formerly 250548dc66] [formerly 47e402afc9 [formerly 2cd8c512ca8cbf0b7070587f659e9bc12f53e580]]]
Former-commit-id: 47e402afc9
Former-commit-id: af2fded870 [formerly f8cd2effdf]
Former-commit-id: f3989b7187
|
2013-05-10 09:20:17 -05:00 |
|
David Gillingham
|
50d58b588e
|
Issue #1898: Ensure map bundles are copied to /site/bundles/maps/ not /site/maps/.
Change-Id: Iccd50915b7b19c49fe35fdfc7edd678e9fd7dac4
Former-commit-id: 11cb7b2295 [formerly 51063c7c53] [formerly 11cb7b2295 [formerly 51063c7c53] [formerly 36944298f4 [formerly 4c7f1216d9e2ba683bc46adcfe1d5863e4477490]]]
Former-commit-id: 36944298f4
Former-commit-id: c5983413a0 [formerly d475d8f07b]
Former-commit-id: 65e64221d5
|
2013-05-09 14:28:17 -05:00 |
|