Steve Harris
1a06d18686
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Former-commit-id: 5c1f5dbf543c9cd27cf83158308a9ce34d057201
2014-05-15 08:31:27 -05:00
Brian Clements
a698d81571
Omaha #3061 added better checks for when to send invite/session payloads
...
Former-commit-id: 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5
2014-05-14 17:00:09 -05:00
Roger Ferrel
e6b3733fc5
Issue #2881 configuration changes.
...
Former-commit-id: a36e9351bec9150ba4ade456de76af8701048bcb
2014-05-14 16:35:33 -05:00
Richard Peter
7ae2b1299f
Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1
...
Former-commit-id: 1844df3fb769bccb3e5b19722e2fdeaec9c6bbe0
2014-05-14 16:25:16 -05:00
Dave Hladky
c72be97b9b
Issue #3168 Move DD retrieval distibution to correct feature/RPM
...
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1
Former-commit-id: d94e7f139573caa508b260902870c9f745080bb8
2014-05-14 16:13:57 -05:00
Brian.Dyke
627541512d
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: f7d6bee49c5777e5d63c724eba1242a1baf153ac
2014-05-14 16:08:16 -04:00
Shawn Hooper
2fe0c47c6d
Merge "ASM #560 - LDM 6.11.5 GRIB library causing crash Modified Release number in component.spce from 10 to 11" into asm_14.2.2
...
Former-commit-id: b774242fcff4bf603b82c8a6657e372d8bdc3c19
2014-05-14 14:39:57 -05:00
Qinglu.Lin
75c4b15e8e
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
...
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: 763641d787f7f8c79bf28456314dcc16786702ed
2014-05-14 15:30:16 -04:00
Ben Steffensmeier
3e23857dcc
Omaha #2697 Collaboration will no longer use local maps.
...
Former-commit-id: 7e10b6d308a3bb17692abaefd9a8e84cc5016621
2014-05-14 13:53:29 -05:00
Brian Clements
2b1c7eaa37
Omaha #2536 moved WMO Header into new common plugin
...
moved WMO time parsing code from TimeTools to WMOTimeParser
Former-commit-id: c2e57be98850284cb01ba921b9dddcadbe66b311
2014-05-14 13:45:09 -05:00
Richard Peter
6b91c26c75
Merge "Omaha #3133 remove unused uf.common.cache from alertviz feature" into omaha_14.4.1
...
Former-commit-id: b084e29ac7f3d881e1dc2444a1dc5d02a0bf5553
2014-05-14 11:16:19 -05:00
Richard Peter
216a11d390
Merge "Omaha #2536 moved com.raytheon.edex.plugin.text to com.raytheon.uf.edex.plugin.text" into omaha_14.4.1
...
Former-commit-id: a175a009ed170228187a0fdaa9e2c67a8154fdd5
2014-05-14 11:15:59 -05:00
Dave Hladky
ca644b93ee
Issue #3168 Move retrieval distribution to correct DD RPM
...
Former-commit-id: 228ef1ceb7337fa38c370c3218d1c32b4f1302fb
2014-05-14 11:12:55 -05:00
Nate Jensen
68c8238275
Omaha #3133 remove unused uf.common.cache from alertviz feature
...
Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832
Former-commit-id: e659b393f23e5e999c2b03ddad648f2748ee97e9
2014-05-13 17:52:12 -05:00
Nate Jensen
5f9c015084
Omaha #3152 remove NCEP logging code that doesn't work
...
Change-Id: Ia08e1b70c44e00254118b2aac714105c0d4ad517
Former-commit-id: 479409049a379d033c58721f649e474cda42a7d0
2014-05-13 16:16:12 -05:00
Steve Harris
c2efe26c11
Merge branch 'master_14.2.1' (14.2.1-24) into omaha_14.2.1
...
Former-commit-id: 2627e4d38b3dcee82dcf7a6032d692170d50d9ad
2014-05-13 15:23:57 -05:00
Bryan Kowal
3535340136
Issue #3159 - rebuild with newer gridslice source
...
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: 2b13221d7c644147f6eda1acb8b126667be00926
2014-05-13 14:43:04 -05:00
Nate Jensen
2480b11576
Merge "Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt" into omaha_14.4.1
...
Former-commit-id: 477987b9398b980d15c221b9d27780dc25319704
2014-05-13 14:28:14 -05:00
Nate Jensen
d1ec53984c
Merge "Omaha #3133 remove dead activemq code" into omaha_14.4.1
...
Former-commit-id: aa2660c615b4d3f605fc6c2c2cdde6667e60e55e
2014-05-13 14:16:25 -05:00
Nate Jensen
e62c36aeb8
Omaha #3133 remove dead activemq code
...
Change-Id: I1a28b58241bd219f59749328cd23b5abd26bf903
Former-commit-id: eaf4ec9916a706d1ea3c5e5968557b777c2bc936
2014-05-13 14:02:21 -05:00
Nate Jensen
bb1414677e
Omaha #3160 remove OBE ncep util plugins
...
Change-Id: I0af881ba6afb8b2911b6933940dbe5b50b7a2808
Former-commit-id: d7a64ad2ae20b22bbf346bd59f38526b95c4bfb0
2014-05-13 13:28:20 -05:00
Nate Jensen
07426ce408
Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt
...
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851
Former-commit-id: b842a78cdfb945767aecf7da3ad55b71c9d09bfb
2014-05-13 13:12:54 -05:00
Brian.Dyke
e95bc87a19
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
...
Former-commit-id: 019c1405290753ed47cecd9a0bb26c220d78d010
2014-05-13 11:23:55 -04:00
Brian Clements
b9d9beeb46
Omaha #2536 moved com.raytheon.edex.plugin.text to com.raytheon.uf.edex.plugin.text
...
minor clode cleanup
Former-commit-id: f68b6921c08b8bccf355fa9c991c232f2ffa2076
2014-05-13 09:18:47 -05:00
Nate Jensen
01a09b72b8
Merge "Omaha #3133 remove edex dependencies from common.monitor plugin" into omaha_14.4.1
...
Former-commit-id: 6eba192ac26a80f8ba1402f675a7ab9e9f4dd6a5
2014-05-13 09:17:37 -05:00
Nate Jensen
0f012ef8c9
Merge "Omaha #3013 added libgfortran and libf2c requires to the awips2-python-numpy rpm." into omaha_14.4.1
...
Former-commit-id: 7f2de8795a6648853e66cdac4676351d40fef3e0
2014-05-13 09:00:06 -05:00
Matthew Howard
5a20085f32
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
...
Former-commit-id: 2052df4ca5f68165b477994b21357c245ff73546
2014-05-13 07:49:18 -05:00
Paul.Grell
9988804887
ASM #512 - Need radar data watchdog functionality
...
Change-Id: I3bcdbe8f267f78be1d0bc64e466ffed70be011a3
Former-commit-id: ad727f0b3d820cf2310b4b8cc67639b6d141af6b
2014-05-12 20:00:18 -04:00
Richard Peter
1dc654c20e
Issue #2854 : Fix merge of textdb
...
Change-Id: I626eabc72fbedde983e592ec0c8fb50ed1f52ae3
Former-commit-id: 2335691bb79c14d96e286f9b0be0f5085711c7bc
2014-05-12 17:31:06 -05:00
Richard Peter
5233493186
Merge "Issue #2060 : Consolidate grid indexes." into omaha_14.3.1
...
Former-commit-id: 462ca3c56b516217043d09f9bf0c6c6b7a151044
2014-05-12 17:09:56 -05:00
Richard Peter
62e215eb89
Issue #2060 : Consolidate grid indexes.
...
Change-Id: Ibc77133cd1b016ef85bae61e47e373a30e6e4d23
Former-commit-id: 892c0f28a13d53118141efe14762deebe169d7ba
2014-05-12 16:59:34 -05:00
Brad Gonzales
b341c10bb4
Issue #2873 Revert the deletion of the ncep nsharp win32 project.
...
Amend: added the gov.noaa.nws.ncep.ui.nsharp.win32 plugin dependency back to the com.raytheon.uf.viz.ncep.nsharp.feature/feature.xml.
Change-Id: Ic801fbfd81c691298751d0bafbc4d96ba1457776
Former-commit-id: 8209ff5c53bb117b8a18b2923952b289e3021762
2014-05-12 16:59:16 -05:00
Nate Jensen
cc86f19bad
Omaha #3133 remove edex dependencies from common.monitor plugin
...
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3
Former-commit-id: d25e1bee210a084e17d4ee781eddb42c14735140
2014-05-12 16:46:06 -05:00
Steve Harris
cf62cf4a6e
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
...
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: a830db2a282e6a29d119fc0d3357c2223c48d175
2014-05-12 16:13:19 -05:00
Steve Harris
e955496335
Omaha #3132 - merge omaha_14.3.1 into omaha_14.4.1
...
Former-commit-id: de217b0bd6bbf72ea138f9bc1286992d43d72ef1
2014-05-12 15:37:43 -05:00
Richard Peter
c3ed3b97b8
Merge "Omaha #3133 remove incorrect dependencies" into omaha_14.4.1
...
Former-commit-id: a79d57e86958129b210d13d301b2dc9c1c80f53e
2014-05-12 15:28:46 -05:00
Richard Peter
b2ce12a907
Merge "Omaha #3133 remove some unnecessary edex dependencies" into omaha_14.4.1
...
Former-commit-id: 37f5013d6e64616a2959d95de9d2b1569e3f4286
2014-05-12 15:21:38 -05:00
Nate Jensen
2d32999655
Omaha #3133 remove incorrect dependencies
...
Change-Id: Iadccd506bb3fd1f009efeda82193138088a2895f
Former-commit-id: 6db290e14df962d91174727b027b0c5afc1ed0ce
2014-05-12 15:21:08 -05:00
Nate Jensen
15329c6b03
Omaha #3133 remove some unnecessary edex dependencies
...
Change-Id: I91f10fb36ecadf8e2fc830b135b5d245830417a2
Former-commit-id: 846003056f07ef205f59c7b043a31a4fa66e5977
2014-05-12 15:07:46 -05:00
Steve Harris
652fb19bc4
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
Former-commit-id: a20833879f1a0434c562a22a874b1e1722278954
2014-05-12 15:05:43 -05:00
Juliya Dynina
a203a14e52
Merge "ASM #539 - Multiple flag functionality for textdb is not working properly" into asm_14.3.1
...
Former-commit-id: 3fcd47133ac461046524837f085359b5eb1c7ba7
2014-05-12 14:52:50 -05:00
Zhidong.Hao
d6cae51207
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
...
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: a48b81894fed165aba58a0097359bbd0f1931be5
2014-05-12 15:16:38 -04:00
Kiran.Shrestha
e615e1efc5
ASM #539 - Multiple flag functionality for textdb is not working properly
...
Change-Id: I6f48e877a356fa576e1311da769c90735e61877f
Former-commit-id: 2e2de40d75c0ebc0af1b2d70806e834c7d5089f8
2014-05-12 15:16:14 -04:00
Juliya Dynina
107b64a544
Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
...
Former-commit-id: 0c54c56efa1306d781d64621ccf7f62b3bf70997
2014-05-12 14:01:40 -05:00
Juliya Dynina
d7bea845fe
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
...
Former-commit-id: 350448988d24fd2eb58812128b062e3a0f44b956
2014-05-12 14:01:07 -05:00
Matthew Howard
b807c877f4
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
...
Former-commit-id: 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f
2014-05-12 13:52:12 -05:00
Loubna.Bousaidi
ec5bd7a2bb
ASM #527 update revision and shef_qual_code
...
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: 860ea4b3644a526ac10b4366f158824fe6cbdcb0
2014-05-12 18:42:12 +00:00
Zhidong.Hao
8d560036b1
ASM #537 AvnFPS: Syntax failed to flag format error
...
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 62f8c0ab0e046fd4365bd37394f93e8bca4e642d
2014-05-12 14:33:25 -04:00
Brian.Dyke
386ec058e1
CM-MERGE:OB13.5.5-5 into 14.1.2
...
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
2014-05-12 14:07:11 -04:00
Matthew Howard
d40d9931db
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
...
Former-commit-id: 59fb75bdc025a3b2feb95d20d263060b55e87b28
2014-05-12 13:00:55 -05:00
