Max Schenkelberg
|
ee60a2a80c
|
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: 9d032f3e84 [formerly b32fbad9c8] [formerly 9d032f3e84 [formerly b32fbad9c8] [formerly 547190329b [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]
Former-commit-id: 547190329b
Former-commit-id: ba262e2bc5 [formerly 635388a7ad]
Former-commit-id: 80b0f7c159
|
2013-04-01 12:41:50 -05:00 |
|
Lee Venable
|
ca38aca6df
|
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
Former-commit-id: e994040887 [formerly 4a8c4b64df] [formerly e994040887 [formerly 4a8c4b64df] [formerly f1e8faf9ff [formerly 9c117d43e77ffa074c8464771918116f8835b382]]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 58c83b9662 [formerly 35d27f89f1]
Former-commit-id: e66a72fbed
|
2013-04-01 12:26:23 -05:00 |
|
Steve Harris
|
ac6704c7e9
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
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/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 736bb45741 [formerly 140765a43e] [formerly 736bb45741 [formerly 140765a43e] [formerly 437a04011a [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]
Former-commit-id: 437a04011a
Former-commit-id: 7b27767d7e [formerly 0b48e96314]
Former-commit-id: d0e61c59e8
|
2013-04-01 12:19:04 -05:00 |
|
Steve Harris
|
e74f4ae39e
|
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: 3b722f1076 [formerly 74a47b9bd9] [formerly 3b722f1076 [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]
Former-commit-id: 14c9de2259
Former-commit-id: f85a1ab9ab [formerly a6dd28cc82]
Former-commit-id: 0fee31b1a8
|
2013-04-01 12:15:04 -05:00 |
|
Lee Venable
|
631444f8fa
|
Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
Former-commit-id: 7d73b8dacf [formerly fe89cb7fe4] [formerly 7d73b8dacf [formerly fe89cb7fe4] [formerly d3390596f4 [formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]]
Former-commit-id: d3390596f4
Former-commit-id: 4e95ffe2ae [formerly 89da26a266]
Former-commit-id: e0d1017c14
|
2013-04-01 12:06:16 -05:00 |
|
Steve Harris
|
a112803c98
|
13.3.1-17 baseline
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: ef413da5f7 [formerly 4afa41d4e7]
Former-commit-id: 50becef97f
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
e61c718b49
|
13.3.1-16 baseline
Former-commit-id: a262f22cee [formerly 51380726d4] [formerly a262f22cee [formerly 51380726d4] [formerly 3066dd33e5 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 6b75202d07 [formerly 36a4b3eb51]
Former-commit-id: c53a305b1e
|
2013-04-01 11:39:08 -05:00 |
|
Mike Duff
|
e07f3971c0
|
Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: fa8ca827d1 [formerly 261a39122d] [formerly fa8ca827d1 [formerly 261a39122d] [formerly 9c2ac87482 [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]]
Former-commit-id: 9c2ac87482
Former-commit-id: e627279d7c [formerly 11ca7c2c20]
Former-commit-id: 63489a0873
|
2013-04-01 11:36:53 -05:00 |
|
Richard Peter
|
1b229e3d61
|
Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
Former-commit-id: 2fa88522ff [formerly e221223f8a] [formerly 2fa88522ff [formerly e221223f8a] [formerly 255617199c [formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]]
Former-commit-id: 255617199c
Former-commit-id: 65f317e56b [formerly ea4a599a5a]
Former-commit-id: 58a8049b64
|
2013-04-01 11:33:59 -05:00 |
|
Steve Harris
|
cc1ef45545
|
13.3.1-15 baseline
Former-commit-id: 4cf3ad6abb [formerly eb1dab3864] [formerly 4cf3ad6abb [formerly eb1dab3864] [formerly 3d8ed484be [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2bf790aae3 [formerly d3cec5d3cb]
Former-commit-id: 4204273f21
|
2013-04-01 11:33:20 -05:00 |
|
Max Schenkelberg
|
a29eff544b
|
Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments
Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835
Former-commit-id: a508e9c8cb [formerly 321a29ffa4] [formerly a508e9c8cb [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]
Former-commit-id: 51d976e5e2
Former-commit-id: 8de3a70962 [formerly 1c35a54a9f]
Former-commit-id: 01c2d29c1b
|
2013-04-01 10:19:36 -05:00 |
|
Lee Venable
|
0a5a8d108a
|
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
Former-commit-id: 7389bf5b29 [formerly 2875600910] [formerly 7389bf5b29 [formerly 2875600910] [formerly 0bfc05ce61 [formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]]
Former-commit-id: 0bfc05ce61
Former-commit-id: ebfa8ea79c [formerly 3d683e98a9]
Former-commit-id: 034e16baa7
|
2013-04-01 09:40:59 -05:00 |
|
Roger Ferrel
|
c95d8692ff
|
Issue #1790 Changes for non-blocking StationProfileDlg.
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: e1b40f9f2f [formerly 0d269691e2] [formerly e1b40f9f2f [formerly 0d269691e2] [formerly d21cb5e2e8 [formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]]
Former-commit-id: d21cb5e2e8
Former-commit-id: 86e21acae2 [formerly 944d03615e]
Former-commit-id: 9e3bee6562
|
2013-03-29 17:11:02 -05:00 |
|
Ben Steffensmeier
|
facdfdc501
|
Issue #1799 fix modal tools again.
Former-commit-id: cffac354e8 [formerly eeeede7288] [formerly cffac354e8 [formerly eeeede7288] [formerly 66af8daa11 [formerly c1a69f88df85478571394c0e125617c93100168d]]]
Former-commit-id: 66af8daa11
Former-commit-id: 11e6afa5fa [formerly 7082466303]
Former-commit-id: b3245f7a5d
|
2013-03-29 14:30:54 -05:00 |
|
Roger Ferrel
|
3a3e3674a8
|
Issue #1790 Changes for non-blocking StationListDlg.
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 281e7f53cb [formerly c5a95dcb44] [formerly 281e7f53cb [formerly c5a95dcb44] [formerly 6ad80607bc [formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]]
Former-commit-id: 6ad80607bc
Former-commit-id: ba0060522f [formerly de02460b11]
Former-commit-id: 99ebeac6fd
|
2013-03-29 13:46:51 -05:00 |
|
Roger Ferrel
|
791fbba888
|
Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 20f6baba0e [formerly 8f4492c63c] [formerly 20f6baba0e [formerly 8f4492c63c] [formerly 463407a40e [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]]
Former-commit-id: 463407a40e
Former-commit-id: 8c1116eaae [formerly ec5f32aec6]
Former-commit-id: c1ffc82920
|
2013-03-29 11:35:08 -05:00 |
|
Ron Anderson
|
8502dee456
|
Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089
Former-commit-id: 4ac9a4d9a8 [formerly 0f4fb125b0] [formerly 4ac9a4d9a8 [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]
Former-commit-id: c7cfcf0250
Former-commit-id: cd0f319ec5 [formerly 9cfa87f7e5]
Former-commit-id: 41b0758084
|
2013-03-29 10:48:26 -05:00 |
|
Nate Jensen
|
1b1d1a48d2
|
Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
Former-commit-id: 3ad797690b [formerly 214b2ed4ba] [formerly 3ad797690b [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 946323416c [formerly 711fbe98d2]
Former-commit-id: a6a81a17d6
|
2013-03-28 17:02:14 -05:00 |
|
Ben Steffensmeier
|
788df8fc68
|
Issue #1799 fix activation of tools for new perspectives.
Former-commit-id: dcbed65681 [formerly 50a276a7e2] [formerly dcbed65681 [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]
Former-commit-id: 4efa92ff49
Former-commit-id: 33de9bfc87 [formerly a415fb17ae]
Former-commit-id: a5e1593213
|
2013-03-28 15:47:36 -05:00 |
|
Ron Anderson
|
bef17d4f03
|
Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 27e07ce4a9 [formerly 5bb47b7931] [formerly 27e07ce4a9 [formerly 5bb47b7931] [formerly b65ecfc151 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]
Former-commit-id: b65ecfc151
Former-commit-id: 33bcf5fee8 [formerly 3f2fa771d9]
Former-commit-id: 5eb1885dbd
|
2013-03-28 13:37:29 -05:00 |
|
Max Schenkelberg
|
4253d92576
|
Issue #1638 Fix merge error
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 25202d8534 [formerly 573b441662] [formerly 25202d8534 [formerly 573b441662] [formerly 2b58e3ce3f [formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: abcf4bf569 [formerly c9301b75ea]
Former-commit-id: 223f946b90
|
2013-03-28 10:20:54 -05:00 |
|
Lee Venable
|
03fd0004ec
|
Merge "Issue #1790 Bug fixes for SCAN." into development
Former-commit-id: a891171c43 [formerly e7805ded92] [formerly a891171c43 [formerly e7805ded92] [formerly 167fa6eadf [formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]]
Former-commit-id: 167fa6eadf
Former-commit-id: 655f06cb65 [formerly 772bbe23a7]
Former-commit-id: adbaebd457
|
2013-03-28 10:04:34 -05:00 |
|
Roger Ferrel
|
18b74a6aa7
|
Issue #1790 Bug fixes for SCAN.
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65
Former-commit-id: 009cd032cb [formerly 9c560ab626] [formerly 009cd032cb [formerly 9c560ab626] [formerly e204276c17 [formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]]
Former-commit-id: e204276c17
Former-commit-id: 380846374f [formerly 216fa1b23b]
Former-commit-id: 3bb55722f5
|
2013-03-28 09:16:24 -05:00 |
|
Roger Ferrel
|
a6337e82dd
|
Issue #1790 bug fix for GFE dialogs in ticket 1353.
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612
Former-commit-id: 57fe6b5ca6 [formerly 98d056c3a1] [formerly 57fe6b5ca6 [formerly 98d056c3a1] [formerly 4db9e20fbf [formerly ee4a6d815bc85f861bb7d77719c5787343625741]]]
Former-commit-id: 4db9e20fbf
Former-commit-id: a8872882ae [formerly b95a38db32]
Former-commit-id: c354469c78
|
2013-03-28 09:04:10 -05:00 |
|
Steve Harris
|
53ee0151ca
|
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: 069ee8a748 [formerly 9a321b6ac8] [formerly 069ee8a748 [formerly 9a321b6ac8] [formerly 3073951b3d [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]
Former-commit-id: 3073951b3d
Former-commit-id: 6e48567370 [formerly a4bf236cc7]
Former-commit-id: 90ec2d3fbf
|
2013-03-27 22:16:15 -05:00 |
|
Roger Ferrel
|
cee3cd01e6
|
Issue #1790 Bug fix for dialogs in ticket 1578
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90
Former-commit-id: 5bd60ce50c [formerly a8410499bc] [formerly 5bd60ce50c [formerly a8410499bc] [formerly 1129728e03 [formerly 9bc7fe4c771e534148b446d33de969ef53be3b0d]]]
Former-commit-id: 1129728e03
Former-commit-id: be143656eb [formerly 56ca204764]
Former-commit-id: 36219d5090
|
2013-03-27 21:54:26 -05:00 |
|
Steve Harris
|
21332cb0b5
|
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: 979d6a5d8c [formerly 2a0e399dc8] [formerly 979d6a5d8c [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]
Former-commit-id: d997aeaee4
Former-commit-id: 428ec8a472 [formerly e67b16bb03]
Former-commit-id: f3a84e952e
|
2013-03-27 18:21:05 -05:00 |
|
Steve Harris
|
f59f1f02b0
|
13.3.1-14 baseline
Former-commit-id: 91a5e4578e [formerly 9022c500ce] [formerly 91a5e4578e [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 936e4adda2 [formerly 2ca160caf0]
Former-commit-id: 8237fdadaa
|
2013-03-27 17:59:34 -05:00 |
|
Roger Ferrel
|
9b7ba22770
|
Issue #1790 Bug fixes for ticket 1353.
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc
Former-commit-id: 9b527de11a [formerly 04b57a8582] [formerly 9b527de11a [formerly 04b57a8582] [formerly 391ce5687b [formerly e0c3e3b81f679985a048047b3e5aa69992577d78]]]
Former-commit-id: 391ce5687b
Former-commit-id: c9d9b3b277 [formerly 726b5de0c5]
Former-commit-id: 1b74b2d4a4
|
2013-03-27 16:56:17 -05:00 |
|
Dustin Johnson
|
198fb2b6ae
|
Issue #1827 Create registry/datadelivery client features
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: fbcfdd0ca1 [formerly 52c27ec57f] [formerly fbcfdd0ca1 [formerly 52c27ec57f] [formerly 1684507bdb [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]
Former-commit-id: 1684507bdb
Former-commit-id: 2591041c9d [formerly f27ebfbc1b]
Former-commit-id: c5685dbe9f
|
2013-03-27 15:38:36 -05:00 |
|
Roger Ferrel
|
d61226e023
|
Issue #1790 Fix dialog in current phase.
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b
Former-commit-id: a0a86f9b13 [formerly d69674d595] [formerly a0a86f9b13 [formerly d69674d595] [formerly 1093c020e6 [formerly 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54]]]
Former-commit-id: 1093c020e6
Former-commit-id: f66a80a2ae [formerly 68ba7cab75]
Former-commit-id: d504643687
|
2013-03-27 14:11:36 -05:00 |
|
Nate Jensen
|
614a1f7738
|
Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
Former-commit-id: 7f5b3d6f84 [formerly faf937d3b0] [formerly 7f5b3d6f84 [formerly faf937d3b0] [formerly f8e5534417 [formerly 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac]]]
Former-commit-id: f8e5534417
Former-commit-id: ccf6175c43 [formerly a7548df695]
Former-commit-id: 9c7466b8e9
|
2013-03-27 11:32:19 -05:00 |
|
Nate Jensen
|
782c4b63dd
|
Merge "Issue #1735 Performance improvments for LLWSData." into development
Former-commit-id: 5624e303a8 [formerly ff7631d847] [formerly 5624e303a8 [formerly ff7631d847] [formerly b44db0bc2c [formerly 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa]]]
Former-commit-id: b44db0bc2c
Former-commit-id: 6d32957638 [formerly 314c5dcb2e]
Former-commit-id: 9353bd7d8b
|
2013-03-26 16:28:38 -05:00 |
|
Nate Jensen
|
2fe6904a03
|
Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
Former-commit-id: 807d8773ad [formerly f3fd91c311] [formerly 807d8773ad [formerly f3fd91c311] [formerly c895ee60fa [formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]]
Former-commit-id: c895ee60fa
Former-commit-id: 30bd797879 [formerly 5701030750]
Former-commit-id: 79fddbcbf5
|
2013-03-26 16:15:27 -05:00 |
|
Lee Venable
|
8e1fc66f03
|
Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
Former-commit-id: ad1983ff8d [formerly 1a59204892] [formerly ad1983ff8d [formerly 1a59204892] [formerly 049e955db9 [formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]]
Former-commit-id: 049e955db9
Former-commit-id: cb683bec2a [formerly f8d2fdacea]
Former-commit-id: f0ed70f9fb
|
2013-03-26 15:01:51 -05:00 |
|
Ben Steffensmeier
|
8d88fa1ba9
|
Issue #1791 Fix problems in SmartScript when there is no data.
Former-commit-id: 9d9443644c [formerly 6870045005] [formerly 9d9443644c [formerly 6870045005] [formerly 18311b0d18 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]]
Former-commit-id: 18311b0d18
Former-commit-id: 6d17d01f8c [formerly 69879c51df]
Former-commit-id: b76bdc602d
|
2013-03-26 14:46:11 -05:00 |
|
Lee Venable
|
125517e2d2
|
Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
Former-commit-id: 68e767daaa [formerly c86daf885b] [formerly 68e767daaa [formerly c86daf885b] [formerly c1adce3a11 [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]]
Former-commit-id: c1adce3a11
Former-commit-id: 013748405d [formerly 393e6d9ca1]
Former-commit-id: ea68209a19
|
2013-03-26 14:33:24 -05:00 |
|
Steve Harris
|
0bd1d5bdef
|
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: 4e54025fcd [formerly 5fcfaf4360] [formerly 4e54025fcd [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]]
Former-commit-id: 65df96a419
Former-commit-id: 5bb29627dc [formerly 346b97a39a]
Former-commit-id: fdd07bd72c
|
2013-03-26 12:47:40 -05:00 |
|
Steve Harris
|
0d88cd619b
|
Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 85104939ac [formerly e71c69c383] [formerly 85104939ac [formerly e71c69c383] [formerly 9ff8a94193 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 02147470db [formerly b926ff60b3]
Former-commit-id: 779adedea9
|
2013-03-26 12:44:24 -05:00 |
|
Steve Harris
|
25a851cccf
|
13.3.1-13 baseline
Former-commit-id: 792171756f [formerly c77a452f5a] [formerly 792171756f [formerly c77a452f5a] [formerly c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]
Former-commit-id: c65f3e68e5
Former-commit-id: 4f2e9aec0d [formerly 822d05a709]
Former-commit-id: 7aa4f7b265
|
2013-03-26 12:43:07 -05:00 |
|
Jonathan Sanchez
|
d31efead69
|
Issue #1819 Added precision fields for point source configuration.
Former-commit-id: a0a0199266 [formerly 79d87a96e7] [formerly a0a0199266 [formerly 79d87a96e7] [formerly b0f61cf86c [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]]
Former-commit-id: b0f61cf86c
Former-commit-id: a579da7646 [formerly eb13af2f50]
Former-commit-id: cc64195d47
|
2013-03-26 12:29:18 -05:00 |
|
Ben Steffensmeier
|
d523d6371e
|
Issue #1782 fix merge problems related to graphics API.
Former-commit-id: 0aad550439 [formerly 2b898e58c7] [formerly 0aad550439 [formerly 2b898e58c7] [formerly 6edee13cdd [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]]
Former-commit-id: 6edee13cdd
Former-commit-id: f983e5d705 [formerly 76a6213807]
Former-commit-id: 3dbd9580c5
|
2013-03-26 12:06:45 -05:00 |
|
Ben Steffensmeier
|
81814dfa65
|
Issue #1799 Fix pan/zoom when in views.
Former-commit-id: d06f011de0 [formerly 643c1c77d0] [formerly d06f011de0 [formerly 643c1c77d0] [formerly 78fdea2ba1 [formerly 2061956526bdc3da43280e6c829de1deb0a098ba]]]
Former-commit-id: 78fdea2ba1
Former-commit-id: e79778366c [formerly 5a1171f111]
Former-commit-id: 69068bbf3a
|
2013-03-26 11:44:23 -05:00 |
|
Steve Harris
|
feba54ac83
|
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: b0621d90bc [formerly fd71e44f0f] [formerly b0621d90bc [formerly fd71e44f0f] [formerly a23cecdb26 [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]
Former-commit-id: a23cecdb26
Former-commit-id: 02105701a0 [formerly e96e95b565]
Former-commit-id: e6ab1deba2
|
2013-03-26 10:12:34 -05:00 |
|
Mike Duff
|
493014d466
|
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: c1f7d33bb8 [formerly 5d72795e1b] [formerly c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: b366778df0 [formerly 4c3011edce]
Former-commit-id: efec4d0365
|
2013-03-26 09:19:39 -05:00 |
|
Ron Anderson
|
3750bb7dba
|
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: 6ab9303526 [formerly f4f180face] [formerly 6ab9303526 [formerly f4f180face] [formerly 73678261b6 [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]]
Former-commit-id: 73678261b6
Former-commit-id: e4c4862938 [formerly 7e6b601a09]
Former-commit-id: 60c1c27225
|
2013-03-25 17:53:46 -05:00 |
|
Lee Venable
|
e03985901f
|
Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
Former-commit-id: a84ef2d2c3 [formerly e467daec0c] [formerly a84ef2d2c3 [formerly e467daec0c] [formerly 05b4c2f913 [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]]
Former-commit-id: 05b4c2f913
Former-commit-id: b1ce5603a0 [formerly d73b44fa67]
Former-commit-id: b329abb111
|
2013-03-25 17:20:25 -05:00 |
|
Mike Duff
|
ac7bb442f4
|
Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9
Former-commit-id: 3d783c54be [formerly afd0de8b5b] [formerly 3d783c54be [formerly afd0de8b5b] [formerly 88e75f4a90 [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]]
Former-commit-id: 88e75f4a90
Former-commit-id: fc0b126eee [formerly b517ce9a9f]
Former-commit-id: 9a9d8f0503
|
2013-03-25 16:03:18 -05:00 |
|
Roger Ferrel
|
b27d35b29c
|
Issue #1735 Performance improvments for LLWSData.
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f
Former-commit-id: b5fc495b61 [formerly feadd01ad9] [formerly b5fc495b61 [formerly feadd01ad9] [formerly 549650c05c [formerly 0c067f6bd45f0474708af1715278d21a2a963868]]]
Former-commit-id: 549650c05c
Former-commit-id: 912e5020d7 [formerly daecc7b7f4]
Former-commit-id: 7259166afe
|
2013-03-25 15:41:01 -05:00 |
|
Max Schenkelberg
|
7c4be8a559
|
Issue #1638 Made Map scales more generalized for use outside of D2D
Amend: Added generalization to JaxbManager
Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a
Former-commit-id: dabffdbf79 [formerly fd375314cd] [formerly dabffdbf79 [formerly fd375314cd] [formerly e17d691400 [formerly 1e5812d9796a77559d70392be18619a8f7316f2d]]]
Former-commit-id: e17d691400
Former-commit-id: 8d1b555c39 [formerly 36e80c267e]
Former-commit-id: 237c742d44
|
2013-03-25 15:38:36 -05:00 |
|