Max Schenkelberg
|
bb8e2cf3e1
|
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 a59484e232 [formerly 9d032f3e84] [formerly b32fbad9c8] [formerly 547190329b [formerly b32fbad9c8 [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]]
Former-commit-id: 547190329b
Former-commit-id: 984e67acda [formerly ba262e2bc5] [formerly a0a981e01aeb782ac1535e091405ef4a6146176b [formerly 635388a7ad]]
Former-commit-id: 27d68b81294fdcff628db2407a3b0b00c4165e1d [formerly 80b0f7c159]
Former-commit-id: ee60a2a80c
|
2013-04-01 12:41:50 -05:00 |
|
Steve Harris
|
6a3f6359d6
|
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 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]]
Former-commit-id: 437a04011a
Former-commit-id: 47c7f66f2b [formerly 7b27767d7e] [formerly 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314]]
Former-commit-id: c1b945c05c86c82b34cd95220cf0b30459a58dc4 [formerly d0e61c59e8]
Former-commit-id: ac6704c7e9
|
2013-04-01 12:19:04 -05:00 |
|
Steve Harris
|
4dc4b40b9f
|
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 d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]]
Former-commit-id: 14c9de2259
Former-commit-id: 12055591ea [formerly f85a1ab9ab] [formerly a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82]]
Former-commit-id: 700a93f7091a2759b6631f6d92c36ed5def40795 [formerly 0fee31b1a8]
Former-commit-id: e74f4ae39e
|
2013-04-01 12:15:04 -05:00 |
|
Steve Harris
|
fd3b082c54
|
13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
622caf8d93
|
13.3.1-15 baseline
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 4df1b4aeae [formerly 2bf790aae3] [formerly 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]]
Former-commit-id: 2638b93048c278492c5ba927b77742ee53322508 [formerly 4204273f21]
Former-commit-id: cc1ef45545
|
2013-04-01 11:33:20 -05:00 |
|
Max Schenkelberg
|
aeb8a97b02
|
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 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 321a29ffa4 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]]
Former-commit-id: 51d976e5e2
Former-commit-id: af56d47973 [formerly 8de3a70962] [formerly e3dd868a83e249e4b426fe0bcf89cd02cc3f3360 [formerly 1c35a54a9f]]
Former-commit-id: 62b962b1d377e7f942551913bb5a435bea8c88c7 [formerly 01c2d29c1b]
Former-commit-id: a29eff544b
|
2013-04-01 10:19:36 -05:00 |
|
Ron Anderson
|
92a156fe0f
|
Issue #1774 Fix invalid unit strings in parameterInfo files.
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de
Former-commit-id: ef06834e54 [formerly cfb324f380] [formerly aeb451a37c] [formerly ef06834e54 [formerly cfb324f380] [formerly aeb451a37c] [formerly 679bb01764 [formerly aeb451a37c [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]]]
Former-commit-id: 679bb01764
Former-commit-id: 6cd8d1e8ee [formerly d5e3976dc4] [formerly 905f44a12ebe7347d47fb3a96c6a47ac28a6024f [formerly 96e8f63679]]
Former-commit-id: 4a42a154f1df90e4b82ead30ff3b512563ee1f14 [formerly 22f633b2a1]
Former-commit-id: 1eede44aac
|
2013-03-29 10:07:37 -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 |
|
David Gillingham
|
7fdc3419ec
|
Issue #1837: Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0
Former-commit-id: 2ee53d54f5 [formerly 170f252bdd] [formerly 8a7c965eaa] [formerly 2ee53d54f5 [formerly 170f252bdd] [formerly 8a7c965eaa] [formerly c9ed59b0e0 [formerly 8a7c965eaa [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]]]
Former-commit-id: c9ed59b0e0
Former-commit-id: acc3ac1c03 [formerly fddd42615d] [formerly 9f4cd32b5571d903c6b3f5e023a5fb8faddecd4f [formerly dbec0fa00f]]
Former-commit-id: 90bc9337ad9dafe74c0cc603a354d9e435dfdd1e [formerly 0b155a5788]
Former-commit-id: 4c1c4e665e
|
2013-03-28 17:18:43 -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 |
|
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 |
|
Ron Anderson
|
80ce55bd3a
|
Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly b65ecfc151 [formerly 5bb47b7931 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]]
Former-commit-id: b65ecfc151
Former-commit-id: 65dd075089 [formerly 33bcf5fee8] [formerly 8becee59e148ef01f28560b8511322fa50267284 [formerly 3f2fa771d9]]
Former-commit-id: 378adfc06dd24afcb2243ae4d39d879540f2cf23 [formerly 5eb1885dbd]
Former-commit-id: bef17d4f03
|
2013-03-28 13:37:29 -05:00 |
|
Steve Harris
|
0528a1c5d2
|
Revert "Replaced with formatted version"
This reverts commit 911496b339 [formerly 20c9d653c8] [formerly 81296b2ac3d7613ca929d1c9a3b82b28fad7ad2a [formerly 054d8d263f]] [formerly 4887191329 [formerly e074710e0a] [formerly e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]]] [formerly 18019c07a4] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]]].
Former-commit-id: 8706337f67 [formerly c51c9ea5df] [formerly 29c5918428] [formerly 8706337f67 [formerly c51c9ea5df] [formerly 29c5918428] [formerly 8400028e11 [formerly 29c5918428 [formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]]]
Former-commit-id: 8400028e11
Former-commit-id: c9dd652973 [formerly 7bd478fc41] [formerly 754565dfe3a290cfa6e7f374444e9a04459503ee [formerly b614bf53f6]]
Former-commit-id: 7785f0f8379983a18ed3a8ce49a49f5cee5bbfcc [formerly 0074c522bb]
Former-commit-id: 938243eb0b
|
2013-03-28 13:08:16 -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 |
|
Greg Armendariz
|
911496b339
|
Replaced with formatted version
Former-commit-id: 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]]
Former-commit-id: 18019c07a4
Former-commit-id: 4887191329 [formerly e074710e0a] [formerly e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]]
Former-commit-id: 81296b2ac3d7613ca929d1c9a3b82b28fad7ad2a [formerly 054d8d263f]
Former-commit-id: 20c9d653c8
|
2013-03-28 12:59:43 -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
|
847503d736
|
Issue #1840 Fix merge error that removed .classpath
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17
Former-commit-id: 6f36d70ead [formerly c2edf1dd89] [formerly ab42673848] [formerly 6f36d70ead [formerly c2edf1dd89] [formerly ab42673848] [formerly a4e4df02b0 [formerly ab42673848 [formerly 59977a0a652352a9128caaaf7d8f041b82941490]]]]
Former-commit-id: a4e4df02b0
Former-commit-id: ce4b93027c [formerly 85d6a19a5e] [formerly 150bcdf38ca3c079cb25192b6b11f9b215ca5226 [formerly 902986256d]]
Former-commit-id: 6d266d55ab153a947bbe33826514f5c88ba00752 [formerly f135c0d948]
Former-commit-id: a5009cb271
|
2013-03-28 12:14:47 -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 |
|
Ben Steffensmeier
|
7446339aff
|
Issue #1821 recalculate 6 hours to be longer.
Former-commit-id: c61b608e1b [formerly 61e0ca3b75] [formerly a9cec71222] [formerly c61b608e1b [formerly 61e0ca3b75] [formerly a9cec71222] [formerly efbdd3aa8c [formerly a9cec71222 [formerly 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed]]]]
Former-commit-id: efbdd3aa8c
Former-commit-id: 7b4a3d369a [formerly e1a619e030] [formerly c4ade474503e6a9399c1f1ee86362c6279fef943 [formerly 403da9bfb9]]
Former-commit-id: 3c7fe12b069b4ef0a323be77b83958d6cde2b41b [formerly 94dcd159d4]
Former-commit-id: 67b3b92712
|
2013-03-28 10:16:11 -05:00 |
|
Greg Armendariz
|
6a115c344f
|
Add source variable
Former-commit-id: 5d9bb2f71e [formerly ae09ebb11f] [formerly 8800080d2a] [formerly 5d9bb2f71e [formerly ae09ebb11f] [formerly 8800080d2a] [formerly d0d889f11d [formerly 8800080d2a [formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]]]
Former-commit-id: d0d889f11d
Former-commit-id: 8d335839e6 [formerly 44fcd1a8db] [formerly da1c2ea08a80b36673131e488158b2c4a2af18db [formerly 24fea6f45d]]
Former-commit-id: e10fee20c3429fa2de5343bfd74d936e7a2fc6d7 [formerly 344c5b41b3]
Former-commit-id: 0ab3b9d7f9
|
2013-03-28 08:56:50 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Steve Harris
|
19fa3b75b1
|
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 6c5444591a [formerly 9ed8f85b79] [formerly 1f28f6b807] [formerly 305994e220 [formerly 1f28f6b807 [formerly b59167da8d42b23fadd19eb8f186d992a5c68bdd]]]]
Former-commit-id: 305994e220
Former-commit-id: 591179c773 [formerly ee009dc2d8] [formerly afda4521815801a415515d376dd78372355aaa84 [formerly b1071636a7]]
Former-commit-id: 3f845904375f701e8e0969b257913e018a1b6345 [formerly 74c886b604]
Former-commit-id: f2c2f57cdd
|
2013-03-26 12:27:54 -05:00 |
|
David Gillingham
|
6217915221
|
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 4a0d548c20 [formerly 6fe3d5dc28] [formerly c5c7e31983] [formerly 54511a95db [formerly c5c7e31983 [formerly 497aa460d6119f13bf6870b78454237252b68752]]]]
Former-commit-id: 54511a95db
Former-commit-id: 5a14c2c503 [formerly 040dc9075c] [formerly b6aa9ae88e412bb4092b5bc723955201a2eb5e12 [formerly 6188c8bd40]]
Former-commit-id: 27ea1ac82b9914961dd76c70ee612b121337a3f6 [formerly 9dd92e0fd2]
Former-commit-id: ebfc7f22b2
|
2013-03-26 12:14:22 -05:00 |
|
Ben Steffensmeier
|
d38d09cdc1
|
Issue #1782 fix merge problems related to graphics API.
Former-commit-id: b8e7e8868f [formerly 0aad550439] [formerly 2b898e58c7] [formerly b8e7e8868f [formerly 0aad550439] [formerly 2b898e58c7] [formerly 6edee13cdd [formerly 2b898e58c7 [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]]]
Former-commit-id: 6edee13cdd
Former-commit-id: 786490e228 [formerly f983e5d705] [formerly 12a49ee4a881d261f0a943322274ece3293cc090 [formerly 76a6213807]]
Former-commit-id: 9c70d98314086fd081f33c5ada1b521712fc8879 [formerly 3dbd9580c5]
Former-commit-id: d523d6371e
|
2013-03-26 12:06:45 -05:00 |
|
Richard Peter
|
5ffcfa9a72
|
Issue #1783: Update DatabaseArchiver to stream deserialization of previous records
Change-Id: Icb1e2721bcddeb93c7c06983bba117c75b0edd44
Former-commit-id: 7a971ee165 [formerly 9773208ff5] [formerly f3844dd2fb] [formerly 7a971ee165 [formerly 9773208ff5] [formerly f3844dd2fb] [formerly 69ffe80046 [formerly f3844dd2fb [formerly f4e67b7b1b41af66436cae5e6f7f61bbf02fb534]]]]
Former-commit-id: 69ffe80046
Former-commit-id: 5ba47f8dbd [formerly b4965ae08d] [formerly d3c52b0df202be6e89bcdc6793f463be02407c61 [formerly 643ac75965]]
Former-commit-id: 1097880c28f90b1be515d43ca65bf09ccba25dbd [formerly 2a10b44398]
Former-commit-id: 99beb92f3e
|
2013-03-26 11:40:24 -05:00 |
|
Ron Anderson
|
10b762ebc8
|
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 48f4d944dd [formerly f272034fde] [formerly 57c919bc7b] [formerly f65989454a [formerly 57c919bc7b [formerly 735c64e77a704ceae7f1a025c9cfc442f48f207e]]]]
Former-commit-id: f65989454a
Former-commit-id: c8a3f9932e [formerly 758b81f9a2] [formerly bd4f4230cd1d4208dd8b92a0f91479ee01037cf6 [formerly 510b090090]]
Former-commit-id: 35ce5b37bc6ebee2994759cd3e072a0604e4dbe6 [formerly 160779e86f]
Former-commit-id: 1c44fa5d4a
|
2013-03-26 11:33:15 -05:00 |
|
Ben Steffensmeier
|
128f8f4a9f
|
Issue #1821 Optimize FFG version query.
Former-commit-id: 3e9651bab3 [formerly 54b9d0d949] [formerly 3049bc94c9] [formerly 3e9651bab3 [formerly 54b9d0d949] [formerly 3049bc94c9] [formerly 7bde9f6d32 [formerly 3049bc94c9 [formerly 6d75a1b79cfd46de69db2d3cb452711f3ea1254d]]]]
Former-commit-id: 7bde9f6d32
Former-commit-id: 13c24c63d0 [formerly ae27d029a1] [formerly 8f9afd15bfe68ce83ae16aab8d6d25efc8daf0f1 [formerly 39259b1b0b]]
Former-commit-id: d34e467af21911568bd726f7169eaf15ec02e710 [formerly 1ef06166db]
Former-commit-id: 5e582f019c
|
2013-03-26 10:37:40 -05:00 |
|