Roger Ferrel
1d91e60e60
Issue #1790 Changes for non-blocking StationListDlg.
...
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 6d83f23cc2
[formerly 281e7f53cb
] [formerly c5a95dcb44
] [formerly 6d83f23cc2
[formerly 281e7f53cb
] [formerly c5a95dcb44
] [formerly 6ad80607bc
[formerly c5a95dcb44
[formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]]]
Former-commit-id: 6ad80607bc
Former-commit-id: e536a10191
[formerly ba0060522f
] [formerly b9523cc26b55358eb9448f57d15ea5437f8eccc1 [formerly de02460b11
]]
Former-commit-id: 72c5c798d9fd121c512349ee0adfe5dc6cfa9bbb [formerly 99ebeac6fd
]
Former-commit-id: 3a3e3674a8
2013-03-29 13:46:51 -05:00
Greg Armendariz
4b042a145d
Fix merge issue
...
Former-commit-id: 466fa3fd41
[formerly 611661ccc9
] [formerly cd5da3a6c5
] [formerly 466fa3fd41
[formerly 611661ccc9
] [formerly cd5da3a6c5
] [formerly 5da06cadd7
[formerly cd5da3a6c5
[formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]]]
Former-commit-id: 5da06cadd7
Former-commit-id: 7382b92b41
[formerly dcd36e64a6
] [formerly 44cbb71a5bf0c2824428a793efce64319681b9f5 [formerly f0e1b80cd2
]]
Former-commit-id: aabec0ec4490b2d78130b37cfd26e0a7ec9b56dd [formerly 57eff9d7bf
]
Former-commit-id: 9a8ce1af9e
2013-03-29 09:52:46 -05:00
Greg Armendariz
54fef6c68f
Change package location of import
...
Former-commit-id: 56f51657fd
[formerly f778112c20
] [formerly d533c5c08d
] [formerly 56f51657fd
[formerly f778112c20
] [formerly d533c5c08d
] [formerly 27345f6edf
[formerly d533c5c08d
[formerly c158a7540d23451b864a1464ab64882c3d45386d]]]]
Former-commit-id: 27345f6edf
Former-commit-id: 54231d5bcc
[formerly 05af592718
] [formerly 1061f3510ad0f3f2357e2ec1eef2f8762af60619 [formerly 089dfc87e6
]]
Former-commit-id: 8c8f0c979cc0dab06aa749a105aa5767bce4b2d6 [formerly 87e37c990e
]
Former-commit-id: 63d746dd77
2013-03-29 09:09:32 -05:00
Richard Peter
d18439e5e8
Merge "Issue #1750 - qpid updates for compatibility with operational servers" into development
...
Former-commit-id: b548239f0b
[formerly 1228c8cbbc
] [formerly b4fea10724
] [formerly b548239f0b
[formerly 1228c8cbbc
] [formerly b4fea10724
] [formerly 209d53ee67
[formerly b4fea10724
[formerly 461708424eea856dacbd2bd2af506f8f905f19c7]]]]
Former-commit-id: 209d53ee67
Former-commit-id: 16fcad80cd
[formerly affe383cf3
] [formerly 82e5c3e6f53c40ac03ff1c4efe1d517532b59faf [formerly 8b0347001d
]]
Former-commit-id: 37801977c0bd5597ef5cd0fa5551cf1cc61a4d83 [formerly a087e63bcb
]
Former-commit-id: c22b37600a
2013-03-28 16:59:18 -05:00
Steve Harris
20ece0647e
Issue #1782 - restore FFPMGenerator.java
...
Former-commit-id: 545ab48027
[formerly f01b5fb849
] [formerly e67dbb206e
] [formerly 545ab48027
[formerly f01b5fb849
] [formerly e67dbb206e
] [formerly 3953f8368b
[formerly e67dbb206e
[formerly 813033f4a2b30a669646b288eb00959922f0e804]]]]
Former-commit-id: 3953f8368b
Former-commit-id: cf60c00cb2
[formerly bec6e9099f
] [formerly 9a8ed35adf1f227ce761f695b19a7a3ab2bd96e1 [formerly a74d22efc5
]]
Former-commit-id: e85be3d04a48ce9d094adad6cc0f9c59b3b531da [formerly 92aa705ebc
]
Former-commit-id: ef1e593ebd
2013-03-28 16:06:54 -05:00
Bryan Kowal
3ad26d1b99
Issue #1750 - qpid updates for compatibility with operational servers
...
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes
Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f
Former-commit-id: a9cdcfeb64
[formerly d124f7a37f
] [formerly 2819e8fe48
] [formerly a9cdcfeb64
[formerly d124f7a37f
] [formerly 2819e8fe48
] [formerly e3c39b9be6
[formerly 2819e8fe48
[formerly 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4]]]]
Former-commit-id: e3c39b9be6
Former-commit-id: 0e463b7bc9
[formerly fa5825b0c5
] [formerly 6aae58a0db49da2bf8d5ca2ffa9bbcfa5037b662 [formerly 07a52630a7
]]
Former-commit-id: 9645bd3efad403aca10a90570bae4707b44a92e2 [formerly df6d81dfd9
]
Former-commit-id: 8cd870d757
2013-03-28 16:00:27 -05:00
Max Schenkelberg
e6e93dbc2a
Issue #1638 Added persistIndex route that only persists and indexes
...
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae
Former-commit-id: 040a09b8ab
[formerly d55e7a0eda
] [formerly e91406ab10
] [formerly 040a09b8ab
[formerly d55e7a0eda
] [formerly e91406ab10
] [formerly a308b27c2f
[formerly e91406ab10
[formerly 3d386df8a1def460f81468154964603e7c1edbe8]]]]
Former-commit-id: a308b27c2f
Former-commit-id: 232655183c
[formerly 623c49c3cc
] [formerly e4d956e4004a3d775c7a86d2f7a9ed188361fc67 [formerly d9a481f542
]]
Former-commit-id: 73b5d3c96bf8dd9ba37e4ab2e38562564605d6ee [formerly 58a5bebb80
]
Former-commit-id: b30b72252b
2013-03-28 15:45:31 -05:00
Dustin Johnson
e275e220bb
Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
...
Former-commit-id: c06f0ed7f4
[formerly 9bc6dd47b6
] [formerly c618169639
] [formerly c06f0ed7f4
[formerly 9bc6dd47b6
] [formerly c618169639
] [formerly 3991df64ff
[formerly c618169639
[formerly 88779a4fbd8078d81139b7555525142940999558]]]]
Former-commit-id: 3991df64ff
Former-commit-id: d37764f722
[formerly 3896cf42f1
] [formerly 700e4d9bcbd8afebd66b90ead899faa9b5f42bfb [formerly d900459ab4
]]
Former-commit-id: d71448462cb9ab117673ae34b2e4a8163533ee0f [formerly 9c4030ea37
]
Former-commit-id: be22a59736
2013-03-28 13:07:20 -05:00
Dustin Johnson
1b7986e692
Merge "Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager" into development
...
Former-commit-id: 2ec3e76c1c
[formerly 59393b633a
] [formerly 8583a5f785
] [formerly 2ec3e76c1c
[formerly 59393b633a
] [formerly 8583a5f785
] [formerly 51bf00bf1c
[formerly 8583a5f785
[formerly bf39f3c73e4de589855abda284c6d2d46543d283]]]]
Former-commit-id: 51bf00bf1c
Former-commit-id: a5bb46da22
[formerly ee26b669e3
] [formerly 9d4afc316993b2f4357647dcee834eee6af6bfcd [formerly db5a8b9865
]]
Former-commit-id: df99689cde8a53890c2c8b1ce2780d68fd331f83 [formerly 1cf371cd41
]
Former-commit-id: 520b9f2a69
2013-03-28 12:25:12 -05:00
Dustin Johnson
8f7c7adf90
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e
Former-commit-id: e28ea4d3ef
[formerly 5e0073f1f9
] [formerly 680d2984e1
] [formerly e28ea4d3ef
[formerly 5e0073f1f9
] [formerly 680d2984e1
] [formerly 695c83669e
[formerly 680d2984e1
[formerly f6b91884ba72412a8fad2608eca1490757df2c60]]]]
Former-commit-id: 695c83669e
Former-commit-id: 65f6842341
[formerly d0056996cd
] [formerly 49686481ddfb365c4542534bf9b1daede1aa694b [formerly 25b6eb0eb9
]]
Former-commit-id: 099c2ace4d8824649134e43cbeb7b4520268aa4a [formerly fddc41bb6e
]
Former-commit-id: 3850e46c2c
2013-03-28 12:13:23 -05:00
Benjamin Phillippe
7b0b82d34a
Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager
...
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce
Former-commit-id: c63337ac35
[formerly ec880b7923
] [formerly ed9cb5f8f6
] [formerly c63337ac35
[formerly ec880b7923
] [formerly ed9cb5f8f6
] [formerly 6640a65a51
[formerly ed9cb5f8f6
[formerly e9e7f34e87f18120232ed5cc8e00da6cb8bda5d5]]]]
Former-commit-id: 6640a65a51
Former-commit-id: 8bfd5868ca
[formerly af5827f1de
] [formerly 3ca6f8d97c36c44404ce7fb69a9938ea70b43c36 [formerly c4496475a6
]]
Former-commit-id: 81f0ba984561fbca0381870836ee4853cc303c7d [formerly 5ec3ffed77
]
Former-commit-id: cca60522c4
2013-03-28 12:08:57 -05:00
Dustin Johnson
22a62fea55
Issue #1839 Change build.edex build.xml to support building work assignment features after main build
...
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9
Former-commit-id: 2e1cc96d01
[formerly ce37e32e61
] [formerly 3be6669f1b
] [formerly 2e1cc96d01
[formerly ce37e32e61
] [formerly 3be6669f1b
] [formerly 1365d5c9af
[formerly 3be6669f1b
[formerly 1f4c7ce21abf2853a424cb4a7c478847dcdd8065]]]]
Former-commit-id: 1365d5c9af
Former-commit-id: 6ad3355dad
[formerly 1960bcbf11
] [formerly c88cf84fe3b042c261af4f646c01752674a7c487 [formerly 83f6fb720c
]]
Former-commit-id: db422ebb6e9f3dceaec4bd0424043a548411b890 [formerly f817dbe495
]
Former-commit-id: 9d04ba83a5
2013-03-28 11:43:24 -05:00
Max Schenkelberg
e5b74d9295
Issue #1638 Fix merge error
...
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 33352d0e53
[formerly 25202d8534
] [formerly 573b441662
] [formerly 33352d0e53
[formerly 25202d8534
] [formerly 573b441662
] [formerly 2b58e3ce3f
[formerly 573b441662
[formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: 0bd1554e20
[formerly abcf4bf569
] [formerly 6e4fa7c7c493c3578c067bb8eeff65574ac1665b [formerly c9301b75ea
]]
Former-commit-id: cf288f0ac84e55f21c607cccb1dced2766398f21 [formerly 223f946b90
]
Former-commit-id: 4253d92576
2013-03-28 10:20:54 -05:00
Lee Venable
63cbc67322
Merge "Issue #1790 Bug fixes for SCAN." into development
...
Former-commit-id: 87e166d88d
[formerly a891171c43
] [formerly e7805ded92
] [formerly 87e166d88d
[formerly a891171c43
] [formerly e7805ded92
] [formerly 167fa6eadf
[formerly e7805ded92
[formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]]]
Former-commit-id: 167fa6eadf
Former-commit-id: 9b754cf557
[formerly 655f06cb65
] [formerly bafa15f4cfb79c82ba6e59d41e92b5a7d5efc1f8 [formerly 772bbe23a7
]]
Former-commit-id: e07831e527fb08840c49295685f74234b4b7c302 [formerly adbaebd457
]
Former-commit-id: 03fd0004ec
2013-03-28 10:04:34 -05:00
Roger Ferrel
38ff70f9cb
Issue #1790 Bug fixes for SCAN.
...
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65
Former-commit-id: 895ac9a39b
[formerly 009cd032cb
] [formerly 9c560ab626
] [formerly 895ac9a39b
[formerly 009cd032cb
] [formerly 9c560ab626
] [formerly e204276c17
[formerly 9c560ab626
[formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]]]
Former-commit-id: e204276c17
Former-commit-id: 57b5bf2d45
[formerly 380846374f
] [formerly 14207e5f65d2b40c1876b607562886d07b1c2186 [formerly 216fa1b23b
]]
Former-commit-id: 0a4e64e987d64d9c494fbaf73ff76eb4aa2f610d [formerly 3bb55722f5
]
Former-commit-id: 18b74a6aa7
2013-03-28 09:16:24 -05:00
Roger Ferrel
f12907e546
Issue #1790 bug fix for GFE dialogs in ticket 1353.
...
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612
Former-commit-id: bb33366fc9
[formerly 57fe6b5ca6
] [formerly 98d056c3a1
] [formerly bb33366fc9
[formerly 57fe6b5ca6
] [formerly 98d056c3a1
] [formerly 4db9e20fbf
[formerly 98d056c3a1
[formerly ee4a6d815bc85f861bb7d77719c5787343625741]]]]
Former-commit-id: 4db9e20fbf
Former-commit-id: 1c3089a826
[formerly a8872882ae
] [formerly a281f6a3b00ef8635f1bebf4a15f140bf56982a7 [formerly b95a38db32
]]
Former-commit-id: 3653fa1d65c254e87b01eb0cd9f78a703f950e0d [formerly c354469c78
]
Former-commit-id: a6337e82dd
2013-03-28 09:04:10 -05:00
Steve Harris
f2a81e18e9
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 02f49bc2e4
[formerly 069ee8a748
] [formerly 9a321b6ac8
] [formerly 3073951b3d
[formerly 9a321b6ac8
[formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]]
Former-commit-id: 3073951b3d
Former-commit-id: b7beed13a5
[formerly 6e48567370
] [formerly e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7
]]
Former-commit-id: 0d9762105b7449280eb42aff17e841196ee5e518 [formerly 90ec2d3fbf
]
Former-commit-id: 53ee0151ca
2013-03-27 22:16:15 -05:00
Steve Harris
e487576093
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 16a781b20e
[formerly c284261dc2
] [formerly 3cb15755a8
] [formerly 6351d8f6d3
[formerly 3cb15755a8
[formerly 0f0b0a0c0f2f0d334ccd56f8265e2b6fd9a12902]]]]
Former-commit-id: 6351d8f6d3
Former-commit-id: 12c22ed8ac
[formerly 3138de0e06
] [formerly c359cfeed3b2c3793ee934eeb2bebd27bef69286 [formerly e56bd830ac
]]
Former-commit-id: 0cc48cc40b11883291bd20e40e182bf96356a6f7 [formerly 5102880f6e
]
Former-commit-id: 550305a7b6
2013-03-27 22:13:11 -05:00
Steve Harris
4514374145
13.3.1-14 baseline
...
Former-commit-id: bf64a0dc2f
[formerly 6a4bbd9f1a
] [formerly c29076949e
] [formerly bf64a0dc2f
[formerly 6a4bbd9f1a
] [formerly c29076949e
] [formerly 4d4234d5c9
[formerly c29076949e
[formerly e05ab5dbc442d410ae53400f087c02197ba5068b]]]]
Former-commit-id: 4d4234d5c9
Former-commit-id: 7e379468f5
[formerly e89cef72a4
] [formerly 1abdaa1a9ab7f0a79d2f0781641350605735054f [formerly c0737a6022
]]
Former-commit-id: 3c6b961749da2320d9995a467c8b8d13471fbcb3 [formerly efadc571ca
]
Former-commit-id: c1c5990b25
2013-03-27 22:10:03 -05:00
Roger Ferrel
057f05e937
Issue #1790 Bug fix for dialogs in ticket 1578
...
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90
Former-commit-id: 63ab75fec6
[formerly 5bd60ce50c
] [formerly a8410499bc
] [formerly 63ab75fec6
[formerly 5bd60ce50c
] [formerly a8410499bc
] [formerly 1129728e03
[formerly a8410499bc
[formerly 9bc7fe4c771e534148b446d33de969ef53be3b0d]]]]
Former-commit-id: 1129728e03
Former-commit-id: e920ac0aae
[formerly be143656eb
] [formerly 9d226e7317e1867a47554f09161c1a8772d04079 [formerly 56ca204764
]]
Former-commit-id: 4d5bbeb2cc38cbd8c09412564c65ce84ca101629 [formerly 36219d5090
]
Former-commit-id: cee3cd01e6
2013-03-27 21:54:26 -05:00
Richard Peter
6e9eee551c
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 52174ddb57
[formerly 642ff5e320
] [formerly 3ba331e9f5
] [formerly 2b207fc6ec
[formerly 3ba331e9f5
[formerly db45bf80d754e49429e4d6a7fd6a28f50d7fb140]]]]
Former-commit-id: 2b207fc6ec
Former-commit-id: 52459fd3cc
[formerly b061ba5595
] [formerly 422f89b43e649e651ca02e3a954f92499144263f [formerly d8cbd1ff39
]]
Former-commit-id: 7d5128c91b6fd53bd9edd1c800ecb49af4574ae5 [formerly c2896a01d2
]
Former-commit-id: 6bca38d68c
2013-03-27 18:32:38 -05:00
Richard Peter
d5aab5c91d
Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
...
Former-commit-id: b03b4b8f75
[formerly 2a71b9de1b
] [formerly 7992b43a7a
] [formerly b03b4b8f75
[formerly 2a71b9de1b
] [formerly 7992b43a7a
] [formerly 6c4f279623
[formerly 7992b43a7a
[formerly b0753a969f27d0f7903a42a535066e3ac5b354fd]]]]
Former-commit-id: 6c4f279623
Former-commit-id: 28c463775b
[formerly ce746d6228
] [formerly 55be6e5f32264ac772c6926e10bae527eaa7a2cd [formerly e68173e147
]]
Former-commit-id: 4a5aa05d01f86c1540aab9a3efbffb6f5581f05f [formerly 17a9c008d0
]
Former-commit-id: 97a4cd9e1a
2013-03-27 18:28:01 -05:00
Steve Harris
cdad316568
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 bb88c2133a
[formerly 979d6a5d8c
] [formerly 2a0e399dc8
] [formerly d997aeaee4
[formerly 2a0e399dc8
[formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]]
Former-commit-id: d997aeaee4
Former-commit-id: 3f99eed860
[formerly 428ec8a472
] [formerly d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03
]]
Former-commit-id: 81096335a88ae0f8d272c7ae379aa77289f918fa [formerly f3a84e952e
]
Former-commit-id: 21332cb0b5
2013-03-27 18:21:05 -05:00
Ben Steffensmeier
f24c14372e
Issue #1821 Reduce db and pypies requests in grid assembler.
...
Former-commit-id: 66d3c4c237
[formerly 6171d60f44
] [formerly 60d13f2282
] [formerly 66d3c4c237
[formerly 6171d60f44
] [formerly 60d13f2282
] [formerly 5add905ea7
[formerly 60d13f2282
[formerly 68febf5d9bff68e752d039fddc853a0e5793b05d]]]]
Former-commit-id: 5add905ea7
Former-commit-id: f3fdbf45bf
[formerly 1312e2ba34
] [formerly 76ee35fd160c5eff68caa2f459b481b629252e64 [formerly 37fc71a726
]]
Former-commit-id: 24d4b9c26d687a0b2ec88ba6fa980f94edb017f2 [formerly 459e00df31
]
Former-commit-id: 1f507138d3
2013-03-27 17:59:58 -05:00
Steve Harris
43942dad11
13.3.1-14 baseline
...
Former-commit-id: f9b3430485
[formerly 91a5e4578e
] [formerly 9022c500ce
] [formerly f9b3430485
[formerly 91a5e4578e
] [formerly 9022c500ce
] [formerly 9fba973fd0
[formerly 9022c500ce
[formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 3cbf22bd96
[formerly 936e4adda2
] [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0
]]
Former-commit-id: 8c6b23e522a402fa4cd1e6df150e646e4689e3b0 [formerly 8237fdadaa
]
Former-commit-id: f59f1f02b0
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
046233d3d6
Issue #1821 make GridInfoCache more elaborate.
...
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9
Former-commit-id: bedc1bce0a
[formerly a31dc1874b
] [formerly bc8729d631
] [formerly bedc1bce0a
[formerly a31dc1874b
] [formerly bc8729d631
] [formerly 4b6d2fd8d1
[formerly bc8729d631
[formerly c7b4e7c982fb682779b729d1a8a8fb5ff6f5e1d2]]]]
Former-commit-id: 4b6d2fd8d1
Former-commit-id: c46190259b
[formerly 60b2259343
] [formerly 685e6735636d4f309a314a4ceda7fb70182b8d08 [formerly e4462ee41a
]]
Former-commit-id: bed489685318ce7bd5ace6503ca4ee1681473d91 [formerly 03eade5b98
]
Former-commit-id: 07438ab40a
2013-03-27 17:28:45 -05:00
Benjamin Phillippe
977a96e419
Issue #1802 Fixes related to DD transaction refactor
...
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1
Former-commit-id: 1e30861a21
[formerly 30be5ce6f9
] [formerly 115dc12790
] [formerly 1e30861a21
[formerly 30be5ce6f9
] [formerly 115dc12790
] [formerly 2a14245dce
[formerly 115dc12790
[formerly 393a469e2f65894a6dd5b58c1431c3d727951eda]]]]
Former-commit-id: 2a14245dce
Former-commit-id: 0d769d03c0
[formerly 3cc6978718
] [formerly 2e9d43de3c79391b705e7ea079b7e2665d9ca96f [formerly b0010de8ff
]]
Former-commit-id: 1500101ef9ca19c8fd54bb60fa6990523169ff1b [formerly 5f8b73fadd
]
Former-commit-id: 781b70a8cc
2013-03-27 17:12:52 -05:00
Richard Peter
0d9bf66096
Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
...
Former-commit-id: 5063faa546
[formerly c11b070571
] [formerly c8ae09ab1d
] [formerly 5063faa546
[formerly c11b070571
] [formerly c8ae09ab1d
] [formerly 70a7c3c556
[formerly c8ae09ab1d
[formerly a104b57c33655022bc142b71e909e8fb1b1c022b]]]]
Former-commit-id: 70a7c3c556
Former-commit-id: 2ae52dbaee
[formerly be2a8e1b16
] [formerly 393cfacf90d5055883f5b301797a7483965f899b [formerly de88cceb8c
]]
Former-commit-id: a3040a69a63554ef36080379b737ffb513f3e5ca [formerly 09801abaf4
]
Former-commit-id: 0522d43c7f
2013-03-27 17:08:00 -05:00
Roger Ferrel
2f6183f158
Issue #1790 Bug fixes for ticket 1353.
...
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc
Former-commit-id: 7a4d48d489
[formerly 9b527de11a
] [formerly 04b57a8582
] [formerly 7a4d48d489
[formerly 9b527de11a
] [formerly 04b57a8582
] [formerly 391ce5687b
[formerly 04b57a8582
[formerly e0c3e3b81f679985a048047b3e5aa69992577d78]]]]
Former-commit-id: 391ce5687b
Former-commit-id: 9e1fd195e3
[formerly c9d9b3b277
] [formerly d61178e812fe7ec24f484b7229ff2ecd243afc21 [formerly 726b5de0c5
]]
Former-commit-id: ec38ab4571cb3089197719610f8106f99ca7f2f9 [formerly 1b74b2d4a4
]
Former-commit-id: 9b7ba22770
2013-03-27 16:56:17 -05:00
Dustin Johnson
e01c368285
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 5dbff646aa
[formerly fbcfdd0ca1
] [formerly 52c27ec57f
] [formerly 1684507bdb
[formerly 52c27ec57f
[formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]]
Former-commit-id: 1684507bdb
Former-commit-id: 49c53e5443
[formerly 2591041c9d
] [formerly 9858dbcf0e7632be9b6d9beae6fc5e2f1573062d [formerly f27ebfbc1b
]]
Former-commit-id: 9f863145bc53a4b320485d6a4c216ac1f5122e9a [formerly c5685dbe9f
]
Former-commit-id: 198fb2b6ae
2013-03-27 15:38:36 -05:00
Roger Ferrel
7cde992568
Issue #1790 Fix dialog in current phase.
...
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b
Former-commit-id: bdfca9ce6b
[formerly a0a86f9b13
] [formerly d69674d595
] [formerly bdfca9ce6b
[formerly a0a86f9b13
] [formerly d69674d595
] [formerly 1093c020e6
[formerly d69674d595
[formerly 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54]]]]
Former-commit-id: 1093c020e6
Former-commit-id: 021fab7569
[formerly f66a80a2ae
] [formerly 8d0f976ddc4f14c7aeeb13ceee81e6ebcbb699de [formerly 68ba7cab75
]]
Former-commit-id: 1331782bf7a3d08537582e3a0c9ae86580f29582 [formerly d504643687
]
Former-commit-id: d61226e023
2013-03-27 14:11:36 -05:00
Ben Steffensmeier
52709e081c
Issue #1821 Speed up GridInfoCache.
...
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40
Former-commit-id: a19226c906
[formerly bd35a06d51
] [formerly 2a13abd32c
] [formerly a19226c906
[formerly bd35a06d51
] [formerly 2a13abd32c
] [formerly 6f525a81b4
[formerly 2a13abd32c
[formerly fde9f936e53a998f8cde174935d00287e6aaf70c]]]]
Former-commit-id: 6f525a81b4
Former-commit-id: 17a32dc6f1
[formerly bc0153dbba
] [formerly ee1c17f89fa0985092ccae8f5eba07c346c20a39 [formerly 72724108b7
]]
Former-commit-id: 4caaddd0495a788e3d45d3396506e29eff201d04 [formerly b621850bc6
]
Former-commit-id: 06030b77b4
2013-03-27 13:21:33 -05:00
Nate Jensen
bdcaff0e24
Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
...
Former-commit-id: 2516680caf
[formerly 7f5b3d6f84
] [formerly faf937d3b0
] [formerly 2516680caf
[formerly 7f5b3d6f84
] [formerly faf937d3b0
] [formerly f8e5534417
[formerly faf937d3b0
[formerly 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac]]]]
Former-commit-id: f8e5534417
Former-commit-id: 87e6c58ada
[formerly ccf6175c43
] [formerly 773d09bbcd8e3e369ba739f7482d25dbd1b2f6ce [formerly a7548df695
]]
Former-commit-id: 6893a79ceaacaa477399eedba28f677624c07049 [formerly 9c7466b8e9
]
Former-commit-id: 614a1f7738
2013-03-27 11:32:19 -05:00
Ron Anderson
b55ddcee24
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 7ce946600d
[formerly 60735ddd83
] [formerly 841a69ed59
] [formerly 33d78bc7ee
[formerly 841a69ed59
[formerly 9b35437ccfecaf70470a9a96fbc3acacd7cf1405]]]]
Former-commit-id: 33d78bc7ee
Former-commit-id: 95001bf982
[formerly dc74b366e9
] [formerly 1fc510c7e309d9f5688d57b181aa1c1152754c4e [formerly 6a393ee4f9
]]
Former-commit-id: a46eda2c78ecb8612e47c3c6c65a765b13663cb6 [formerly 3fbeeadef3
]
Former-commit-id: 583d14ad21
2013-03-27 11:22:48 -05:00
Nate Jensen
b54bc5364f
Merge "Issue #1832 fix getNumPy() error handling" into omaha_13.3.1
...
Former-commit-id: 2d5ec59d57
[formerly caeb823043
] [formerly dd3601a873
] [formerly 2d5ec59d57
[formerly caeb823043
] [formerly dd3601a873
] [formerly aaf2d7bc2a
[formerly dd3601a873
[formerly f1cabae64e37120f27235ec44b4bd7a1921fe621]]]]
Former-commit-id: aaf2d7bc2a
Former-commit-id: ad691d7deb
[formerly adeeccc9c7
] [formerly ece186ad016279cdd4244f8b4cc68f07db841659 [formerly da024a1044
]]
Former-commit-id: cdd0c64ff7111693a18db23487701788c8d05df7 [formerly 329a106ef3
]
Former-commit-id: 185b0ebbc2
2013-03-27 11:16:56 -05:00
Mike Duff
4f6720a362
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 0e1b566dd1
[formerly 1beb6e4fa5
] [formerly 1958700112
] [formerly 302dbf2cfb
[formerly 1958700112
[formerly 5304de6fff49f3db7a3b46427077c7d2d9c0b3f9]]]]
Former-commit-id: 302dbf2cfb
Former-commit-id: be438c6fec
[formerly c143b356ef
] [formerly 44a7dc0c858099a53c302c46a726f699843c6b9e [formerly 3d1c1b146c
]]
Former-commit-id: c9a3b5997a4cce3036f764ce1bf73551bf3542bd [formerly 16f03eb52c
]
Former-commit-id: e8d921f415
2013-03-27 10:38:59 -05:00
Richard Peter
e962480999
Issue #1833 : Add performance log file to ingest and ingestGrib
...
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d
Former-commit-id: 485a15cc15
[formerly 25d4905570
] [formerly 5287a3296b
] [formerly 485a15cc15
[formerly 25d4905570
] [formerly 5287a3296b
] [formerly b75ceeeeb3
[formerly 5287a3296b
[formerly 53cb92842c43349968b70bb5fec5beb100773b63]]]]
Former-commit-id: b75ceeeeb3
Former-commit-id: b2a73c8d44
[formerly 6923e10550
] [formerly 4a26b55e8490ddfd0f35dfb9dc124a2fe903a855 [formerly f99242f539
]]
Former-commit-id: 1fa4e3bd516a4977c836f977106434dab62287a5 [formerly 33c602b13e
]
Former-commit-id: 786b68279d
2013-03-26 20:55:42 -05:00
Nate Jensen
91981ee9da
Issue #1832 fix getNumPy() error handling
...
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405
Former-commit-id: 49fdcf9e55
[formerly dc53db5181
] [formerly e4cdfe0ca9
] [formerly 49fdcf9e55
[formerly dc53db5181
] [formerly e4cdfe0ca9
] [formerly 74b21dc1b4
[formerly e4cdfe0ca9
[formerly ce7e89b8300580a57a5c133a78e8c84e2cb7449e]]]]
Former-commit-id: 74b21dc1b4
Former-commit-id: d3bd10f1f2
[formerly 0cf9a03133
] [formerly 22ed5d848545d777dd0f275f81d9601e754f7d4f [formerly 494a673c37
]]
Former-commit-id: deb894038ea05f553bcc6b86032347aefd7562d8 [formerly d1d647a778
]
Former-commit-id: d7a7b66b1d
2013-03-26 18:30:19 -05:00
Nate Jensen
343b22daaa
Merge "Issue #1735 Performance improvments for LLWSData." into development
...
Former-commit-id: 74901e9999
[formerly 5624e303a8
] [formerly ff7631d847
] [formerly 74901e9999
[formerly 5624e303a8
] [formerly ff7631d847
] [formerly b44db0bc2c
[formerly ff7631d847
[formerly 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa]]]]
Former-commit-id: b44db0bc2c
Former-commit-id: d7c57134e9
[formerly 6d32957638
] [formerly 8beb70dbf586e75fc3f3f21fe48809828f454906 [formerly 314c5dcb2e
]]
Former-commit-id: d0a85da3eaaaaa8b4cf2e0c8793160e3a066141d [formerly 9353bd7d8b
]
Former-commit-id: 782c4b63dd
2013-03-26 16:28:38 -05:00
Nate Jensen
1be547bd18
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 d612495967
[formerly 807d8773ad
] [formerly f3fd91c311
] [formerly c895ee60fa
[formerly f3fd91c311
[formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]]]
Former-commit-id: c895ee60fa
Former-commit-id: 55572918b3
[formerly 30bd797879
] [formerly d25e380bfd45fba9e5ddfb52706b916c9ca113fd [formerly 5701030750
]]
Former-commit-id: 5b1b00ab1f2528e1f058be4b96ac173613309bce [formerly 79fddbcbf5
]
Former-commit-id: 2fe6904a03
2013-03-26 16:15:27 -05:00
Richard Peter
6f0d340f2a
Merge "Issue #1828 Fix intlsigmets and text pattern." into omaha_13.3.1
...
Former-commit-id: c26a9bb1cf
[formerly ac3619cc77
] [formerly fa7fb4765f
] [formerly c26a9bb1cf
[formerly ac3619cc77
] [formerly fa7fb4765f
] [formerly cbf915093f
[formerly fa7fb4765f
[formerly e9a9cbc4b3c20dce7dc39837c9aab4ae5ef6e01a]]]]
Former-commit-id: cbf915093f
Former-commit-id: ec2de612de
[formerly 4f326d5c39
] [formerly f1a1ddfa372b73189cb7aa40c0859c04f7c6c041 [formerly f941b97c06
]]
Former-commit-id: c39249b7e6fdde16396f1df53023031a7c3f5c91 [formerly 047c3d0e37
]
Former-commit-id: 7c40d051f5
2013-03-26 15:33:33 -05:00
Lee Venable
1a7a72fdc7
Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
...
Former-commit-id: 48ad5b71b7
[formerly ad1983ff8d
] [formerly 1a59204892
] [formerly 48ad5b71b7
[formerly ad1983ff8d
] [formerly 1a59204892
] [formerly 049e955db9
[formerly 1a59204892
[formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]]]
Former-commit-id: 049e955db9
Former-commit-id: 84c0e0646f
[formerly cb683bec2a
] [formerly 8033bef0cab6c2d4a5d319f4cbe92e628918c084 [formerly f8d2fdacea
]]
Former-commit-id: b74d60f9002d68f3fdaf2d9f1f5818be61d4a1af [formerly f0ed70f9fb
]
Former-commit-id: 8e1fc66f03
2013-03-26 15:01:51 -05:00
Roger Ferrel
396cc261b2
Issue #1828 Fix intlsigmets and text pattern.
...
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0
Former-commit-id: df2a9d8f96
[formerly 6a4bd66abc
] [formerly 19074d3053
] [formerly df2a9d8f96
[formerly 6a4bd66abc
] [formerly 19074d3053
] [formerly 74389834de
[formerly 19074d3053
[formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]]]
Former-commit-id: 74389834de
Former-commit-id: dea028c7fc
[formerly 7244b4d23c
] [formerly ac5853bb00b807a9281ab41fb9a03069a5f9ac8e [formerly 4c5aa32169
]]
Former-commit-id: a5932806895275b2c8af4b0f876ddbd93ef872a1 [formerly 8cdcee0ec5
]
Former-commit-id: d76cbc6e80
2013-03-26 14:47:48 -05:00
Ben Steffensmeier
2c423f245f
Issue #1791 Fix problems in SmartScript when there is no data.
...
Former-commit-id: 92f0268a14
[formerly 9d9443644c
] [formerly 6870045005
] [formerly 92f0268a14
[formerly 9d9443644c
] [formerly 6870045005
] [formerly 18311b0d18
[formerly 6870045005
[formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]]]
Former-commit-id: 18311b0d18
Former-commit-id: 2429a1bfe6
[formerly 6d17d01f8c
] [formerly 82ebfcf0bec3c1a3cc3ba64906816bbfe0a2f369 [formerly 69879c51df
]]
Former-commit-id: eaf75a756a4cc2766123339d4af193eb0d72294a [formerly b76bdc602d
]
Former-commit-id: 8d88fa1ba9
2013-03-26 14:46:11 -05:00
Lee Venable
6a0520bd0c
Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
...
Former-commit-id: 954db8db28
[formerly 68e767daaa
] [formerly c86daf885b
] [formerly 954db8db28
[formerly 68e767daaa
] [formerly c86daf885b
] [formerly c1adce3a11
[formerly c86daf885b
[formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]]]
Former-commit-id: c1adce3a11
Former-commit-id: caf01174bb
[formerly 013748405d
] [formerly 4d0bced50facefee11d7f7c6479d9607164529af [formerly 393e6d9ca1
]]
Former-commit-id: 59de3c16bd5e71c59f11d770c1f23705a7815186 [formerly ea68209a19
]
Former-commit-id: 125517e2d2
2013-03-26 14:33:24 -05:00
Richard Peter
110ec4b47a
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 469f7c60fb
[formerly ce83569845
] [formerly b947a52604
] [formerly 7ee513dfed
[formerly b947a52604
[formerly b1acf59c03ab308b86843a314d4795f6392de844]]]]
Former-commit-id: 7ee513dfed
Former-commit-id: e4656678c9
[formerly 9c5ce8e741
] [formerly 6c418300d90241b2b4b90041a1b7a3d4ae13dd41 [formerly 45a2f3f3dd
]]
Former-commit-id: be795e15eceab50216c9bc5be3cbe436ab71f5d2 [formerly 109b578382
]
Former-commit-id: 2e5fdfc82c
2013-03-26 12:59:47 -05:00
Steve Harris
56522d8cf5
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 690f451746
[formerly 4e54025fcd
] [formerly 5fcfaf4360
] [formerly 65df96a419
[formerly 5fcfaf4360
[formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]]]
Former-commit-id: 65df96a419
Former-commit-id: 6e4b9a6f01
[formerly 5bb29627dc
] [formerly db9839345c6d211e370f415e6567c95c5596977e [formerly 346b97a39a
]]
Former-commit-id: 0576f0394c9924a93def2e1b0d821a8dd15e6468 [formerly fdd07bd72c
]
Former-commit-id: 0bd1d5bdef
2013-03-26 12:47:40 -05:00
Steve Harris
d8a9db1e5c
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 8d1903034b
[formerly 85104939ac
] [formerly e71c69c383
] [formerly 8d1903034b
[formerly 85104939ac
] [formerly e71c69c383
] [formerly 9ff8a94193
[formerly e71c69c383
[formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 072b1bf35e
[formerly 02147470db
] [formerly 9cd89cdae60b1bb313162de31e0e2c592984280a [formerly b926ff60b3
]]
Former-commit-id: 75eb70e2f016a2173b886ec488d1cbc6651d6e51 [formerly 779adedea9
]
Former-commit-id: 0d88cd619b
2013-03-26 12:44:24 -05:00
Steve Harris
a33631faa5
13.3.1-13 baseline
...
Former-commit-id: 0f2ebb8f10
[formerly 792171756f
] [formerly c77a452f5a
] [formerly 0f2ebb8f10
[formerly 792171756f
] [formerly c77a452f5a
] [formerly c65f3e68e5
[formerly c77a452f5a
[formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]]
Former-commit-id: c65f3e68e5
Former-commit-id: b49c1b0fa8
[formerly 4f2e9aec0d
] [formerly 24c9dcc4807f8692b6eb63ba5946c346d7126d11 [formerly 822d05a709
]]
Former-commit-id: 3a3a2fa20a832cb9027d27e82dc69e0c20123169 [formerly 7aa4f7b265
]
Former-commit-id: 25a851cccf
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
16ad8874b9
Issue #1819 Added precision fields for point source configuration.
...
Former-commit-id: 6b85338835
[formerly a0a0199266
] [formerly 79d87a96e7
] [formerly 6b85338835
[formerly a0a0199266
] [formerly 79d87a96e7
] [formerly b0f61cf86c
[formerly 79d87a96e7
[formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]]]
Former-commit-id: b0f61cf86c
Former-commit-id: 4236ca46f5
[formerly a579da7646
] [formerly 329fc238b833ee77ae27cbf2f25470dc6acf6e48 [formerly eb13af2f50
]]
Former-commit-id: 60a6c0f29a551f6234b42cc9f7a195f867e5c912 [formerly cc64195d47
]
Former-commit-id: d31efead69
2013-03-26 12:29:18 -05:00