Nate Jensen
18a3239fd5
Merge "Omaha #2670 Fix airep manifest to work with CAVE spring." into omaha_14.4.1
...
Former-commit-id: d9d68507505fa1b45f47a6b92148dca7884ccb1b
2014-05-27 15:49:00 -05:00
Nate Jensen
73cf62dc96
Merge "Omaha #2668 add support for data access framework to bufrua." into omaha_14.4.1
...
Former-commit-id: 5a27ea58134dd64fcf684829b997cbd441f2c22e
2014-05-27 15:48:42 -05:00
Nate Jensen
b33ef5efe6
Merge "Omaha #2669 add support for data access framework to pirep." into omaha_14.4.1
...
Former-commit-id: cb577d0a1eaa604825df83e3b8d2f7476b37d23f
2014-05-27 15:48:12 -05:00
Ben Steffensmeier
dd13f31356
Omaha #2669 add support for data access framework to pirep.
...
Former-commit-id: c37d85ba479b8df38c90df522059b0c58eea6005
2014-05-27 15:20:09 -05:00
Greg Armendariz
73765c31ca
Omaha #3215 - Correct script
...
Former-commit-id: 2565b4c918f9215fd65a5dc44778db3a200da8bf
2014-05-27 15:19:37 -05:00
Ben Steffensmeier
942bf638af
Omaha #2670 Fix airep manifest to work with CAVE spring.
...
Former-commit-id: 7dccca4d1c97ea8d97fb46b8ef1fa139a92b22b5
2014-05-27 15:19:05 -05:00
Ben Steffensmeier
0138296c13
Omaha #2668 add support for data access framework to bufrua.
...
Former-commit-id: 8ef33409df31f8ab9d69828b2d13e1bd8e979685
2014-05-27 15:16:08 -05:00
Greg Armendariz
43f18d2770
Merge "Omaha #3215 - Add option for RPM build," into omaha_14.4.1
...
Former-commit-id: 7b2bd85ea00ab8030f5577b945c6c716e1da6dc4
2014-05-27 15:08:37 -05:00
Fay.Liang
f56d9511b8
ASM #600 - the fixes for DR 17380
...
Change-Id: Iacd1c3dde4f43086dc1ba60ae47e1b0066a0187a
Former-commit-id: 445239c00cbe2147c014e180570085be6224da79
2014-05-27 16:04:22 -04:00
David Friedman
602150ea73
Merge "ASM #512 - Need radar data watchdog functionality" into asm_14.3.1
...
Former-commit-id: 9de711dfd85512d7bbdee2c91132d5250373c676
2014-05-27 15:03:48 -05:00
Daniel.Huffman
8326f42ed8
ASM #512 - Need radar data watchdog functionality
...
Change-Id: I54bb10185d5940d27417d1d40e21310ed5aeb8e3
Former-commit-id: b3f33a3c49607219a234bede34bd983178151f39
2014-05-27 19:59:53 +00:00
Greg Armendariz
a2e157ed35
Omaha #3215 - Add option for RPM build,
...
Change-Id: Ic3a50f9a493c9cd7b92ac99aeb026d3d991f69a5
Former-commit-id: 615c83cb701e3c8ddf7cbcc1c1fb735711771d3b
2014-05-27 14:56:33 -05:00
Nate Jensen
6d717294d8
Merge "Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version." into omaha_14.4.1
...
Former-commit-id: 4f50b471f3f841e0cad14957ef1daec79afbe2b3
2014-05-27 14:18:57 -05:00
Steve Harris
3b16bbafb1
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.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.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
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
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 117fa26f537131552bbe51b2c5fe12405a26db32
2014-05-27 14:48:24 -04:00
Nate Jensen
23e376f738
Merge "Omaha #2670 add support for data access framework to airep plugin." into omaha_14.4.1
...
Former-commit-id: 00dae50c7c609a0ce07a5c155ffb6d6bee3d4c2f
2014-05-27 13:42:20 -05:00
Ben Steffensmeier
46c69e7d74
Omaha #2670 add support for data access framework to airep plugin.
...
Former-commit-id: 56c528cf5727954431298c955a506d54cd5921ad
2014-05-27 13:38:09 -05:00
Bryan Kowal
c711ab9195
Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version.
...
Rebased on re-compiled on the latest version of the nativeLib code.
Former-commit-id: b96b174d5b4b082dc692e3a14ef1cc7b58f06b5a
2014-05-27 13:16:37 -05:00
Slav Korolev
81033087ea
Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager.
...
Former-commit-id: 14ff7a84235ed8cc95aca488910e7f975a5bd41e
2014-05-27 12:24:50 -04:00
Brian Clements
132bd3948d
Omaha #3152 switched radar server to use logback instead of log4j
...
removed unneeded custom rolling file appender
replaced log4j config with logback config
Former-commit-id: ae91e2e2069f73bc661d0009a5d5c083a9d2a229
2014-05-27 11:11:12 -05:00
Brian Clements
2fd2b5aa16
Omaha #3206 added version to servlet api in cave feature
...
without this, the build prefers the javax.servlet in the target platform
Change-Id: Ic98a49f8a0dff09d0af42da1e69dd650f4fd9a80
Former-commit-id: d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2
2014-05-23 17:04:49 -05:00
Brian Clements
09fba26a56
Omaha #3199 new edex.soap plugin
...
new plugin for soap utilities
Former-commit-id: 7c7f7f4f4a821a80d0bf6dcb7e59e3880a7bf4e2
2014-05-23 14:51:20 -05:00
Steve Harris
7da3d7461f
Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml
Former-commit-id: c678b56c81cb5ff798b5fcea75e00473c39fd53e
2014-05-23 08:16:43 -05:00
Steve Harris
b059918699
Merge branch 'master_14.3.1' (14.3.1-6) into omaha_14.3.1
...
Former-commit-id: 36b00a413b977ef5e11a46cf6f3d575e39ee4b57
2014-05-23 08:09:39 -05:00
brian.dyke
1976d2e1fd
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 861a76d237eb18effd3bc52731875b10b84389d4
2014-05-23 08:58:39 -04:00
Nate Jensen
6672ada43c
Merge "Omaha #3093 add usage to hprof tool and standardize outputting size of things." into omaha_14.4.1
...
Former-commit-id: 6d6831bf3f4c3190d933521887c9953202618ace
2014-05-22 18:11:19 -05:00
Nate Jensen
349123ba05
Merge "Omaha #2913 remove some more unused uengine code." into omaha_14.4.1
...
Former-commit-id: 3562300cb46d196f754c37516dd39e9bb81ea254
2014-05-22 18:10:10 -05:00
Ben Steffensmeier
05e8d862c2
Omaha #2913 remove some more unused uengine code.
...
Former-commit-id: 9b72d2a1ddd7db5e06abee5bd172f700ad4c1277
2014-05-22 17:50:16 -05:00
Steve Harris
50009be04a
Merge branch 'omaha_14.3.1' into omaha_14.4.1 - fixing geotools (goes in ufcore-foss)
...
Former-commit-id: dbb188d0563c680f57f1917dbfae2d9515a6c412
2014-05-22 17:27:23 -05:00
Kenneth Sperow
dae982a2be
Merge remote branch 'origin/master_14.3.1' into mdl_14.3.1
...
Former-commit-id: ae21d53409ab3c839774f8621d706f1bea5456de
2014-05-22 14:58:37 -07:00
Nate Jensen
b67bf1e492
Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
...
Former-commit-id: 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d
2014-05-22 16:46:50 -05:00
Kenneth Sperow
9fa9425aea
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to 342398e6a3 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f
Former-commit-id: 41ee30cbe04bb6cba695f7480d6b1492aec4219c
2014-05-22 14:16:49 -07:00
Ben Steffensmeier
edd27c14cd
Omaha #3093 add usage to hprof tool and standardize outputting size of things.
...
Former-commit-id: 7fd433be3f94ac37e644d12623af36bf4092ab3c
2014-05-22 15:56:34 -05:00
Steve Harris
b6af2db9f5
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: f8cb49d46f88b801a682a34a3b7056bde1ab2569
2014-05-22 14:31:06 -05:00
Brian Clements
c875f17719
Omaha #3206 edex changes related to new javax.serlvet FOSS project
...
Former-commit-id: c042671ecf12a6fa46e35d4954d23492f35b7c76
2014-05-22 14:09:07 -05:00
Steve Harris
2059fc9c0e
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
...
Former-commit-id: eae5c3e75061566e40194730c2cfb2003d952e62
2014-05-22 14:05:06 -05:00
Stephen Gilbert
4299e7c72c
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
...
Removed dependency on persistCamelRegistered from ncgrib spring config
Change-Id: I84e7b6fc6e50f9d1795e887a9fb30f9cdda3a7f8
Former-commit-id: a7140f38a54a577dd2d62cc551ab182b561f6fc0
2014-05-22 14:35:49 -04:00
Stephen Gilbert
e73836f3b5
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Former-commit-id: d2d54ee2bfbbe6fef44df58d2edc3b5858ffbe22
2014-05-22 13:31:12 -04:00
Nate Jensen
cc233ddcf7
Merge "Omaha #3179 added modes file deployment, moved modes.xml to new folder" into omaha_14.4.1
...
Former-commit-id: 77b58c5ba59c1a45f8ef3edb9fcc8cc5e1f063f7
2014-05-22 12:25:26 -05:00
Stephen Gilbert
7992a6b15b
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0
Former-commit-id: 42eab5bcfeae6a2e1db32b83a68249bb37c9584e
2014-05-22 12:39:09 -04:00
Roger Ferrel
adf6d95c01
Issue #3181 Add check for valid array index.
...
Change-Id: I8e0a37bdd094b341da2ce42922a16d840d1ab468
Former-commit-id: ca01934f9e9d355dd4159fd472e2aa9bc0918898
2014-05-22 11:20:26 -05:00
Ben Steffensmeier
f4d1e77301
Omaha #2913 Fix grib manifest depenency version.
...
Former-commit-id: 5481dea7c31ee65ea5515be2a9f88c1977a3dc59
2014-05-22 11:12:52 -05:00
Lee Venable
5e81d6dbb3
Merge "Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version." into omaha_14.4.1
...
Former-commit-id: a339ce4bcab3e2edd969e33549599783c3e4416e
2014-05-22 09:57:56 -05:00
Richard Peter
b4e52dfa8b
Merge "Omaha #2733 restored geomag distribution registration" into omaha_14.4.1
...
Former-commit-id: deb953d3bf2907974d1fb499392ece710001288b
2014-05-22 09:54:26 -05:00
Ron Anderson
2a680b73ea
Issue #3194 Fix GeoTIFF import
...
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: 8082b27e6e7e0a0be372abb40b62c0a0224ee49c
2014-05-22 09:53:47 -05:00
Brian Clements
21efc74635
Omaha #2733 restored geomag distribution registration
...
added placeholder pattern so the plugin doesn't generate warnings
Former-commit-id: fa73924a9c98705d00e6b68203e0cbe418e4cf01
2014-05-22 09:13:52 -05:00
Nate Jensen
7350bd5f07
Merge "Omaha #3093 add hprof output for grid cached data." into omaha_14.4.1
...
Former-commit-id: 83e3d888511ec9f99fc534175314ecf5e054f725
2014-05-22 08:53:00 -05:00
Nate Jensen
8a7f83e86e
Merge "Omaha #3093 Add option to hprof tool to zero primitive arrays for compression." into omaha_14.4.1
...
Former-commit-id: e385a0bb73510e3d1d366073976a05a74444e2c5
2014-05-22 08:47:00 -05:00
Nate Jensen
02108895f0
Merge "Omaha #2913 Remove ability to create images from uengine." into omaha_14.4.1
...
Former-commit-id: feb218207bc20ba7cab026379e2ef0d2c0efb58c
2014-05-22 08:45:16 -05:00
Matthew Howard
e17f8a0082
Merge "ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button" into asm_14.3.1
...
Former-commit-id: 5893d06b990cec295338595b006a45bb762b4b73
2014-05-22 07:50:50 -05:00
Brad Gonzales
1dd2a8bf65
Omaha #3156 Removed geronimo servlet 2.5 jar from dependencies.txt and added it to rpms/awips2.qpid/0.18/SOURCES/awips2/.
...
Change-Id: I92c8380cdabcb1d4a8ced7fb5ff7d5add0708d82
Former-commit-id: 71e43fad4acee381d7ffb7ca8ba0438283cd99f6
2014-05-21 15:22:58 -05:00
