Max Schenkelberg
547190329b
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
...
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: 7b37bda291882ff345d466f4338b6707ed84d4d5
2013-04-01 12:41:50 -05:00
Lee Venable
f1e8faf9ff
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
...
Former-commit-id: 9c117d43e77ffa074c8464771918116f8835b382
2013-04-01 12:26:23 -05:00
Steve Harris
437a04011a
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: 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c
2013-04-01 12:19:04 -05:00
Steve Harris
14c9de2259
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: 98ddc22749f0e5cdb0f4f8f0084ee742486461d5
2013-04-01 12:15:04 -05:00
Lee Venable
d3390596f4
Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
...
Former-commit-id: fe244abd3f625d7334284d4657bd8f35737e86a5
2013-04-01 12:06:16 -05:00
Steve Harris
a3fe998f8f
13.3.1-17 baseline
...
Former-commit-id: 0eb0081dbf1af625ca75e98ab775247c924c3527
2013-04-01 12:04:56 -05:00
Steve Harris
3066dd33e5
13.3.1-16 baseline
...
Former-commit-id: 18321f88c2efedf141b84e7de18c200e1037f740
2013-04-01 11:39:08 -05:00
Mike Duff
9c2ac87482
Issue #1830 - Don't allow base level config files for FFMP
...
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: 9ecafb5aacbdb2928902435f342aa4547c2f5903
2013-04-01 11:36:53 -05:00
Richard Peter
255617199c
Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
...
Former-commit-id: 6b3523df82d62d75db483baad329cc6d9a2ade13
2013-04-01 11:33:59 -05:00
Steve Harris
3d8ed484be
13.3.1-15 baseline
...
Former-commit-id: 369cf4feaee63c96725cb6efc5774b8f6b8cbf08
2013-04-01 11:33:20 -05:00
Max Schenkelberg
51d976e5e2
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: 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a
2013-04-01 10:19:36 -05:00
Lee Venable
0bfc05ce61
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
...
Former-commit-id: 4dad96cbc70936f43a65519eff70ac72c904c9e5
2013-04-01 09:40:59 -05:00
Roger Ferrel
d21cb5e2e8
Issue #1790 Changes for non-blocking StationProfileDlg.
...
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: 57eb492610a3cc2974badc6072c2a026f5640b79
2013-03-29 17:11:02 -05:00
Ben Steffensmeier
66af8daa11
Issue #1799 fix modal tools again.
...
Former-commit-id: c1a69f88df85478571394c0e125617c93100168d
2013-03-29 14:30:54 -05:00
Roger Ferrel
6ad80607bc
Issue #1790 Changes for non-blocking StationListDlg.
...
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 5d68d67451c45d38a962f58c246b2effcd0cc253
2013-03-29 13:46:51 -05:00
Roger Ferrel
463407a40e
Issue #1790 Last of the bug fixes. Reviewer changes
...
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 336427570fba81616b8d02f3ed2948042d7dbf41
2013-03-29 11:35:08 -05:00
Ron Anderson
c7cfcf0250
Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
...
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089
Former-commit-id: 3a3f0a47ac33d19259cfc447b0abedd9930e2c64
2013-03-29 10:48:26 -05:00
Ron Anderson
679bb01764
Issue #1774 Fix invalid unit strings in parameterInfo files.
...
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de
Former-commit-id: 961526d5a895922b07b8358d5b284f7fc9b02566
2013-03-29 10:07:37 -05:00
Greg Armendariz
5da06cadd7
Fix merge issue
...
Former-commit-id: c9c8fc9c7ece8ab909b13b63964369b36fb20bc0
2013-03-29 09:52:46 -05:00
Greg Armendariz
27345f6edf
Change package location of import
...
Former-commit-id: c158a7540d23451b864a1464ab64882c3d45386d
2013-03-29 09:09:32 -05:00
David Gillingham
c9ed59b0e0
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: 8b98836e103e082ccf266e1030b5fd3351095618
2013-03-28 17:18:43 -05:00
Nate Jensen
1bf37125c4
Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
...
Former-commit-id: d14cbd8b4a99316bbbf015e1392a34f63a1082d6
2013-03-28 17:02:14 -05:00
Richard Peter
209d53ee67
Merge "Issue #1750 - qpid updates for compatibility with operational servers" into development
...
Former-commit-id: 461708424eea856dacbd2bd2af506f8f905f19c7
2013-03-28 16:59:18 -05:00
Steve Harris
3953f8368b
Issue #1782 - restore FFPMGenerator.java
...
Former-commit-id: 813033f4a2b30a669646b288eb00959922f0e804
2013-03-28 16:06:54 -05:00
Bryan Kowal
e3c39b9be6
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: 4ebdeac7ee92855f9f21ae0eb0478e69e93514e4
2013-03-28 16:00:27 -05:00
Ben Steffensmeier
4efa92ff49
Issue #1799 fix activation of tools for new perspectives.
...
Former-commit-id: a4c1e2f9526efa227b246b8dc4df9cb00566def1
2013-03-28 15:47:36 -05:00
Max Schenkelberg
a308b27c2f
Issue #1638 Added persistIndex route that only persists and indexes
...
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae
Former-commit-id: 3d386df8a1def460f81468154964603e7c1edbe8
2013-03-28 15:45:31 -05:00
Ron Anderson
b65ecfc151
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: aee839a85ec68c7eb80ef1e7236af6cb4666372b
2013-03-28 13:37:29 -05:00
Steve Harris
8400028e11
Revert "Replaced with formatted version"
...
This reverts commit 18019c07a4
2013-03-28 13:08:16 -05:00
Dustin Johnson
3991df64ff
Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
...
Former-commit-id: 88779a4fbd8078d81139b7555525142940999558
2013-03-28 13:07:20 -05:00
Greg Armendariz
18019c07a4
Replaced with formatted version
...
Former-commit-id: d9726bc27ae5387dc5042628b79a9b4239120d08
2013-03-28 12:59:43 -05:00
Dustin Johnson
51bf00bf1c
Merge "Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager" into development
...
Former-commit-id: bf39f3c73e4de589855abda284c6d2d46543d283
2013-03-28 12:25:12 -05:00
Dustin Johnson
a4e4df02b0
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17
Former-commit-id: 59977a0a652352a9128caaaf7d8f041b82941490
2013-03-28 12:14:47 -05:00
Dustin Johnson
695c83669e
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e
Former-commit-id: f6b91884ba72412a8fad2608eca1490757df2c60
2013-03-28 12:13:23 -05:00
Benjamin Phillippe
6640a65a51
Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager
...
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce
Former-commit-id: e9e7f34e87f18120232ed5cc8e00da6cb8bda5d5
2013-03-28 12:08:57 -05:00
Greg Armendariz
943426fd00
Merge "Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep" into omaha_13.3.1
...
Former-commit-id: 6eee456e38bcc5d4a7097868a50e6928cc99bf16
2013-03-28 12:05:07 -05:00
Dustin Johnson
1365d5c9af
Issue #1839 Change build.edex build.xml to support building work assignment features after main build
...
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9
Former-commit-id: 1f4c7ce21abf2853a424cb4a7c478847dcdd8065
2013-03-28 11:43:24 -05:00
Bryan Kowal
955b5c84d3
Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep
...
- add Eclipse CDT configuration for 32-bit and 64-bit Linux compiles
Former-commit-id: 6f51d7079a786534edfa4f60d365284611fb8c3e
2013-03-28 10:42:51 -05:00
Max Schenkelberg
2b58e3ce3f
Issue #1638 Fix merge error
...
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 9c7c89f148adba714839f9ff4fa9bdda10f0edc0
2013-03-28 10:20:54 -05:00
Ben Steffensmeier
efbdd3aa8c
Issue #1821 recalculate 6 hours to be longer.
...
Former-commit-id: 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed
2013-03-28 10:16:11 -05:00
Lee Venable
167fa6eadf
Merge "Issue #1790 Bug fixes for SCAN." into development
...
Former-commit-id: 657dace6ad43e57bfcb99deb14717ce893bd9710
2013-03-28 10:04:34 -05:00
Bryan Kowal
2da2b370db
Issue #1821 - re-compile grib2.so 32-bit and 64-bit
...
Former-commit-id: f7f382d880134acb2f84bef990302aa91784c2d2
2013-03-28 09:48:27 -05:00
Roger Ferrel
e204276c17
Issue #1790 Bug fixes for SCAN.
...
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65
Former-commit-id: 2bb23a6015638266ed17034777489c9ec6dc1307
2013-03-28 09:16:24 -05:00
Roger Ferrel
4db9e20fbf
Issue #1790 bug fix for GFE dialogs in ticket 1353.
...
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612
Former-commit-id: ee4a6d815bc85f861bb7d77719c5787343625741
2013-03-28 09:04:10 -05:00
Greg Armendariz
d0d889f11d
Add source variable
...
Former-commit-id: fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d
2013-03-28 08:56:50 -05:00
Steve Harris
3073951b3d
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: d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e
2013-03-27 22:16:15 -05:00
Steve Harris
6351d8f6d3
Merge branch 'master_13.3.1' (13.3.1-14 cleaned up) into omaha_13.3.1
...
Former-commit-id: 0f0b0a0c0f2f0d334ccd56f8265e2b6fd9a12902
2013-03-27 22:13:11 -05:00
Steve Harris
4d4234d5c9
13.3.1-14 baseline
...
Former-commit-id: e05ab5dbc442d410ae53400f087c02197ba5068b
2013-03-27 22:10:03 -05:00
Roger Ferrel
1129728e03
Issue #1790 Bug fix for dialogs in ticket 1578
...
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90
Former-commit-id: 9bc7fe4c771e534148b446d33de969ef53be3b0d
2013-03-27 21:54:26 -05:00
Richard Peter
2b207fc6ec
Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
...
Former-commit-id: db45bf80d754e49429e4d6a7fd6a28f50d7fb140
2013-03-27 18:32:38 -05:00
