Nate Jensen
|
c82a67f378
|
Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
Former-commit-id: cb6cd91f06 [formerly ab28523a09] [formerly e8b5b33c4c8ab18f2df27e54bff8de6a2458c098 [formerly f57358cff8]] [formerly 8f9ec8dd2c [formerly f57358cff8 [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 98771bb0bfd73fcc71ef677f5788874166df11aa [formerly 374eed35b3]
Former-commit-id: 1ad5bb1a52
|
2013-04-02 14:29:15 -05:00 |
|
Dustin Johnson
|
c42ca22867
|
Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
Amend:
Use TimeUtil.newGmtCalendar() and remove whitespace only change
Add TODO for point data types.
Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3
Former-commit-id: 5b7fcb1ce2 [formerly 48a2002e68] [formerly c981b7250f] [formerly 6129d86be4 [formerly c981b7250f [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]
Former-commit-id: 6129d86be4
Former-commit-id: e2262bcbcadbf80beb178caf980ef3cfba79d608 [formerly dd8f4d8454]
Former-commit-id: 644ed2396d
|
2013-04-01 15:35:51 -05:00 |
|
Max Schenkelberg
|
984e67acda
|
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: a59484e232 [formerly 9d032f3e84] [formerly b32fbad9c8] [formerly 547190329b [formerly b32fbad9c8 [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]
Former-commit-id: 547190329b
Former-commit-id: a0a981e01aeb782ac1535e091405ef4a6146176b [formerly 635388a7ad]
Former-commit-id: ba262e2bc5
|
2013-04-01 12:41:50 -05:00 |
|
Lee Venable
|
7e4696f582
|
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
Former-commit-id: 6109daf744 [formerly e994040887] [formerly 4a8c4b64df] [formerly f1e8faf9ff [formerly 4a8c4b64df [formerly 9c117d43e77ffa074c8464771918116f8835b382]]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 80217d8bb653fed512ec88e601b9cf14286e1708 [formerly 35d27f89f1]
Former-commit-id: 58c83b9662
|
2013-04-01 12:26:23 -05:00 |
|
Steve Harris
|
47c7f66f2b
|
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: 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]
Former-commit-id: 437a04011a
Former-commit-id: 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314]
Former-commit-id: 7b27767d7e
|
2013-04-01 12:19:04 -05:00 |
|
Steve Harris
|
12055591ea
|
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: d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]
Former-commit-id: 14c9de2259
Former-commit-id: a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82]
Former-commit-id: f85a1ab9ab
|
2013-04-01 12:15:04 -05:00 |
|
Lee Venable
|
1c1b083dbf
|
Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
Former-commit-id: 35413b2833 [formerly 7d73b8dacf] [formerly fe89cb7fe4] [formerly d3390596f4 [formerly fe89cb7fe4 [formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]]
Former-commit-id: d3390596f4
Former-commit-id: 68ab799532cdacaca9c02a6f89555b70848b70ca [formerly 89da26a266]
Former-commit-id: 4e95ffe2ae
|
2013-04-01 12:06:16 -05:00 |
|
Steve Harris
|
a6ff543f88
|
13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]
Former-commit-id: ef413da5f7
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
994aab5c6a
|
13.3.1-16 baseline
Former-commit-id: 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 3066dd33e5 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 4ee75d69123e11d9ab2091fbd33d33a09b414210 [formerly 36a4b3eb51]
Former-commit-id: 6b75202d07
|
2013-04-01 11:39:08 -05:00 |
|
Mike Duff
|
0f3223b8b9
|
Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: eb0a77c8ac [formerly fa8ca827d1] [formerly 261a39122d] [formerly 9c2ac87482 [formerly 261a39122d [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]]
Former-commit-id: 9c2ac87482
Former-commit-id: 40f4ad0f38b194a5fd5090487f0a7c14332e060c [formerly 11ca7c2c20]
Former-commit-id: e627279d7c
|
2013-04-01 11:36:53 -05:00 |
|
Richard Peter
|
fcbac13167
|
Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
Former-commit-id: b921a25faf [formerly 2fa88522ff] [formerly e221223f8a] [formerly 255617199c [formerly e221223f8a [formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]]
Former-commit-id: 255617199c
Former-commit-id: 278bd2cb7526a3ad41f96620998122ab2e04cbef [formerly ea4a599a5a]
Former-commit-id: 65f317e56b
|
2013-04-01 11:33:59 -05:00 |
|
Steve Harris
|
4df1b4aeae
|
13.3.1-15 baseline
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]
Former-commit-id: 2bf790aae3
|
2013-04-01 11:33:20 -05:00 |
|
Max Schenkelberg
|
af56d47973
|
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: 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 321a29ffa4 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]
Former-commit-id: 51d976e5e2
Former-commit-id: e3dd868a83e249e4b426fe0bcf89cd02cc3f3360 [formerly 1c35a54a9f]
Former-commit-id: 8de3a70962
|
2013-04-01 10:19:36 -05:00 |
|
Lee Venable
|
ec82403afa
|
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
Former-commit-id: b100693786 [formerly 7389bf5b29] [formerly 2875600910] [formerly 0bfc05ce61 [formerly 2875600910 [formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]]
Former-commit-id: 0bfc05ce61
Former-commit-id: 4e6a76ba3f476fd4e5523e043921ad6ad3166ef7 [formerly 3d683e98a9]
Former-commit-id: ebfa8ea79c
|
2013-04-01 09:40:59 -05:00 |
|
Roger Ferrel
|
b78126a764
|
Issue #1790 Changes for non-blocking StationProfileDlg.
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: 7551b03bfe [formerly e1b40f9f2f] [formerly 0d269691e2] [formerly d21cb5e2e8 [formerly 0d269691e2 [formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]]
Former-commit-id: d21cb5e2e8
Former-commit-id: 9aeb83700b132f9f7b7a467ee07c274704d24266 [formerly 944d03615e]
Former-commit-id: 86e21acae2
|
2013-03-29 17:11:02 -05:00 |
|
Ben Steffensmeier
|
d2fa8b7c0c
|
Issue #1799 fix modal tools again.
Former-commit-id: 0802c4cd3d [formerly cffac354e8] [formerly eeeede7288] [formerly 66af8daa11 [formerly eeeede7288 [formerly c1a69f88df85478571394c0e125617c93100168d]]]
Former-commit-id: 66af8daa11
Former-commit-id: 788f9b6d4dfdc20ad93f496e50d5d0160cd0daa5 [formerly 7082466303]
Former-commit-id: 11e6afa5fa
|
2013-03-29 14:30:54 -05:00 |
|
Roger Ferrel
|
e536a10191
|
Issue #1790 Changes for non-blocking StationListDlg.
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 6d83f23cc2 [formerly 281e7f53cb] [formerly c5a95dcb44] [formerly 6ad80607bc [formerly c5a95dcb44 [formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]]
Former-commit-id: 6ad80607bc
Former-commit-id: b9523cc26b55358eb9448f57d15ea5437f8eccc1 [formerly de02460b11]
Former-commit-id: ba0060522f
|
2013-03-29 13:46:51 -05:00 |
|
Roger Ferrel
|
ecdb29cc1d
|
Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 9c498726af [formerly 20f6baba0e] [formerly 8f4492c63c] [formerly 463407a40e [formerly 8f4492c63c [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]]
Former-commit-id: 463407a40e
Former-commit-id: b5cf324e1831cdc6b8016baf3b449a6934efcbe0 [formerly ec5f32aec6]
Former-commit-id: 8c1116eaae
|
2013-03-29 11:35:08 -05:00 |
|
Ron Anderson
|
ba064a146a
|
Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089
Former-commit-id: d7f0cfe92d [formerly 4ac9a4d9a8] [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 0f4fb125b0 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]
Former-commit-id: c7cfcf0250
Former-commit-id: b7666888685e677f58fc852f5e79b4f07dcfe700 [formerly 9cfa87f7e5]
Former-commit-id: cd0f319ec5
|
2013-03-29 10:48:26 -05:00 |
|
Nate Jensen
|
8092e699e6
|
Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
Former-commit-id: 9d74722ce0 [formerly 3ad797690b] [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly 214b2ed4ba [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 30f54582860a05d8d3bdb9a1608610e277dc1958 [formerly 711fbe98d2]
Former-commit-id: 946323416c
|
2013-03-28 17:02:14 -05:00 |
|
Ben Steffensmeier
|
d7d0ea7264
|
Issue #1799 fix activation of tools for new perspectives.
Former-commit-id: 6bf1ec8543 [formerly dcbed65681] [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly 50a276a7e2 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]
Former-commit-id: 4efa92ff49
Former-commit-id: 2aaf804695afe25cc1d0feb84ab77be8addda34b [formerly a415fb17ae]
Former-commit-id: 33de9bfc87
|
2013-03-28 15:47:36 -05:00 |
|
Ron Anderson
|
65dd075089
|
Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly b65ecfc151 [formerly 5bb47b7931 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]
Former-commit-id: b65ecfc151
Former-commit-id: 8becee59e148ef01f28560b8511322fa50267284 [formerly 3f2fa771d9]
Former-commit-id: 33bcf5fee8
|
2013-03-28 13:37:29 -05:00 |
|
Max Schenkelberg
|
0bd1554e20
|
Issue #1638 Fix merge error
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 33352d0e53 [formerly 25202d8534] [formerly 573b441662] [formerly 2b58e3ce3f [formerly 573b441662 [formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: 6e4fa7c7c493c3578c067bb8eeff65574ac1665b [formerly c9301b75ea]
Former-commit-id: abcf4bf569
|
2013-03-28 10:20:54 -05:00 |
|
Lee Venable
|
9b754cf557
|
Merge "Issue #1790 Bug fixes for SCAN." into development
Former-commit-id: 87e166d88d [formerly a891171c43] [formerly e7805ded92] [formerly 167fa6eadf [formerly e7805ded92 [formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]]
Former-commit-id: 167fa6eadf
Former-commit-id: bafa15f4cfb79c82ba6e59d41e92b5a7d5efc1f8 [formerly 772bbe23a7]
Former-commit-id: 655f06cb65
|
2013-03-28 10:04:34 -05:00 |
|
Roger Ferrel
|
57b5bf2d45
|
Issue #1790 Bug fixes for SCAN.
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65
Former-commit-id: 895ac9a39b [formerly 009cd032cb] [formerly 9c560ab626] [formerly e204276c17 [formerly 9c560ab626 [formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]]
Former-commit-id: e204276c17
Former-commit-id: 14207e5f65d2b40c1876b607562886d07b1c2186 [formerly 216fa1b23b]
Former-commit-id: 380846374f
|
2013-03-28 09:16:24 -05:00 |
|
Roger Ferrel
|
1c3089a826
|
Issue #1790 bug fix for GFE dialogs in ticket 1353.
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612
Former-commit-id: bb33366fc9 [formerly 57fe6b5ca6] [formerly 98d056c3a1] [formerly 4db9e20fbf [formerly 98d056c3a1 [formerly ee4a6d815bc85f861bb7d77719c5787343625741]]]
Former-commit-id: 4db9e20fbf
Former-commit-id: a281f6a3b00ef8635f1bebf4a15f140bf56982a7 [formerly b95a38db32]
Former-commit-id: a8872882ae
|
2013-03-28 09:04:10 -05:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|