Steve Harris
|
b7beed13a5
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]
Former-commit-id: 3073951b3d
Former-commit-id: e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]
Former-commit-id: 6e48567370
|
2013-03-27 22:16:15 -05:00 |
|
Steve Harris
|
12c22ed8ac
|
Merge branch 'master_13.3.1' (13.3.1-14 cleaned up) into omaha_13.3.1
Former-commit-id: 16a781b20e [formerly c284261dc2] [formerly 3cb15755a8] [formerly 6351d8f6d3 [formerly 3cb15755a8 [formerly 0f0b0a0c0f2f0d334ccd56f8265e2b6fd9a12902]]]
Former-commit-id: 6351d8f6d3
Former-commit-id: c359cfeed3b2c3793ee934eeb2bebd27bef69286 [formerly e56bd830ac]
Former-commit-id: 3138de0e06
|
2013-03-27 22:13:11 -05:00 |
|
Steve Harris
|
7e379468f5
|
13.3.1-14 baseline
Former-commit-id: bf64a0dc2f [formerly 6a4bbd9f1a] [formerly c29076949e] [formerly 4d4234d5c9 [formerly c29076949e [formerly e05ab5dbc442d410ae53400f087c02197ba5068b]]]
Former-commit-id: 4d4234d5c9
Former-commit-id: 1abdaa1a9ab7f0a79d2f0781641350605735054f [formerly c0737a6022]
Former-commit-id: e89cef72a4
|
2013-03-27 22:10:03 -05:00 |
|
Roger Ferrel
|
e920ac0aae
|
Issue #1790 Bug fix for dialogs in ticket 1578
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90
Former-commit-id: 63ab75fec6 [formerly 5bd60ce50c] [formerly a8410499bc] [formerly 1129728e03 [formerly a8410499bc [formerly 9bc7fe4c771e534148b446d33de969ef53be3b0d]]]
Former-commit-id: 1129728e03
Former-commit-id: 9d226e7317e1867a47554f09161c1a8772d04079 [formerly 56ca204764]
Former-commit-id: be143656eb
|
2013-03-27 21:54:26 -05:00 |
|
Richard Peter
|
52459fd3cc
|
Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
Former-commit-id: 52174ddb57 [formerly 642ff5e320] [formerly 3ba331e9f5] [formerly 2b207fc6ec [formerly 3ba331e9f5 [formerly db45bf80d754e49429e4d6a7fd6a28f50d7fb140]]]
Former-commit-id: 2b207fc6ec
Former-commit-id: 422f89b43e649e651ca02e3a954f92499144263f [formerly d8cbd1ff39]
Former-commit-id: b061ba5595
|
2013-03-27 18:32:38 -05:00 |
|
Richard Peter
|
28c463775b
|
Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
Former-commit-id: b03b4b8f75 [formerly 2a71b9de1b] [formerly 7992b43a7a] [formerly 6c4f279623 [formerly 7992b43a7a [formerly b0753a969f27d0f7903a42a535066e3ac5b354fd]]]
Former-commit-id: 6c4f279623
Former-commit-id: 55be6e5f32264ac772c6926e10bae527eaa7a2cd [formerly e68173e147]
Former-commit-id: ce746d6228
|
2013-03-27 18:28:01 -05:00 |
|
Steve Harris
|
3f99eed860
|
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]
Former-commit-id: d997aeaee4
Former-commit-id: d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03]
Former-commit-id: 428ec8a472
|
2013-03-27 18:21:05 -05:00 |
|
Ben Steffensmeier
|
f3fdbf45bf
|
Issue #1821 Reduce db and pypies requests in grid assembler.
Former-commit-id: 66d3c4c237 [formerly 6171d60f44] [formerly 60d13f2282] [formerly 5add905ea7 [formerly 60d13f2282 [formerly 68febf5d9bff68e752d039fddc853a0e5793b05d]]]
Former-commit-id: 5add905ea7
Former-commit-id: 76ee35fd160c5eff68caa2f459b481b629252e64 [formerly 37fc71a726]
Former-commit-id: 1312e2ba34
|
2013-03-27 17:59:58 -05:00 |
|
Steve Harris
|
3cbf22bd96
|
13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]
Former-commit-id: 936e4adda2
|
2013-03-27 17:59:34 -05:00 |
|
Ben Steffensmeier
|
c46190259b
|
Issue #1821 make GridInfoCache more elaborate.
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9
Former-commit-id: bedc1bce0a [formerly a31dc1874b] [formerly bc8729d631] [formerly 4b6d2fd8d1 [formerly bc8729d631 [formerly c7b4e7c982fb682779b729d1a8a8fb5ff6f5e1d2]]]
Former-commit-id: 4b6d2fd8d1
Former-commit-id: 685e6735636d4f309a314a4ceda7fb70182b8d08 [formerly e4462ee41a]
Former-commit-id: 60b2259343
|
2013-03-27 17:28:45 -05:00 |
|
Benjamin Phillippe
|
0d769d03c0
|
Issue #1802 Fixes related to DD transaction refactor
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1
Former-commit-id: 1e30861a21 [formerly 30be5ce6f9] [formerly 115dc12790] [formerly 2a14245dce [formerly 115dc12790 [formerly 393a469e2f65894a6dd5b58c1431c3d727951eda]]]
Former-commit-id: 2a14245dce
Former-commit-id: 2e9d43de3c79391b705e7ea079b7e2665d9ca96f [formerly b0010de8ff]
Former-commit-id: 3cc6978718
|
2013-03-27 17:12:52 -05:00 |
|
Richard Peter
|
2ae52dbaee
|
Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
Former-commit-id: 5063faa546 [formerly c11b070571] [formerly c8ae09ab1d] [formerly 70a7c3c556 [formerly c8ae09ab1d [formerly a104b57c33655022bc142b71e909e8fb1b1c022b]]]
Former-commit-id: 70a7c3c556
Former-commit-id: 393cfacf90d5055883f5b301797a7483965f899b [formerly de88cceb8c]
Former-commit-id: be2a8e1b16
|
2013-03-27 17:08:00 -05:00 |
|
Roger Ferrel
|
9e1fd195e3
|
Issue #1790 Bug fixes for ticket 1353.
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc
Former-commit-id: 7a4d48d489 [formerly 9b527de11a] [formerly 04b57a8582] [formerly 391ce5687b [formerly 04b57a8582 [formerly e0c3e3b81f679985a048047b3e5aa69992577d78]]]
Former-commit-id: 391ce5687b
Former-commit-id: d61178e812fe7ec24f484b7229ff2ecd243afc21 [formerly 726b5de0c5]
Former-commit-id: c9d9b3b277
|
2013-03-27 16:56:17 -05:00 |
|
Dustin Johnson
|
49c53e5443
|
Issue #1827 Create registry/datadelivery client features
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: 5dbff646aa [formerly fbcfdd0ca1] [formerly 52c27ec57f] [formerly 1684507bdb [formerly 52c27ec57f [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]
Former-commit-id: 1684507bdb
Former-commit-id: 9858dbcf0e7632be9b6d9beae6fc5e2f1573062d [formerly f27ebfbc1b]
Former-commit-id: 2591041c9d
|
2013-03-27 15:38:36 -05:00 |
|
Roger Ferrel
|
021fab7569
|
Issue #1790 Fix dialog in current phase.
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b
Former-commit-id: bdfca9ce6b [formerly a0a86f9b13] [formerly d69674d595] [formerly 1093c020e6 [formerly d69674d595 [formerly 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54]]]
Former-commit-id: 1093c020e6
Former-commit-id: 8d0f976ddc4f14c7aeeb13ceee81e6ebcbb699de [formerly 68ba7cab75]
Former-commit-id: f66a80a2ae
|
2013-03-27 14:11:36 -05:00 |
|
Ben Steffensmeier
|
17a32dc6f1
|
Issue #1821 Speed up GridInfoCache.
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40
Former-commit-id: a19226c906 [formerly bd35a06d51] [formerly 2a13abd32c] [formerly 6f525a81b4 [formerly 2a13abd32c [formerly fde9f936e53a998f8cde174935d00287e6aaf70c]]]
Former-commit-id: 6f525a81b4
Former-commit-id: ee1c17f89fa0985092ccae8f5eba07c346c20a39 [formerly 72724108b7]
Former-commit-id: bc0153dbba
|
2013-03-27 13:21:33 -05:00 |
|
Nate Jensen
|
87e6c58ada
|
Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
Former-commit-id: 2516680caf [formerly 7f5b3d6f84] [formerly faf937d3b0] [formerly f8e5534417 [formerly faf937d3b0 [formerly 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac]]]
Former-commit-id: f8e5534417
Former-commit-id: 773d09bbcd8e3e369ba739f7482d25dbd1b2f6ce [formerly a7548df695]
Former-commit-id: ccf6175c43
|
2013-03-27 11:32:19 -05:00 |
|
Ron Anderson
|
95001bf982
|
Merge "Issue #1833: Add performance log file to ingest and ingestGrib" into omaha_13.3.1
Former-commit-id: 7ce946600d [formerly 60735ddd83] [formerly 841a69ed59] [formerly 33d78bc7ee [formerly 841a69ed59 [formerly 9b35437ccfecaf70470a9a96fbc3acacd7cf1405]]]
Former-commit-id: 33d78bc7ee
Former-commit-id: 1fc510c7e309d9f5688d57b181aa1c1152754c4e [formerly 6a393ee4f9]
Former-commit-id: dc74b366e9
|
2013-03-27 11:22:48 -05:00 |
|
Nate Jensen
|
ad691d7deb
|
Merge "Issue #1832 fix getNumPy() error handling" into omaha_13.3.1
Former-commit-id: 2d5ec59d57 [formerly caeb823043] [formerly dd3601a873] [formerly aaf2d7bc2a [formerly dd3601a873 [formerly f1cabae64e37120f27235ec44b4bd7a1921fe621]]]
Former-commit-id: aaf2d7bc2a
Former-commit-id: ece186ad016279cdd4244f8b4cc68f07db841659 [formerly da024a1044]
Former-commit-id: adeeccc9c7
|
2013-03-27 11:16:56 -05:00 |
|
Mike Duff
|
be438c6fec
|
Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa
Former-commit-id: 0e1b566dd1 [formerly 1beb6e4fa5] [formerly 1958700112] [formerly 302dbf2cfb [formerly 1958700112 [formerly 5304de6fff49f3db7a3b46427077c7d2d9c0b3f9]]]
Former-commit-id: 302dbf2cfb
Former-commit-id: 44a7dc0c858099a53c302c46a726f699843c6b9e [formerly 3d1c1b146c]
Former-commit-id: c143b356ef
|
2013-03-27 10:38:59 -05:00 |
|
Richard Peter
|
b2a73c8d44
|
Issue #1833: Add performance log file to ingest and ingestGrib
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d
Former-commit-id: 485a15cc15 [formerly 25d4905570] [formerly 5287a3296b] [formerly b75ceeeeb3 [formerly 5287a3296b [formerly 53cb92842c43349968b70bb5fec5beb100773b63]]]
Former-commit-id: b75ceeeeb3
Former-commit-id: 4a26b55e8490ddfd0f35dfb9dc124a2fe903a855 [formerly f99242f539]
Former-commit-id: 6923e10550
|
2013-03-26 20:55:42 -05:00 |
|
Nate Jensen
|
d3bd10f1f2
|
Issue #1832 fix getNumPy() error handling
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405
Former-commit-id: 49fdcf9e55 [formerly dc53db5181] [formerly e4cdfe0ca9] [formerly 74b21dc1b4 [formerly e4cdfe0ca9 [formerly ce7e89b8300580a57a5c133a78e8c84e2cb7449e]]]
Former-commit-id: 74b21dc1b4
Former-commit-id: 22ed5d848545d777dd0f275f81d9601e754f7d4f [formerly 494a673c37]
Former-commit-id: 0cf9a03133
|
2013-03-26 18:30:19 -05:00 |
|
Nate Jensen
|
d7c57134e9
|
Merge "Issue #1735 Performance improvments for LLWSData." into development
Former-commit-id: 74901e9999 [formerly 5624e303a8] [formerly ff7631d847] [formerly b44db0bc2c [formerly ff7631d847 [formerly 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa]]]
Former-commit-id: b44db0bc2c
Former-commit-id: 8beb70dbf586e75fc3f3f21fe48809828f454906 [formerly 314c5dcb2e]
Former-commit-id: 6d32957638
|
2013-03-26 16:28:38 -05:00 |
|
Nate Jensen
|
55572918b3
|
Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
Former-commit-id: d612495967 [formerly 807d8773ad] [formerly f3fd91c311] [formerly c895ee60fa [formerly f3fd91c311 [formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]]
Former-commit-id: c895ee60fa
Former-commit-id: d25e380bfd45fba9e5ddfb52706b916c9ca113fd [formerly 5701030750]
Former-commit-id: 30bd797879
|
2013-03-26 16:15:27 -05:00 |
|
Richard Peter
|
ec2de612de
|
Merge "Issue #1828 Fix intlsigmets and text pattern." into omaha_13.3.1
Former-commit-id: c26a9bb1cf [formerly ac3619cc77] [formerly fa7fb4765f] [formerly cbf915093f [formerly fa7fb4765f [formerly e9a9cbc4b3c20dce7dc39837c9aab4ae5ef6e01a]]]
Former-commit-id: cbf915093f
Former-commit-id: f1a1ddfa372b73189cb7aa40c0859c04f7c6c041 [formerly f941b97c06]
Former-commit-id: 4f326d5c39
|
2013-03-26 15:33:33 -05:00 |
|
Lee Venable
|
84c0e0646f
|
Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
Former-commit-id: 48ad5b71b7 [formerly ad1983ff8d] [formerly 1a59204892] [formerly 049e955db9 [formerly 1a59204892 [formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]]
Former-commit-id: 049e955db9
Former-commit-id: 8033bef0cab6c2d4a5d319f4cbe92e628918c084 [formerly f8d2fdacea]
Former-commit-id: cb683bec2a
|
2013-03-26 15:01:51 -05:00 |
|
Roger Ferrel
|
dea028c7fc
|
Issue #1828 Fix intlsigmets and text pattern.
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0
Former-commit-id: df2a9d8f96 [formerly 6a4bd66abc] [formerly 19074d3053] [formerly 74389834de [formerly 19074d3053 [formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]]
Former-commit-id: 74389834de
Former-commit-id: ac5853bb00b807a9281ab41fb9a03069a5f9ac8e [formerly 4c5aa32169]
Former-commit-id: 7244b4d23c
|
2013-03-26 14:47:48 -05:00 |
|
Ben Steffensmeier
|
2429a1bfe6
|
Issue #1791 Fix problems in SmartScript when there is no data.
Former-commit-id: 92f0268a14 [formerly 9d9443644c] [formerly 6870045005] [formerly 18311b0d18 [formerly 6870045005 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]]
Former-commit-id: 18311b0d18
Former-commit-id: 82ebfcf0bec3c1a3cc3ba64906816bbfe0a2f369 [formerly 69879c51df]
Former-commit-id: 6d17d01f8c
|
2013-03-26 14:46:11 -05:00 |
|
Lee Venable
|
caf01174bb
|
Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
Former-commit-id: 954db8db28 [formerly 68e767daaa] [formerly c86daf885b] [formerly c1adce3a11 [formerly c86daf885b [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]]
Former-commit-id: c1adce3a11
Former-commit-id: 4d0bced50facefee11d7f7c6479d9607164529af [formerly 393e6d9ca1]
Former-commit-id: 013748405d
|
2013-03-26 14:33:24 -05:00 |
|
Richard Peter
|
e4656678c9
|
Merge "Issue #1783: Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
Former-commit-id: 469f7c60fb [formerly ce83569845] [formerly b947a52604] [formerly 7ee513dfed [formerly b947a52604 [formerly b1acf59c03ab308b86843a314d4795f6392de844]]]
Former-commit-id: 7ee513dfed
Former-commit-id: 6c418300d90241b2b4b90041a1b7a3d4ae13dd41 [formerly 45a2f3f3dd]
Former-commit-id: 9c5ce8e741
|
2013-03-26 12:59:47 -05:00 |
|
Steve Harris
|
6e4b9a6f01
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]]
Former-commit-id: 65df96a419
Former-commit-id: db9839345c6d211e370f415e6567c95c5596977e [formerly 346b97a39a]
Former-commit-id: 5bb29627dc
|
2013-03-26 12:47:40 -05:00 |
|
Steve Harris
|
072b1bf35e
|
Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 8d1903034b [formerly 85104939ac] [formerly b2bd9214d65cc3e496eea474a3c067a766511a95 [formerly e71c69c383]] [formerly 9ff8a94193 [formerly e71c69c383 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 9cd89cdae60b1bb313162de31e0e2c592984280a [formerly b926ff60b3]
Former-commit-id: 02147470db
|
2013-03-26 12:44:24 -05:00 |
|
Steve Harris
|
b49c1b0fa8
|
13.3.1-13 baseline
Former-commit-id: 0f2ebb8f10 [formerly 792171756f] [formerly c77a452f5a] [formerly c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]
Former-commit-id: c65f3e68e5
Former-commit-id: 24c9dcc4807f8692b6eb63ba5946c346d7126d11 [formerly 822d05a709]
Former-commit-id: 4f2e9aec0d
|
2013-03-26 12:43:07 -05:00 |
|
Jonathan Sanchez
|
4236ca46f5
|
Issue #1819 Added precision fields for point source configuration.
Former-commit-id: 6b85338835 [formerly a0a0199266] [formerly 79d87a96e7] [formerly b0f61cf86c [formerly 79d87a96e7 [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]]
Former-commit-id: b0f61cf86c
Former-commit-id: 329fc238b833ee77ae27cbf2f25470dc6acf6e48 [formerly eb13af2f50]
Former-commit-id: a579da7646
|
2013-03-26 12:29:18 -05:00 |
|
Steve Harris
|
591179c773
|
Merge "Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
Former-commit-id: 6c5444591a [formerly 9ed8f85b79] [formerly 1f28f6b807] [formerly 305994e220 [formerly 1f28f6b807 [formerly b59167da8d42b23fadd19eb8f186d992a5c68bdd]]]
Former-commit-id: 305994e220
Former-commit-id: afda4521815801a415515d376dd78372355aaa84 [formerly b1071636a7]
Former-commit-id: ee009dc2d8
|
2013-03-26 12:27:54 -05:00 |
|
David Gillingham
|
5a14c2c503
|
Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb
Former-commit-id: 4a0d548c20 [formerly 6fe3d5dc28] [formerly c5c7e31983] [formerly 54511a95db [formerly c5c7e31983 [formerly 497aa460d6119f13bf6870b78454237252b68752]]]
Former-commit-id: 54511a95db
Former-commit-id: b6aa9ae88e412bb4092b5bc723955201a2eb5e12 [formerly 6188c8bd40]
Former-commit-id: 040dc9075c
|
2013-03-26 12:14:22 -05:00 |
|
Ben Steffensmeier
|
786490e228
|
Issue #1782 fix merge problems related to graphics API.
Former-commit-id: b8e7e8868f [formerly 0aad550439] [formerly 2b898e58c7] [formerly 6edee13cdd [formerly 2b898e58c7 [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]]
Former-commit-id: 6edee13cdd
Former-commit-id: 12a49ee4a881d261f0a943322274ece3293cc090 [formerly 76a6213807]
Former-commit-id: f983e5d705
|
2013-03-26 12:06:45 -05:00 |
|
Ben Steffensmeier
|
5b117b6f62
|
Issue #1799 Fix pan/zoom when in views.
Former-commit-id: adfbe0e726 [formerly d06f011de0] [formerly 643c1c77d0] [formerly 78fdea2ba1 [formerly 643c1c77d0 [formerly 2061956526bdc3da43280e6c829de1deb0a098ba]]]
Former-commit-id: 78fdea2ba1
Former-commit-id: 59088a1c026ae5ed7b1d9a4153223fbd1576dba5 [formerly 5a1171f111]
Former-commit-id: e79778366c
|
2013-03-26 11:44:23 -05:00 |
|
Richard Peter
|
5ba47f8dbd
|
Issue #1783: Update DatabaseArchiver to stream deserialization of previous records
Change-Id: Icb1e2721bcddeb93c7c06983bba117c75b0edd44
Former-commit-id: 7a971ee165 [formerly 9773208ff5] [formerly f3844dd2fb] [formerly 69ffe80046 [formerly f3844dd2fb [formerly f4e67b7b1b41af66436cae5e6f7f61bbf02fb534]]]
Former-commit-id: 69ffe80046
Former-commit-id: d3c52b0df202be6e89bcdc6793f463be02407c61 [formerly 643ac75965]
Former-commit-id: b4965ae08d
|
2013-03-26 11:40:24 -05:00 |
|
Ron Anderson
|
c8a3f9932e
|
Merge "Issue #1823: Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
Former-commit-id: 48f4d944dd [formerly f272034fde] [formerly 57c919bc7b] [formerly f65989454a [formerly 57c919bc7b [formerly 735c64e77a704ceae7f1a025c9cfc442f48f207e]]]
Former-commit-id: f65989454a
Former-commit-id: bd4f4230cd1d4208dd8b92a0f91479ee01037cf6 [formerly 510b090090]
Former-commit-id: 758b81f9a2
|
2013-03-26 11:33:15 -05:00 |
|
Richard Peter
|
8a91d33cea
|
Merge "Issue #1750 - include the qpidd service script in the rpm installations" into development
Former-commit-id: 7a35c6472a [formerly 260b159f1b] [formerly 0f15b13b86] [formerly f062e43f8c [formerly 0f15b13b86 [formerly 6c2e1cc597e14997f59c52c344ca7558139f2333]]]
Former-commit-id: f062e43f8c
Former-commit-id: d84c175057b2d9f99132aa7bb9b7233c8c016172 [formerly 02ecf31edb]
Former-commit-id: 88b147cb1b
|
2013-03-26 10:53:50 -05:00 |
|
Ben Steffensmeier
|
13c24c63d0
|
Issue #1821 Optimize FFG version query.
Former-commit-id: 3e9651bab3 [formerly 54b9d0d949] [formerly 640618cf830508cfe1f84fbd9c831e0a034aa074 [formerly 3049bc94c9]] [formerly 7bde9f6d32 [formerly 3049bc94c9 [formerly 6d75a1b79cfd46de69db2d3cb452711f3ea1254d]]]
Former-commit-id: 7bde9f6d32
Former-commit-id: 8f9afd15bfe68ce83ae16aab8d6d25efc8daf0f1 [formerly 39259b1b0b]
Former-commit-id: ae27d029a1
|
2013-03-26 10:37:40 -05:00 |
|
David Gillingham
|
1c24ec516d
|
Issue #1823: Trigger SAT smart inits based only on sector id and physical element.
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79
Former-commit-id: 4c5493d607 [formerly ad357638b3] [formerly 1df8d39919] [formerly bebfc60317 [formerly 1df8d39919 [formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]]
Former-commit-id: bebfc60317
Former-commit-id: a809765d33e0a62afbe50224ec11b4f9d9365c4f [formerly 07487a27dc]
Former-commit-id: bf196a7782
|
2013-03-26 10:33:42 -05:00 |
|
Steve Harris
|
5be2208aaf
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly a23cecdb26 [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]
Former-commit-id: a23cecdb26
Former-commit-id: 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565]
Former-commit-id: 02105701a0
|
2013-03-26 10:12:34 -05:00 |
|
Mike Duff
|
1314976753
|
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
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/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 66366ecca6a9baeda295e8caa2bd45103113d7ee [formerly 4c3011edce]
Former-commit-id: b366778df0
|
2013-03-26 09:19:39 -05:00 |
|
Ron Anderson
|
8bf2b31f8e
|
Merge "Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
Former-commit-id: 4c5005ffb9 [formerly 6ab9303526] [formerly f4f180face] [formerly 73678261b6 [formerly f4f180face [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]]
Former-commit-id: 73678261b6
Former-commit-id: 32aeedbcfe97a863092752841be20ed818c5c741 [formerly 7e6b601a09]
Former-commit-id: e4c4862938
|
2013-03-25 17:53:46 -05:00 |
|
Lee Venable
|
a6a431a20b
|
Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
Former-commit-id: 3e0e19ac42 [formerly a84ef2d2c3] [formerly e467daec0c] [formerly 05b4c2f913 [formerly e467daec0c [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]]
Former-commit-id: 05b4c2f913
Former-commit-id: 29ce5b07df9351fe829c6342326979e9ac25ddc4 [formerly d73b44fa67]
Former-commit-id: b1ce5603a0
|
2013-03-25 17:20:25 -05:00 |
|
Lee Venable
|
b40c38b297
|
Merge "Issue #1781 - Constrain the tabular TS query by time." into omaha_13.3.1
Former-commit-id: 77a6696ca9 [formerly 952a8073fd] [formerly 74188d09ad] [formerly d10f1c818d [formerly 74188d09ad [formerly f0ed09e300f81dcf425df64aefcd33b670b7bdd5]]]
Former-commit-id: d10f1c818d
Former-commit-id: a6c5de1383e1de456b399265a40bf38abbecf2be [formerly a444924a18]
Former-commit-id: aa4aecec66
|
2013-03-25 17:02:06 -05:00 |
|
Bryan Kowal
|
154bedca1d
|
Issue #1750 - include the qpidd service script in the rpm installations
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de
Former-commit-id: 41f03aaf7d [formerly 233f2c54be] [formerly c3936dd50e] [formerly 21fa510eaa [formerly c3936dd50e [formerly c96c45074c220140b8774e1fceeab2b79820f033]]]
Former-commit-id: 21fa510eaa
Former-commit-id: 1488501309286ce57335dc6761ded04fe446c3fa [formerly db39a45c88]
Former-commit-id: f8fafc8d4a
|
2013-03-25 16:52:33 -05:00 |
|
Mike Duff
|
0c3527a58c
|
Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9
Former-commit-id: 896ad0ff63 [formerly 3d783c54be] [formerly afd0de8b5b] [formerly 88e75f4a90 [formerly afd0de8b5b [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]]
Former-commit-id: 88e75f4a90
Former-commit-id: 0265f807aa71c3ad5de9c0f866b4c6f9d30d772c [formerly b517ce9a9f]
Former-commit-id: fc0b126eee
|
2013-03-25 16:03:18 -05:00 |
|