Brian.Dyke
|
27372f098c
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 2ddc920a4a [formerly 325887e605] [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]
Former-commit-id: dd9d7133d9
Former-commit-id: c8e9153884 [formerly 1839b614df]
Former-commit-id: cd1b914f50
|
2014-08-22 14:16:22 -04:00 |
|
Slav Korolev
|
9d0e31155f
|
Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761
This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly 55a1120bdb [formerly dd9d117f90] [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]].
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: 1c896cedab [formerly a9bed4c6fd] [formerly 1c896cedab [formerly a9bed4c6fd] [formerly a779c786f1 [formerly aee044437492438381db98cc6fd3a917f6c05659]]]
Former-commit-id: a779c786f1
Former-commit-id: d080af879e [formerly 407be3d26f]
Former-commit-id: 99a8258e86
|
2014-08-19 10:12:36 -05:00 |
|
Loubna.Bousaidi
|
af004872fd
|
ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: afae4700a6 [formerly 8c15d1f124] [formerly afae4700a6 [formerly 8c15d1f124] [formerly d41e489ced [formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]]]
Former-commit-id: d41e489ced
Former-commit-id: d9be7127bc [formerly 5cc9b08890]
Former-commit-id: 65cfa4e033
|
2014-08-15 10:54:10 -05:00 |
|
Steve Harris
|
106e45a937
|
Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity."
This reverts commit 5a3f760b6f51d0561dd605388e6b025ebe70e330 [formerly 7ae3ca0bfc] [formerly 50e93daab7 [formerly 978349e517] [formerly 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]].
Former-commit-id: 55a1120bdb [formerly dd9d117f90] [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]
Former-commit-id: e5af41fa86
Former-commit-id: 8c5cbf7224 [formerly 0739666ae9]
Former-commit-id: 9ce3fc1803
|
2014-08-12 10:19:12 -05:00 |
|
Slav Korolev
|
3687b20fe7
|
Issue #2875 - Implemented HFR Surface Current Velocity.
Former-commit-id: 50e93daab7 [formerly 978349e517] [formerly 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]
Former-commit-id: 7ae3ca0bfc
Former-commit-id: 4ef0572c2d [formerly 14cf56ec46]
Former-commit-id: a3e480a756
|
2014-08-12 09:19:22 -04:00 |
|
Richard Peter
|
24f06e6666
|
Issue #3458 Increase ldm to edexBridge shared memory queue.
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468
Former-commit-id: 01692edc6b [formerly bd2d97dc46] [formerly 01692edc6b [formerly bd2d97dc46] [formerly 8374869379 [formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]]]
Former-commit-id: 8374869379
Former-commit-id: fbb7094b60 [formerly e155de7bbc]
Former-commit-id: 4e7687d442
|
2014-08-06 10:57:31 -05:00 |
|
Ying-Lian.Shi
|
a1c024e575
|
ASM #15649 - these 5 files are rolled back to 14.1.3
Change-Id: Ifc52168f1faf3984f2a2d72947273686c5a00fd9
Former-commit-id: 9dbfbbe0c3 [formerly 22d46f2658] [formerly 9dbfbbe0c3 [formerly 22d46f2658] [formerly 1f6d24a076 [formerly ab5a6807a591605e230d4180f1dcf3c2eaa8657f]]]
Former-commit-id: 1f6d24a076
Former-commit-id: ef8ec0cff0 [formerly c571da3e89]
Former-commit-id: a0b7830856
|
2014-07-23 12:24:22 +00:00 |
|
Richard Peter
|
e555144511
|
Issue #3102: Fix edexBridge connection leak
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: 2668f09447 [formerly 501980904d] [formerly 2668f09447 [formerly 501980904d] [formerly b091a8827a [formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]]]
Former-commit-id: b091a8827a
Former-commit-id: 8f1b5b647d [formerly d03c47719f]
Former-commit-id: 87c6348e61
|
2014-05-06 10:32:31 -05:00 |
|
Brian.Dyke
|
e7aea77979
|
Fixed comment merge conflicts added .gitignore
Former-commit-id: 027cca8673 [formerly 7cc471a9c9] [formerly 027cca8673 [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 412a7eb2c2 [formerly d8256c4226]
Former-commit-id: c19fc33493
|
2014-03-25 15:41:58 -04:00 |
|
Shawn.Hooper
|
94a008ff56
|
ASM #377 - Baseline National River Location Database fails
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 6a8a1c397b [formerly 670da1895b] [formerly 6a8a1c397b [formerly 670da1895b] [formerly 85db05e819 [formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]]]
Former-commit-id: 85db05e819
Former-commit-id: b7cf50dd31 [formerly 62a0c1dadf]
Former-commit-id: 6401571e92
|
2014-03-07 13:12:11 -05:00 |
|
David Gillingham
|
5911f4b2d4
|
Issue #2783: Rewrite run_report_alarm script into EDEX service.
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: 607ce13c19 [formerly 32719432ff] [formerly 607ce13c19 [formerly 32719432ff] [formerly de12904c7a [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]
Former-commit-id: de12904c7a
Former-commit-id: a83191356d [formerly 1520317c24]
Former-commit-id: 474dda75de
|
2014-02-18 13:24:37 -06:00 |
|
Brian.Dyke
|
cc4a735533
|
Issue #179
Former-commit-id: 6b3ebc4fef [formerly a0626cdc00] [formerly 6b3ebc4fef [formerly a0626cdc00] [formerly b23c6f59f7 [formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]]]
Former-commit-id: b23c6f59f7
Former-commit-id: 2955d5c9f0 [formerly 6d58d8c016]
Former-commit-id: 5ac5774552
|
2014-02-04 16:53:34 -05:00 |
|
Ron Anderson
|
77c132f706
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: 0bde38cef3 [formerly ba7a25a88f] [formerly 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]
Former-commit-id: 62c445d872
Former-commit-id: dca7f21f7b [formerly 624375267e]
Former-commit-id: 5076217d8f
|
2014-01-13 17:45:20 -06:00 |
|
Steve Harris
|
1ca553385c
|
14.1.1-15 baseline
Former-commit-id: f88ff2bde9 [formerly 8bbd803ace] [formerly f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 282d10fe6d [formerly 35d8f5a281]
Former-commit-id: cd4a09623c
|
2014-01-06 14:08:08 -05:00 |
|
Richard Peter
|
ae6e34be4b
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
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/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: b3b23647b4 [formerly 0c4ae068ad] [formerly b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 60679a818a [formerly da027298d4]
Former-commit-id: fd93b7d85e
|
2013-12-05 12:12:27 -06:00 |
|
Steve Harris
|
60f062ea59
|
14.1.1-12 baseline
Former-commit-id: 371d1ca63c [formerly b24d9c80b0] [formerly 371d1ca63c [formerly b24d9c80b0] [formerly a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 4e6f319422 [formerly 14421048af]
Former-commit-id: 234ca267ed
|
2013-12-04 16:47:59 -05:00 |
|
Steve Harris
|
6f4e8734c8
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: b0a61f5695 [formerly 65d5f13864] [formerly b0a61f5695 [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: 1195e95c8b [formerly 6539b80ded]
Former-commit-id: 2e47683d4a
|
2013-12-02 16:17:38 -06:00 |
|
Steve Harris
|
bfa9d638cc
|
14.1.1-11 baseline
Former-commit-id: 337b138200 [formerly 70a6f1936e] [formerly 337b138200 [formerly 70a6f1936e] [formerly 71ae71c850 [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 8bd818de09 [formerly 5526a8999d]
Former-commit-id: f88a635a58
|
2013-12-02 17:10:10 -05:00 |
|
Brian Clements
|
9d3df8f842
|
Issue #2495 changed gridslice to use correct dimension datatype
Former-commit-id: 4c3453a657 [formerly aa24bc6fce] [formerly 4c3453a657 [formerly aa24bc6fce] [formerly 5e7f2f0bdf [formerly ad33e0ef6530c5528cfa5a349c34a1d11c8c453b]]]
Former-commit-id: 5e7f2f0bdf
Former-commit-id: 90601f6ff8 [formerly 05b2a015cb]
Former-commit-id: a8c2c5870c
|
2013-11-19 17:53:39 -06:00 |
|
Steve Harris
|
87ce579deb
|
Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
cots/org.jep.linux32/libjep.so
cots/org.jep.linux64/libjep.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
(took all the omaha_14.1.1 versions)
Former-commit-id: 542a0946f2 [formerly 0a36987a01] [formerly 542a0946f2 [formerly 0a36987a01] [formerly 6d9efac6ef [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 3f9df61017 [formerly 869b505f80]
Former-commit-id: c26818afe6
|
2013-11-15 13:15:25 -06:00 |
|
Steve Harris
|
c4e9fe1c94
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)
Former-commit-id: dc4f3b7594 [formerly 1015e180f1] [formerly dc4f3b7594 [formerly 1015e180f1] [formerly 2f0d53c9b2 [formerly 5388a8206a9f447f2ff9030a9e6cfad76efc4cee]]]
Former-commit-id: 2f0d53c9b2
Former-commit-id: 156395b85b [formerly d97edb20d1]
Former-commit-id: 7127a1e665
|
2013-11-15 13:05:40 -06:00 |
|
Steve Harris
|
ed58bc7f71
|
14.1.1-9 baseline
Former-commit-id: a32eadf384 [formerly f8f995b697] [formerly a32eadf384 [formerly f8f995b697] [formerly 5a0a40e67c [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: eab5bb1147 [formerly 8c136f202d]
Former-commit-id: ea382798b5
|
2013-11-15 12:47:49 -05:00 |
|
Richard Peter
|
705339a320
|
Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
nativeLib/rary.meteorological/src/solax.f
Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822
Former-commit-id: 2c753c427c [formerly 79bdd34f4f] [formerly 2c753c427c [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]
Former-commit-id: 0074b774f0
Former-commit-id: b4aac09ff4 [formerly 96b4944b41]
Former-commit-id: e2a16fd876
|
2013-11-14 14:40:23 -06:00 |
|
Bryan Kowal
|
cfb3717a61
|
Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: b2272ad695 [formerly a51231058a] [formerly b2272ad695 [formerly a51231058a] [formerly e3639da703 [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]
Former-commit-id: e3639da703
Former-commit-id: b2c63727ba [formerly 48d5d8c3a1]
Former-commit-id: a575f41589
|
2013-11-12 19:57:25 -06:00 |
|
Greg Armendariz
|
bbd6cd614b
|
Issue #2512 - Remove dead code
Former-commit-id: 59f8eb9341 [formerly 4f4d59aa52] [formerly 59f8eb9341 [formerly 4f4d59aa52] [formerly 70c9a36826 [formerly c07118fed79b6e50694281e40b3fb3755484d911]]]
Former-commit-id: 70c9a36826
Former-commit-id: f878a8e302 [formerly fbcb810ab3]
Former-commit-id: 3852935abf
|
2013-11-12 14:20:21 -06:00 |
|
Bryan Kowal
|
9f749f3079
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.uf.viz.archive.feature/feature.xml
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cots/edu.uci.ics.crawler4j/.classpath
cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
cots/edu.uci.ics.crawler4j/build.properties
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/build.edex/esb/conf/spring/cron.properties
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
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/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GridToGribConverter.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1
Former-commit-id: 3b8ce3fd34 [formerly c3eb4e9af9] [formerly 3b8ce3fd34 [formerly c3eb4e9af9] [formerly f1cd2f2e5a [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: 464a8d1001 [formerly 1909193f0c]
Former-commit-id: dfba50bf2e
|
2013-11-08 14:51:47 -06:00 |
|
Steve Harris
|
878d57675c
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: cdb514cb5c [formerly c218866826] [formerly cdb514cb5c [formerly c218866826] [formerly d8afc4c58c [formerly 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b]]]
Former-commit-id: d8afc4c58c
Former-commit-id: a48b85a0b2 [formerly 7c71117a50]
Former-commit-id: ff548f8557
|
2013-11-06 13:22:12 -06:00 |
|
Steve Harris
|
cfb3194426
|
14.1.1-7 baseline
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653]
Former-commit-id: 647b908fed
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
0aa90a7855
|
14.1.1-6 baseline
Former-commit-id: 946a9be17e [formerly 0cb2978c13] [formerly 946a9be17e [formerly 0cb2978c13] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: e86a0aa489 [formerly 26da1ce793]
Former-commit-id: 270c5f1a2d
|
2013-11-06 14:08:33 -05:00 |
|
Bryan Kowal
|
f5bb76a01e
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 38464427d3 [formerly feaacd9356] [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: f02d4b7a0b [formerly d366e70934]
Former-commit-id: eaaa3d022c
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
731efe0fb6
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
nativeLib/files.native/files.native.ecl
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.cots.g2clib/.project
nativeLib/rary.cots.g2clib/g2_unpack3.c
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
Former-commit-id: 4d7a4aefec [formerly 665911b033] [formerly 4d7a4aefec [formerly 665911b033] [formerly c76c856340 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]
Former-commit-id: c76c856340
Former-commit-id: 7a83214b1c [formerly 0954490a5a]
Former-commit-id: 6e08dc72c0
|
2013-10-31 15:23:08 -05:00 |
|
Greg Armendariz
|
c846280439
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 0daf07742e [formerly f6d98d6317] [formerly 0daf07742e [formerly f6d98d6317] [formerly 64dd62005b [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]
Former-commit-id: 64dd62005b
Former-commit-id: 5cf091c499 [formerly 4fb0e0bd2f]
Former-commit-id: eefcbf7dcb
|
2013-10-30 14:52:16 -05:00 |
|
Nate Jensen
|
f2184b9379
|
Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: 554a9cddf3 [formerly f3143ba7b4] [formerly 554a9cddf3 [formerly f3143ba7b4] [formerly 6880a18f1a [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]
Former-commit-id: 6880a18f1a
Former-commit-id: 19043faeaa [formerly f2751f017e]
Former-commit-id: e8c199f108
|
2013-10-29 14:33:53 -05:00 |
|
Steve Harris
|
da4589ec2b
|
14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
472c0a1a5e
|
14.1.1-3 baseline
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]
Former-commit-id: 5739b4f832
Former-commit-id: aa59400b67 [formerly 4a6a209aea]
Former-commit-id: 8d67ffede4
|
2013-10-28 10:46:02 -04:00 |
|
Richard Peter
|
9b381e593d
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d
Former-commit-id: f69bbf7952 [formerly cb33f5ada7] [formerly f69bbf7952 [formerly cb33f5ada7] [formerly 14d5b8656e [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]
Former-commit-id: 14d5b8656e
Former-commit-id: a49c67203e [formerly 6ecb80e892]
Former-commit-id: e27a298e62
|
2013-10-23 15:50:25 -05:00 |
|
Nate Jensen
|
d5f2cc0bef
|
Issue #2476 fix in a better way the rare leak of local references of java args being passed to java methods
Change-Id: I1424ce53cb3dea01d932af8b87ee93aa33c6241a
Former-commit-id: a758761637 [formerly d27635ce4b] [formerly a758761637 [formerly d27635ce4b] [formerly 98660b5ae9 [formerly e28dd5738aaebe4fe36779de09cb53f0f90a7744]]]
Former-commit-id: 98660b5ae9
Former-commit-id: e602327f28 [formerly 67e02cad76]
Former-commit-id: d60cae44fe
|
2013-10-21 15:13:54 -05:00 |
|
Steve Harris
|
930e62fc8c
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 9a282049b0 [formerly f927209446] [formerly 9a282049b0 [formerly f927209446] [formerly 67136a50f2 [formerly 608378b8e086a845f38e238eda127c7792f09b53]]]
Former-commit-id: 67136a50f2
Former-commit-id: ef45113f4a [formerly a1544c7c74]
Former-commit-id: 6c1d53b1f6
|
2013-10-17 18:20:56 -05:00 |
|
Nate Jensen
|
07e7928cd9
|
Issue #2476 delete local references of arguments to free up memory fast and free memory if someone decides to infinite loop in python
Change-Id: I944d16f506647b138d08c0a93c9b6164a9d55d6e
Former-commit-id: 9bd504cc75 [formerly 1e620fde68] [formerly 9bd504cc75 [formerly 1e620fde68] [formerly f08ee91f20 [formerly 016bcf45a28c1f99bee930a12d30a72beb9e4dd3]]]
Former-commit-id: f08ee91f20
Former-commit-id: 129ac026e8 [formerly f88dd78056]
Former-commit-id: da4bd4680c
|
2013-10-17 14:50:05 -05:00 |
|
Bryan Kowal
|
15cb18c19f
|
Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: 2ad7db4f5d [formerly b7b11dc747] [formerly 2ad7db4f5d [formerly b7b11dc747] [formerly 9a472e1bbe [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]]
Former-commit-id: 9a472e1bbe
Former-commit-id: b1bdf0dbc5 [formerly f892849313]
Former-commit-id: 83c0c7e365
|
2013-10-16 12:54:58 -05:00 |
|
Bryan Kowal
|
53a110866d
|
Issue #2422 - recompile updated grib2.so for RHEL6
Former-commit-id: 585f63e88c [formerly 9c3c123631] [formerly 585f63e88c [formerly 9c3c123631] [formerly bb9b1e4279 [formerly ae2923791512c7488805c19a773390ef1de5150b]]]
Former-commit-id: bb9b1e4279
Former-commit-id: 80127ae62d [formerly 9d57206173]
Former-commit-id: 49c19e4bb6
|
2013-10-09 18:38:58 -05:00 |
|
Bryan Kowal
|
d65db49046
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: 82559064ef [formerly 37d1dd492b] [formerly 82559064ef [formerly 37d1dd492b] [formerly 2b26c4c242 [formerly 2e6b76af19b308392e90dfee4c950200ec5c2560]]]
Former-commit-id: 2b26c4c242
Former-commit-id: 68434c23ef [formerly daeb4b7ecb]
Former-commit-id: f31f6ea11d
|
2013-10-09 17:07:10 -05:00 |
|
Ben Steffensmeier
|
870631902b
|
Issue #2402 Modify grib decoder to work on file extents.
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9
Former-commit-id: c896c9bf30 [formerly 7d2b48de48] [formerly c896c9bf30 [formerly 7d2b48de48] [formerly 2b089b0848 [formerly 1525772d1b42348f0eca78fc966d2c7878496ea7]]]
Former-commit-id: 2b089b0848
Former-commit-id: 7c6a89b623 [formerly 633a075052]
Former-commit-id: 839c602669
|
2013-10-09 12:50:02 -05:00 |
|
Bryan Kowal
|
93dbbc2321
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: bb5ef114d1 [formerly aa4ea792c1] [formerly bb5ef114d1 [formerly aa4ea792c1] [formerly 542f5f2349 [formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]]
Former-commit-id: 542f5f2349
Former-commit-id: de61382dc7 [formerly 5d5ccb7599]
Former-commit-id: 86f7af5968
|
2013-10-08 14:44:38 -05:00 |
|
Richard Peter
|
bc32641181
|
Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371
Former-commit-id: f141fdd5ab [formerly 9adbe25ceb] [formerly f141fdd5ab [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]
Former-commit-id: b6395cc834
Former-commit-id: 0e7dccd18f [formerly 3abe952ca0]
Former-commit-id: 1895c9f914
|
2013-10-08 10:59:50 -05:00 |
|
Bryan Kowal
|
b8c2ece19c
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
rpms/awips2.qpid/0.18/deploy.builder/build.sh
Former-commit-id: 96c800f3f4 [formerly 5eba3290c8] [formerly 96c800f3f4 [formerly 5eba3290c8] [formerly 8f14318bc7 [formerly d6b9ed6ec29c5285ec454fb1c1e65e64a096edb9]]]
Former-commit-id: 8f14318bc7
Former-commit-id: 72ed6c5f7a [formerly 53af4c7284]
Former-commit-id: 5477a06781
|
2013-10-08 10:35:03 -05:00 |
|
Bryan Kowal
|
dde85b814b
|
Issue #2422 - fix edexBridge merge into RHEL6 14.2.1
Former-commit-id: 7f32bcbab3 [formerly 394141bdff] [formerly 7f32bcbab3 [formerly 394141bdff] [formerly cd586bb8cb [formerly d8116ef62c738e3a46fe6fd08b89a90c3896507a]]]
Former-commit-id: cd586bb8cb
Former-commit-id: 9cabdde9eb [formerly fa01165c59]
Former-commit-id: 3229dd4542
|
2013-10-08 10:24:32 -05:00 |
|
Richard Peter
|
d321c61259
|
Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
Former-commit-id: f0c05dc6d8 [formerly 31c87ab01e] [formerly f0c05dc6d8 [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]
Former-commit-id: d9eae3ea28
Former-commit-id: 94d0913bd9 [formerly f4b47dda50]
Former-commit-id: 33b4f0c247
|
2013-10-08 09:45:27 -05:00 |
|
Steve Harris
|
e1f7463a41
|
13.5.2-8 baseline
Former-commit-id: 8ba7d392d6 [formerly 94aa71fcd1] [formerly 8ba7d392d6 [formerly 94aa71fcd1] [formerly 18325949fb [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 21b84f0290 [formerly d89fbf73d9]
Former-commit-id: 088eb89ca7
|
2013-10-04 11:30:03 -04:00 |
|
Bryan Kowal
|
a249b45111
|
Issue #2422 - fix 14.2.1 RHEL6 build
Former-commit-id: efd377f12f [formerly 61527c0b80] [formerly efd377f12f [formerly 61527c0b80] [formerly 87087a5ea4 [formerly 19b9b3e4f5e3bc3d78c25afe4507c3e9c11eacb6]]]
Former-commit-id: 87087a5ea4
Former-commit-id: af4b729522 [formerly fe4e9ca3f8]
Former-commit-id: 297ee050ca
|
2013-10-02 18:41:11 -05:00 |
|