Nate Jensen
|
be6b7b034f
|
Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
Former-commit-id: ff9e3c0f3d [formerly 9fa1b78e76] [formerly a709601e2f] [formerly a709601e2f [formerly 5cfbcb7e98]] [formerly ff9e3c0f3d [formerly 9fa1b78e76] [formerly a709601e2f] [formerly a709601e2f [formerly 5cfbcb7e98]] [formerly c43a2bf217 [formerly a709601e2f [formerly 5cfbcb7e98] [formerly c43a2bf217 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]]]]
Former-commit-id: c43a2bf217
Former-commit-id: 6fe7ce9934 [formerly b6ca990c01] [formerly 9804b35063] [formerly 6816e1031bbbcbb1b4b8bf5aef3d6ad70e026de8 [formerly 20a4aa18d611a016b3c901eec7c91704211023af] [formerly 9804b35063 [formerly c1d092a55d]]]
Former-commit-id: f957387c2d16ce6d74d304f780422823a6f9a43a [formerly 694a56355e00a39a28d8d855cc619da8cff90f1e] [formerly a49343ddbf [formerly b4b684876a]]
Former-commit-id: a49343ddbf
Former-commit-id: 4898a1f6e4
|
2014-05-29 13:51:09 -05:00 |
|
Brian Clements
|
3a76c96b08
|
Omaha #2536 merge autobldsrv into text plugins
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52
Former-commit-id: 10ae5f8f42 [formerly de85e00fde] [formerly 4aade4bf2e] [formerly 4aade4bf2e [formerly 5d0eaf02ab]] [formerly 10ae5f8f42 [formerly de85e00fde] [formerly 4aade4bf2e] [formerly 4aade4bf2e [formerly 5d0eaf02ab]] [formerly 542d36f107 [formerly 4aade4bf2e [formerly 5d0eaf02ab] [formerly 542d36f107 [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]]]]
Former-commit-id: 542d36f107
Former-commit-id: bbf76939fe [formerly 9afd194e29] [formerly 5a52531828] [formerly e6051e0979386ed5fdfd39b4f7456c52e44a8ded [formerly e0f60e70ed8514edd19df07556eaaed606a69df4] [formerly 5a52531828 [formerly fcadd3dae9]]]
Former-commit-id: 500dd13a28e583e25ffa924930539434891bfb4f [formerly c65d61ba49fd3a54dac5fc9473888a9c3fe5cadc] [formerly fe7c15daa4 [formerly 7d841b655c]]
Former-commit-id: fe7c15daa4
Former-commit-id: 92fabd54e5
|
2014-05-29 08:19:47 -05:00 |
|
Steve Harris
|
384d2fa312
|
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: 65846eafbf [formerly 4469d87a8f] [formerly 718c78d984] [formerly 718c78d984 [formerly be80bd01f3]] [formerly 65846eafbf [formerly 4469d87a8f] [formerly 718c78d984] [formerly 718c78d984 [formerly be80bd01f3]] [formerly dc74953978 [formerly 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]]
Former-commit-id: dc74953978
Former-commit-id: 2ede564cdb [formerly aa133cc8a3] [formerly 0e9d0b2ef5] [formerly 0d288d370383d89f0fd9b620c1af2bfa831fc49c [formerly b7d992179f759d29da9804b9ffcafec8048bcefa] [formerly 0e9d0b2ef5 [formerly 713cfeffc7]]]
Former-commit-id: cc2e29627bf192e53143f9beb0749c892244949a [formerly 4b80090552f8712feaf5137c27c2f010cda148e2] [formerly 5fda99b1fe [formerly 6412cc1427]]
Former-commit-id: 5fda99b1fe
Former-commit-id: 86d6a0cd4d
|
2014-05-28 09:01:00 -05:00 |
|
Steve Harris
|
e93d032f05
|
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: 8666f9a6fe [formerly 08308cd279] [formerly 3de24b7b07] [formerly 3de24b7b07 [formerly 99bc6f990c]] [formerly 8666f9a6fe [formerly 08308cd279] [formerly 3de24b7b07] [formerly 3de24b7b07 [formerly 99bc6f990c]] [formerly 3b16bbafb1 [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 7bb35319b2 [formerly 9458ea3648] [formerly bfa4255eea] [formerly 71416a84ea07f551a8d4b12b7a5193d78a44f0d8 [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc] [formerly bfa4255eea [formerly 9b98b41cd4]]]
Former-commit-id: 5123ae7b27223de3c9b15a6ffa2edecab6105980 [formerly a54e34e905540883ccd6d6eb5c78370ac905f651] [formerly 172cca39d9 [formerly 144354c369]]
Former-commit-id: 172cca39d9
Former-commit-id: cf2950abdb
|
2014-05-27 14:48:24 -04:00 |
|
Richard Peter
|
7deb749da8
|
Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
Former-commit-id: f35ced0a3b [formerly 48236cfcee] [formerly 80a5f2fc1b] [formerly 80a5f2fc1b [formerly 40b7623c87]] [formerly f35ced0a3b [formerly 48236cfcee] [formerly 80a5f2fc1b] [formerly 80a5f2fc1b [formerly 40b7623c87]] [formerly 87da8bd952 [formerly 80a5f2fc1b [formerly 40b7623c87] [formerly 87da8bd952 [formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]]]]]
Former-commit-id: 87da8bd952
Former-commit-id: 16721b1436 [formerly fb6f0d55cb] [formerly c799f78f5d] [formerly d5c006f0f7bcda42e2fb39b049c58c13df81d408 [formerly 8788f9f737d6065baf0186a4f7db19dc442c4b07] [formerly c799f78f5d [formerly 8baf897297]]]
Former-commit-id: a96b6c998057a5f6e0ffa16bce34d9a0e7a08402 [formerly eed964b1439a8daace72f6a3b52823282676ce1e] [formerly 69fea4c8b3 [formerly 1776389eb7]]
Former-commit-id: fa20322a396004d8c6b4f240571ea03d2c464e50 [formerly 69fea4c8b3]
Former-commit-id: 877097044b
|
2014-05-19 16:07:51 -05:00 |
|
Richard Peter
|
f47ed80713
|
Issue #2060: Consolidate grid indexes.
Change-Id: Ibc77133cd1b016ef85bae61e47e373a30e6e4d23
Former-commit-id: 1876f3801e [formerly bbdd7c01a7] [formerly 50fb33488c] [formerly 50fb33488c [formerly 62e215eb89]] [formerly 1876f3801e [formerly bbdd7c01a7] [formerly 50fb33488c] [formerly 50fb33488c [formerly 62e215eb89]] [formerly 6143d43329 [formerly 50fb33488c [formerly 62e215eb89] [formerly 6143d43329 [formerly 892c0f28a13d53118141efe14762deebe169d7ba]]]]]
Former-commit-id: 6143d43329
Former-commit-id: 15539434c8 [formerly d388968728] [formerly e2954e54db] [formerly 06de343df076082f3c3e13048b62afe66843f299 [formerly 1c9d2bd0f67d7550e07bd561196d5aebc3919b29] [formerly e2954e54db [formerly 32f7bd8735]]]
Former-commit-id: 8eac5c6542348fe44866d4a8bbb55159daed1b32 [formerly ff44d778e1b13fc9d813d4322f74d4f8aeebf256] [formerly bb580d8e7c [formerly 28eb882fb6]]
Former-commit-id: a5553ad891fed3afa9e475bf72f4467f6f704829 [formerly bb580d8e7c]
Former-commit-id: c49a3c8c52
|
2014-05-12 16:59:34 -05:00 |
|
Roger Ferrel
|
135359cad1
|
Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8
Former-commit-id: e751eb428f [formerly 487b66ffc4] [formerly 6bfacf85ab] [formerly 6bfacf85ab [formerly 039f4826ea]] [formerly e751eb428f [formerly 487b66ffc4] [formerly 6bfacf85ab] [formerly 6bfacf85ab [formerly 039f4826ea]] [formerly c226ef3596 [formerly 6bfacf85ab [formerly 039f4826ea] [formerly c226ef3596 [formerly 909a3f42bdb9d8149013056f9956bf0c38b764c5]]]]]
Former-commit-id: c226ef3596
Former-commit-id: f4c4844af6 [formerly 16106fe32a] [formerly 672875baf9] [formerly 705506c17a63b000b33488b9b65aeb5ba3ede896 [formerly 852cdc5cc5ce12eaddae5abc239f333bad66906e] [formerly 672875baf9 [formerly ce1ca8b4e3]]]
Former-commit-id: 090237dead0ced0d907126d2946bdf69c16254c7 [formerly 39b77f1a25e1d1c090b0b0116907d3b205523575] [formerly ea6ef4eb89 [formerly 940886ffae]]
Former-commit-id: ea6ef4eb89
Former-commit-id: fb8d11aa51
|
2014-05-09 09:34:49 -05:00 |
|
David Gillingham
|
7a3fa165b5
|
Issue #3142: Improve error-handling and logging in CleanupGfeHDF5Storage delta script.
Change-Id: I5c75cfb44654781a53f4588236f5d5d562432615
Former-commit-id: 11a8f9746a [formerly 39266d563f] [formerly 720993104c] [formerly 720993104c [formerly 9ebbf783df]] [formerly 11a8f9746a [formerly 39266d563f] [formerly 720993104c] [formerly 720993104c [formerly 9ebbf783df]] [formerly 29072aa824 [formerly 720993104c [formerly 9ebbf783df] [formerly 29072aa824 [formerly 920999bda9dda329e71359ab46872130f45d298c]]]]]
Former-commit-id: 29072aa824
Former-commit-id: 02d649f542 [formerly dfe3d2d467] [formerly 800438edc0] [formerly f91bde9d917c03a805d89ce951b7b3cf8279b970 [formerly bbc219d6a0b4a04af16b25b53aa80a7784f5dba1] [formerly 800438edc0 [formerly 1769a52111]]]
Former-commit-id: ce6af8335f210d2a4670c2d8db0e79616ffb7d88 [formerly 67a88d860b32cecf8811ae2bd18b3868389a1782] [formerly 1a3d0a9413 [formerly 36684955e5]]
Former-commit-id: 4f9ab8ccdcb87ff905c998707f992d8c00d68690 [formerly 1a3d0a9413]
Former-commit-id: 160aacc111
|
2014-05-08 16:51:41 -05:00 |
|
Mike Duff
|
80397df8dc
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: ed00e1012d [formerly f4062cd277] [formerly 0456fd0597] [formerly 0456fd0597 [formerly 8498235fd8]] [formerly ed00e1012d [formerly f4062cd277] [formerly 0456fd0597] [formerly 0456fd0597 [formerly 8498235fd8]] [formerly 6a67638a94 [formerly 0456fd0597 [formerly 8498235fd8] [formerly 6a67638a94 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]]]
Former-commit-id: 6a67638a94
Former-commit-id: c2d2af733d [formerly 3966697849] [formerly f49192936a] [formerly 56a6c16ea4f1a3f74d2d52a263379061fd77a4d6 [formerly 2876e8ca8c3ac5b87e9cb00735e694e84a5f8df9] [formerly f49192936a [formerly 70c8135fde]]]
Former-commit-id: d91f1f7b692155a2393eef571952efd1878f2133 [formerly 79e94a80e7729225dba251b67e17c3517adc7fc5] [formerly 4adf657556 [formerly 916d90ee64]]
Former-commit-id: 4adf657556
Former-commit-id: 8904d8a501
|
2014-05-08 14:36:54 -05:00 |
|
Nate Jensen
|
128db5365a
|
Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1
Former-commit-id: 1a1253d6de [formerly b911f3e9b5] [formerly 1d157a16e3] [formerly 1d157a16e3 [formerly 7fbdb9ff83]] [formerly 1a1253d6de [formerly b911f3e9b5] [formerly 1d157a16e3] [formerly 1d157a16e3 [formerly 7fbdb9ff83]] [formerly bcb82bedc6 [formerly 1d157a16e3 [formerly 7fbdb9ff83] [formerly bcb82bedc6 [formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]]]]
Former-commit-id: bcb82bedc6
Former-commit-id: 1e1d36666d [formerly 8ae67e0d7f] [formerly 037fe502d7] [formerly 04b30926002d3886fd7982260fb7c1d62d5c2eb9 [formerly 793328ce1c59c6fb48e922f66fcf2785e57bd487] [formerly 037fe502d7 [formerly e5eb1ab87e]]]
Former-commit-id: e3431ecdfde636ceb33c5f69b8a07133a3f576da [formerly acc622a694e300635d3d9dee8f541f47970622d0] [formerly 8961b7305e [formerly 1b78d60b52]]
Former-commit-id: 8961b7305e
Former-commit-id: 425fdb1674
|
2014-05-01 12:06:13 -05:00 |
|
Dave Hladky
|
27e3ab8d60
|
Issue #2992 Missed perl script
Former-commit-id: 67f2c9f1da [formerly f844c98853] [formerly 9a43ac36e6] [formerly 9a43ac36e6 [formerly 23433f628d]] [formerly 67f2c9f1da [formerly f844c98853] [formerly 9a43ac36e6] [formerly 9a43ac36e6 [formerly 23433f628d]] [formerly 904a608495 [formerly 9a43ac36e6 [formerly 23433f628d] [formerly 904a608495 [formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]]]]
Former-commit-id: 904a608495
Former-commit-id: 04b310d40e [formerly 76c963b690] [formerly bc4067c5d8] [formerly 6af509699cf091b95d68b8813e0fcd6e86208ce0 [formerly d66d8ebcef31eae8a5b0eefbe03af2d980e7f476] [formerly bc4067c5d8 [formerly dbe4f68100]]]
Former-commit-id: 32282347759dae5723c147cf7ff9eff1112779ee [formerly 11e66bf207067369386858e6d5a550d4aa1e7161] [formerly a520e57f73 [formerly 741e809c95]]
Former-commit-id: a520e57f73
Former-commit-id: 800641027c
|
2014-05-01 08:48:38 -05:00 |
|
Dave Hladky
|
b2b7ecd19f
|
Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: fcb80a2b11 [formerly a14cb8c45f] [formerly e2a4bb6755] [formerly e2a4bb6755 [formerly c352643c79]] [formerly fcb80a2b11 [formerly a14cb8c45f] [formerly e2a4bb6755] [formerly e2a4bb6755 [formerly c352643c79]] [formerly 3b00ae03cc [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 1174c27f8c [formerly 5fc17cf3b8] [formerly ea791b5ca5] [formerly 7a0ec71e79da5fa2b51e6043955d28c246d5ea12 [formerly 271120a82cffba35438f0b9830c3a47c736fcb73] [formerly ea791b5ca5 [formerly bf42c8d740]]]
Former-commit-id: 630016c2f6f9e6fa6981721b0c411b2ba16af6b7 [formerly 966b34bc10a6cb76f151b577b0acae7fb953d804] [formerly a06db5a4e7 [formerly 5b11e45636]]
Former-commit-id: a06db5a4e7
Former-commit-id: 5fa53b22dc
|
2014-04-30 17:38:28 -05:00 |
|
Richard Peter
|
44413268c1
|
Issue #2854: Reorganize deltaScripts
Former-commit-id: ad09921060 [formerly 46a94c88cd] [formerly 09f41a6b31] [formerly 09f41a6b31 [formerly 56745c942e]] [formerly ad09921060 [formerly 46a94c88cd] [formerly 09f41a6b31] [formerly 09f41a6b31 [formerly 56745c942e]] [formerly c8e373c098 [formerly 09f41a6b31 [formerly 56745c942e] [formerly c8e373c098 [formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]]]]
Former-commit-id: c8e373c098
Former-commit-id: 512f2bafcd [formerly d25ceb8da7] [formerly a526600e3e] [formerly ecacc56d4ab4d3d36508094699557db6ed8b916a [formerly d5d0bc708d2a84d887a8b1401a4d596af0a188e3] [formerly a526600e3e [formerly e1721cad00]]]
Former-commit-id: 504b6baf8a8a0eb4a0d2bdf82aa93c474e03e0fd [formerly e5bdfc9c23d1ad9869b9fa62e5f577d39c450737] [formerly 55708f1d55 [formerly 18b4d133c7]]
Former-commit-id: 55708f1d55
Former-commit-id: 753ede7463
|
2014-04-30 13:03:44 -05:00 |
|
Richard Peter
|
be03491898
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 3d9938c5a3 [formerly 8b1a177110] [formerly 67683dd891] [formerly 67683dd891 [formerly 44b1782461]] [formerly 3d9938c5a3 [formerly 8b1a177110] [formerly 67683dd891] [formerly 67683dd891 [formerly 44b1782461]] [formerly 32957285fc [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]]
Former-commit-id: 32957285fc
Former-commit-id: a0ffae6c6b [formerly 0dfa8cc4c6] [formerly 6966b79246] [formerly f7f2cdcc4b250524846ce9a4063e651d4182d7a2 [formerly 2a324b0264c6962014f41df55690c7e2b09955e1] [formerly 6966b79246 [formerly 80d4153878]]]
Former-commit-id: 986eca78fd87d8ec7780dff8945df5a6f4027c92 [formerly 5715dc841fc8db519f94f6126094e2ff4eb83ea8] [formerly 938e39a0fc [formerly 24a3fe1466]]
Former-commit-id: bdad2c5a4d9e80d74a8de91b9c0f77f719cfbb3d [formerly 938e39a0fc]
Former-commit-id: e748b7c1e5
|
2014-04-28 16:27:40 -05:00 |
|
Brian Clements
|
74fa83cc47
|
Issue #3079 update to lightning name will continue if it encounters invalid xml
Former-commit-id: e4a1209d00 [formerly 9d0b557dec] [formerly afdae7c2e1] [formerly afdae7c2e1 [formerly 3305aee692]] [formerly e4a1209d00 [formerly 9d0b557dec] [formerly afdae7c2e1] [formerly afdae7c2e1 [formerly 3305aee692]] [formerly 98adf15cda [formerly afdae7c2e1 [formerly 3305aee692] [formerly 98adf15cda [formerly 07e7a0eaa6973a705d5fff1beb8ebcb553c172d0]]]]]
Former-commit-id: 98adf15cda
Former-commit-id: 89e162f21c [formerly 89c1082c77] [formerly 421461fbd8] [formerly a97d8dfeda77cc6f66c2acf5196aa89c4722eb6f [formerly ed0ac441e8aaedea6c613df0559967e9ce0fdded] [formerly 421461fbd8 [formerly 5ca56d292a]]]
Former-commit-id: a4e65ca705ddc7d923e2822b8e47bfd7032ea80b [formerly 1bcb63c85b99321a72689eabb4c9a0dfe5c98afc] [formerly 7baf887f56 [formerly 5a868353c4]]
Former-commit-id: 7baf887f56
Former-commit-id: 0265a8825b
|
2014-04-25 11:04:00 -05:00 |
|
Brian.Dyke
|
cec09f3da0
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 83727709c6 [formerly 362d882b40] [formerly f0b8ea5822] [formerly f0b8ea5822 [formerly fb1f5aa593]] [formerly 83727709c6 [formerly 362d882b40] [formerly f0b8ea5822] [formerly f0b8ea5822 [formerly fb1f5aa593]] [formerly 3524838f9f [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 3e80889eb6 [formerly 14a63a19e1] [formerly bf3758efa3] [formerly 7eb8ff57ff4d7d383497a38960663b90f905f7b8 [formerly bb5a7e713dac6962660d9c769971464b6792cb76] [formerly bf3758efa3 [formerly 029f5753ad]]]
Former-commit-id: 960ad127021a3962ec78e308ec84ad9dadc4cc78 [formerly 4f6c777830575250a298510d89cfba1ef9df9753] [formerly f31d8cc8cf [formerly c6d3fe6952]]
Former-commit-id: f31d8cc8cf
Former-commit-id: 19b4bb7dcc
|
2014-04-25 11:06:11 -04:00 |
|
Nate Jensen
|
b79672ad9a
|
Issue #2060 fix delta script to only drop dataURI if the constraint
alterations work
Change-Id: I5ad70fd87b72ebb3566aa99d7c603b2b122be5e8
Former-commit-id: 895b3c87cd [formerly 8cd709c01d] [formerly d276d5f39b] [formerly d276d5f39b [formerly 43b44d911a]] [formerly 895b3c87cd [formerly 8cd709c01d] [formerly d276d5f39b] [formerly d276d5f39b [formerly 43b44d911a]] [formerly 0b4df56454 [formerly d276d5f39b [formerly 43b44d911a] [formerly 0b4df56454 [formerly 6f8459f03a5af0816f93b0a20e861aafe5a9a779]]]]]
Former-commit-id: 0b4df56454
Former-commit-id: 8ffad4ff99 [formerly 9c8b6b8e60] [formerly e99f8ba4b4] [formerly a5fcc780b72b5f494463639cc3b677d9ba07cc5a [formerly faff97546b3c12109948a456374de7a19c1b4a45] [formerly e99f8ba4b4 [formerly 16d60c361a]]]
Former-commit-id: 515c2b43de0c937c126e6772b2d9468edf7e1df1 [formerly d9a7f11e17226cc9759880c3aea8ab0471f7b55f] [formerly 04e89be225 [formerly 205c2c58f9]]
Former-commit-id: 04e89be225
Former-commit-id: ac959abf90
|
2014-04-23 12:05:20 -05:00 |
|
Nate Jensen
|
e8637d3536
|
Issue #2060 dropping grid dataURI column
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 7c09889a07 [formerly 03451ab6b2] [formerly 263611f905] [formerly 263611f905 [formerly a37a2afe18]] [formerly 7c09889a07 [formerly 03451ab6b2] [formerly 263611f905] [formerly 263611f905 [formerly a37a2afe18]] [formerly 5dfb652775 [formerly 263611f905 [formerly a37a2afe18] [formerly 5dfb652775 [formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]]]]]
Former-commit-id: 5dfb652775
Former-commit-id: 70aca9cf41 [formerly c4819a4e95] [formerly 3eddbf452d] [formerly 0a5c67662f6c691d24b3f1421491c92e3156609a [formerly 6295d04b083ae6cd109f1c2f595fb1922420e2a1] [formerly 3eddbf452d [formerly cdb932cc4d]]]
Former-commit-id: 855301c13f9ba096e4968bf6166aa475221ebdb0 [formerly c56097498f5f6539bb58e0c60cabc43139bd2578] [formerly 403f4c3195 [formerly 9ef0154104]]
Former-commit-id: 34c56b213d0460e1731a57a014481dd3326a6b15 [formerly 403f4c3195]
Former-commit-id: 43bb667c30
|
2014-04-21 17:34:39 -05:00 |
|
Nate Jensen
|
ebc403c38b
|
Merge "Issue #2725 Adding user/site derivparam migrate script" into development
Former-commit-id: a18d7ced96 [formerly 452145016b] [formerly a2db252625] [formerly a2db252625 [formerly fc4d9a79ce]] [formerly a18d7ced96 [formerly 452145016b] [formerly a2db252625] [formerly a2db252625 [formerly fc4d9a79ce]] [formerly 9ad6b06ac9 [formerly a2db252625 [formerly fc4d9a79ce] [formerly 9ad6b06ac9 [formerly ea7a0b963bf90c657c574fb40e67e54c1f33c203]]]]]
Former-commit-id: 9ad6b06ac9
Former-commit-id: f3220e3ea8 [formerly d1747e98b1] [formerly 4648e4b9b8] [formerly 0e6a48c155a3251e0cd404dad1268208653eb5bd [formerly 9b056eb1cef2ddfbc3c76756a9dafa38373e2b6c] [formerly 4648e4b9b8 [formerly 65fda3c736]]]
Former-commit-id: d170a7599fdec25b73138c616d1f45f1b3b68cfb [formerly 5f41e6d037aff9880d5f0ed353728d45636d40ed] [formerly 4a9121f289 [formerly daad3656f9]]
Former-commit-id: 4a9121f289
Former-commit-id: 57927e0e28
|
2014-04-14 08:59:21 -05:00 |
|
Mike Duff
|
6fe7cf7012
|
Issue #2864 - Change how saved subset files are stored.
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c
Former-commit-id: f49a38791c [formerly 3404a4beb4] [formerly a58f279b54] [formerly a58f279b54 [formerly 82cf444d6f]] [formerly f49a38791c [formerly 3404a4beb4] [formerly a58f279b54] [formerly a58f279b54 [formerly 82cf444d6f]] [formerly 890faf2d73 [formerly a58f279b54 [formerly 82cf444d6f] [formerly 890faf2d73 [formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]]]]
Former-commit-id: 890faf2d73
Former-commit-id: 4ef63dabc5 [formerly 6e9e743fdc] [formerly dc2a5b0c6f] [formerly 26814915ac992e3fb04decd48564958f10d1d703 [formerly ddc580d7996e5dbb65fac9aa71fcaadccf9ac671] [formerly dc2a5b0c6f [formerly 6d8bead4a7]]]
Former-commit-id: af0c543d09eb95b9be2d181d79f2708b5dae5d4d [formerly 4c9cab1bca5ff66392871ba348388ee4d9e61894] [formerly 8b46df102d [formerly 583a4b1cea]]
Former-commit-id: 8b46df102d
Former-commit-id: 8f8f5ddd1c
|
2014-04-11 08:27:42 -05:00 |
|
Everett Kladstrup
|
734dd176bd
|
Issue #2725 Adding user/site derivparam migrate script
Former-commit-id: 4107492001 [formerly e88ca6c56f] [formerly 0f9228c686] [formerly 0f9228c686 [formerly b4e353332b]] [formerly 4107492001 [formerly e88ca6c56f] [formerly 0f9228c686] [formerly 0f9228c686 [formerly b4e353332b]] [formerly a0edd808b0 [formerly 0f9228c686 [formerly b4e353332b] [formerly a0edd808b0 [formerly 8c37f0716051384e6364ffa30a6dd0a4649fb96b]]]]]
Former-commit-id: a0edd808b0
Former-commit-id: 501733efff [formerly 1c71d16497] [formerly 8a449daa8d] [formerly 64973e1ad83cc748cd82e13764e1430ada7b746c [formerly 6dce4a9545ee208963fdc6469b5d2b94228d59bd] [formerly 8a449daa8d [formerly fcca67d5ee]]]
Former-commit-id: fe682b41fdcf6816ad08fbaa25eb9577a15a59db [formerly eb356e4af89f77376222ff1f97bade2195c450bd] [formerly 0946c44256 [formerly 3e7996f0ae]]
Former-commit-id: 7cd13cb778d9443bb2c7a50069d7775f9de9c9f7 [formerly 0946c44256]
Former-commit-id: ab046a357b
|
2014-04-10 17:15:44 -05:00 |
|
Dave Hladky
|
64172bf4d3
|
Issue #2949 Updated scripts
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80
Former-commit-id: 3ddd3a2311 [formerly daa2f2ba43] [formerly 41e43a169b] [formerly 41e43a169b [formerly 3d6ebf498e]] [formerly 3ddd3a2311 [formerly daa2f2ba43] [formerly 41e43a169b] [formerly 41e43a169b [formerly 3d6ebf498e]] [formerly ede510dd91 [formerly 41e43a169b [formerly 3d6ebf498e] [formerly ede510dd91 [formerly afcfc72329522c2d731a4afe9353632effb9cb23]]]]]
Former-commit-id: ede510dd91
Former-commit-id: 1d2dc1e3ea [formerly 0b5059d6aa] [formerly b202d62214] [formerly 41e820fefe1cce89368ef636b6259aef69a41adb [formerly ef0f92e418f1be10b9211b5d53757234b102506e] [formerly b202d62214 [formerly be18d1f63c]]]
Former-commit-id: 322f017e2677f7c429534f1e232c3cd36590b5cd [formerly 0001a7448852b3c1979c9e8030be312102e13bfb] [formerly 24724a8819 [formerly a3ac9604e6]]
Former-commit-id: afe3aeaa00224fb5062616f83d0ee41a2dd6c822 [formerly 24724a8819]
Former-commit-id: a2dfde5712
|
2014-04-01 12:33:48 -05:00 |
|
Brian Clements
|
18b2555bc9
|
Issue #2667 delta scripts for lightning source name change in xml files
handles stored procedures/bundles in localization
Former-commit-id: 4b16683777 [formerly 93c743267d] [formerly cc50637346] [formerly cc50637346 [formerly 0811b0580f]] [formerly 4b16683777 [formerly 93c743267d] [formerly cc50637346] [formerly cc50637346 [formerly 0811b0580f]] [formerly ddcb1011bb [formerly cc50637346 [formerly 0811b0580f] [formerly ddcb1011bb [formerly 8e3e3be372d5db6dfc5897407074bc250fbef294]]]]]
Former-commit-id: ddcb1011bb
Former-commit-id: 8c6c4b5166 [formerly 6271ff6787] [formerly bf67bd0a33] [formerly 82e7c80f6e907398fb3236cd9b133e1d2b26301b [formerly 79db5b1fb34b532032174280c117b71cb066eb86] [formerly bf67bd0a33 [formerly 0292707f9d]]]
Former-commit-id: 41e846b34979f91286a65cf04a08a6afc50d79c8 [formerly 2386532c8555732d8aede43df568d8d6d3812eb3] [formerly 9a8ad193c2 [formerly c700bba545]]
Former-commit-id: 9a8ad193c2
Former-commit-id: bdac947397
|
2014-03-03 16:30:45 -06:00 |
|
Steve Harris
|
af1aabb56b
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
Former-commit-id: 55fbf9a28f [formerly f1a9ec2d1e] [formerly ae2b849157] [formerly ae2b849157 [formerly 7a156e297a]] [formerly 55fbf9a28f [formerly f1a9ec2d1e] [formerly ae2b849157] [formerly ae2b849157 [formerly 7a156e297a]] [formerly 7b59bd41eb [formerly ae2b849157 [formerly 7a156e297a] [formerly 7b59bd41eb [formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]]]]
Former-commit-id: 7b59bd41eb
Former-commit-id: 489f3112f7 [formerly 116d836ab3] [formerly 4a379aa6e5] [formerly dff7e898a68f0389dbb73f3b62db3d0bc7541bfa [formerly 675dc12528eb749e423c405fa15dbe8b66201362] [formerly 4a379aa6e5 [formerly aa9b488963]]]
Former-commit-id: 8171be7972336d28fe2b9dab3bdddf78db7b189f [formerly 0dd75fee1d6fbdae1f20d879a1069b131d9cd16f] [formerly e6cab2a902 [formerly b9af02c0b3]]
Former-commit-id: e6cab2a902
Former-commit-id: 95a936e9dc
|
2014-02-03 10:29:16 -06:00 |
|
Nate Jensen
|
b50bee7975
|
Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN
events while in there
Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619
Former-commit-id: 55d50c7fd7 [formerly 9ff86044a2] [formerly c18e66cc45] [formerly c18e66cc45 [formerly 327c588c9e]] [formerly 55d50c7fd7 [formerly 9ff86044a2] [formerly c18e66cc45] [formerly c18e66cc45 [formerly 327c588c9e]] [formerly 906c679b4e [formerly c18e66cc45 [formerly 327c588c9e] [formerly 906c679b4e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]]]]
Former-commit-id: 906c679b4e
Former-commit-id: 186223f1b4 [formerly 53afb531fa] [formerly af0ac40f47] [formerly 7729fbe1be0494af7324f98a33814fac53f57043 [formerly a60314b3783b7851cffad12a2adc0d68ac6ecdb3] [formerly af0ac40f47 [formerly 7bd1d802be]]]
Former-commit-id: 380d41c9da9f52d36bdbe5f8ce2414b781495364 [formerly 21c2189b9de73879ebb7e4c047f7d7c980d4918a] [formerly cfb4bdbb21 [formerly ed91c1d6f5]]
Former-commit-id: cfb4bdbb21
Former-commit-id: ab58b2f973
|
2014-01-30 12:02:42 -06:00 |
|
Brian Clements
|
12ba997015
|
Issue #2701 removed local groups from collaboration
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group
Former-commit-id: 2b8a4520ed [formerly fffb6aaf9a] [formerly b86ad8ca6f] [formerly b86ad8ca6f [formerly f615f2226f]] [formerly 2b8a4520ed [formerly fffb6aaf9a] [formerly b86ad8ca6f] [formerly b86ad8ca6f [formerly f615f2226f]] [formerly 26ac549096 [formerly b86ad8ca6f [formerly f615f2226f] [formerly 26ac549096 [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]]]
Former-commit-id: 26ac549096
Former-commit-id: cd86a93ddc [formerly e2ca671173] [formerly cfe945d76b] [formerly 2c056ea10d766848853102bb88dc146ee6a8faef [formerly beabd84fb816fcf8a5201927f1389915efb941f7] [formerly cfe945d76b [formerly 8944860cbb]]]
Former-commit-id: 6a69157720b5cf69409931694abc682701acafbc [formerly 72e40ed0e3344ea4433f6ff8a72c7dd93e6418a3] [formerly ff1882e80a [formerly dd9b3ca640]]
Former-commit-id: ff1882e80a
Former-commit-id: b200f4b644
|
2014-01-27 10:14:10 -06:00 |
|
Brian Clements
|
e2c863a88d
|
Issue #2667 added bin lightning data access factory
renamed lightning record's lightSource field to source
added delta script for db column change
added attribute method comments for IData and DefaultGeometryData
Former-commit-id: e580f1f490 [formerly ff97757a38] [formerly 54516275f1] [formerly 54516275f1 [formerly 402bef9c5b]] [formerly e580f1f490 [formerly ff97757a38] [formerly 54516275f1] [formerly 54516275f1 [formerly 402bef9c5b]] [formerly bd9fbc5f38 [formerly 54516275f1 [formerly 402bef9c5b] [formerly bd9fbc5f38 [formerly b6c50729919ea8a9b29ca963e18f68268c3a0b7f]]]]]
Former-commit-id: bd9fbc5f38
Former-commit-id: ecbc8bc2a5 [formerly 5bc0ffe4af] [formerly 265137fd91] [formerly 26658ead3742382825db1c91f0c2e9e2ab9bd73d [formerly 72626aac11a4c66833f161115fc8c8d2adc2b74c] [formerly 265137fd91 [formerly 83ed9dc04d]]]
Former-commit-id: 7b5efaa3c67cc47daecb7da40a071c4e39f9fe3b [formerly c5bb42d8f6a8c636420817814985ab0a5d1a0c8d] [formerly abb1c97149 [formerly 77e31f815e]]
Former-commit-id: 5c4a17ab2547578604ac82cabad7eb5ae448e585 [formerly abb1c97149]
Former-commit-id: c82cc659af
|
2014-01-23 09:32:18 -06:00 |
|
Nate Jensen
|
ace65c4337
|
Issue #2581 fix local storm report delta script and unique constraint
Change-Id: I421aed1572c10c80a592381c849d85eac8d1e809
Former-commit-id: f6bf9ccac8 [formerly 16d01f1ca7] [formerly 562e85e45b] [formerly 562e85e45b [formerly e6feb413f7]] [formerly f6bf9ccac8 [formerly 16d01f1ca7] [formerly 562e85e45b] [formerly 562e85e45b [formerly e6feb413f7]] [formerly 059e057cdb [formerly 562e85e45b [formerly e6feb413f7] [formerly 059e057cdb [formerly 88918268a6d72d35dd2f19be09fbb429851fe46b]]]]]
Former-commit-id: 059e057cdb
Former-commit-id: 9210e824b6 [formerly f58034617d] [formerly d4236a7fc0] [formerly 76517e160958530803c7f89bcb63e8c7c4476308 [formerly eb6b4892671bdfa9f3570ac483b6bc6a075ba84b] [formerly d4236a7fc0 [formerly bc2f099cc6]]]
Former-commit-id: ffe6dded2e13ec2a4f9f8577868b3b6e438243c2 [formerly 20d520612f8768a8f88dbd545ab39da3abd62969] [formerly 31ce99c9f1 [formerly 47f20fb577]]
Former-commit-id: 31ce99c9f1
Former-commit-id: 01e92b31e4
|
2014-01-15 09:50:35 -06:00 |
|
Ben Steffensmeier
|
9fe69a07e7
|
Issue #2537 Split modelsounding into common/edex plugins.
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8
Former-commit-id: ec8a5167bf [formerly 08c9b54e49] [formerly f516a684d4] [formerly f516a684d4 [formerly f520a26fbd]] [formerly ec8a5167bf [formerly 08c9b54e49] [formerly f516a684d4] [formerly f516a684d4 [formerly f520a26fbd]] [formerly d79f804d4e [formerly f516a684d4 [formerly f520a26fbd] [formerly d79f804d4e [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]]]
Former-commit-id: d79f804d4e
Former-commit-id: 6d408717b0 [formerly 4b43971a78] [formerly 9913e51429] [formerly 5fa2e894d837d255ea821376c5ae3c2bcb923db4 [formerly b2807282541cba1b6dadcac12cda1996f7292656] [formerly 9913e51429 [formerly fac9fd296f]]]
Former-commit-id: 5b230d2f60ab294bd526cab53485b43b9abe58c2 [formerly 7d14b369cda7d14c9c1a9fb5e2be6d7759dd73e3] [formerly 7303bd3b62 [formerly 4fef47c0a8]]
Former-commit-id: 7303bd3b62
Former-commit-id: 0be4f6aa10
|
2014-01-06 16:02:59 -06:00 |
|
Richard Peter
|
b8a4d943b7
|
Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1
Former-commit-id: 3664841b41 [formerly ce63ee408b] [formerly f278dad7cc] [formerly f278dad7cc [formerly 63bd2b26eb]] [formerly 3664841b41 [formerly ce63ee408b] [formerly f278dad7cc] [formerly f278dad7cc [formerly 63bd2b26eb]] [formerly 6f57e14406 [formerly f278dad7cc [formerly 63bd2b26eb] [formerly 6f57e14406 [formerly 3d887a288459b786718a59d0c4a368408c3419f0]]]]]
Former-commit-id: 6f57e14406
Former-commit-id: ffd1c3137a [formerly eb2ae25b0b] [formerly cdf86e65ec] [formerly d0cd4ea7739d06c24e629d6490eb34c4f5b44cb0 [formerly 4d3fe53b50bbff6dffd235bf492f67ac729eea24] [formerly cdf86e65ec [formerly 2f0e43e5a4]]]
Former-commit-id: 6f44940976fa7674860e2a74d4b3470795ab4ca2 [formerly f379b9c9ae210f65afd2682f70d34ca47614b7cd] [formerly b3074e9215 [formerly fb3ccd066c]]
Former-commit-id: b3074e9215
Former-commit-id: 149de2e415
|
2013-12-11 16:19:02 -06:00 |
|
Mike Duff
|
66771b5326
|
Issue #2616 - Set overwrite allowed flag on madis records when decoded
Added delta script for table MADIS with the hibernate generated key name
Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519
Former-commit-id: 46f8d7bb02 [formerly fa87393135] [formerly 1a0893d70e] [formerly 1a0893d70e [formerly 9a02ae7d68]] [formerly 46f8d7bb02 [formerly fa87393135] [formerly 1a0893d70e] [formerly 1a0893d70e [formerly 9a02ae7d68]] [formerly 5a42580c2b [formerly 1a0893d70e [formerly 9a02ae7d68] [formerly 5a42580c2b [formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]]]]
Former-commit-id: 5a42580c2b
Former-commit-id: efe2eca851 [formerly 1504d28ac8] [formerly d65b7c1cf5] [formerly 5b616d2e575feb54d24ff5a9f1a5f96ae32a39bc [formerly 66d528190928112341ed3f56645df5e6a90b4a1e] [formerly d65b7c1cf5 [formerly dc6ab027b5]]]
Former-commit-id: e183b726f97bd94f0597c6a8243140abe99f965b [formerly 9180a12adb33997ae9fb803dd7ecab5a82c85206] [formerly 00e00796ae [formerly 3f98d329c9]]
Former-commit-id: 00e00796ae
Former-commit-id: 0275c2b3a3
|
2013-12-11 14:12:05 -06:00 |
|
Nate Jensen
|
bf07d38eb4
|
Issue #2581 remove LSR dataURI column
Change-Id: I9d5ddc8346e6b9ac0ec56d09d50b6b19a5bc682f
Former-commit-id: b45a88da88 [formerly 1d91d67a5b] [formerly 6188356e72] [formerly 6188356e72 [formerly fa674baf89]] [formerly b45a88da88 [formerly 1d91d67a5b] [formerly 6188356e72] [formerly 6188356e72 [formerly fa674baf89]] [formerly e037c179fe [formerly 6188356e72 [formerly fa674baf89] [formerly e037c179fe [formerly 88124207249673c3bf29915b6f6318bd2397ecd5]]]]]
Former-commit-id: e037c179fe
Former-commit-id: 3bedaaaa67 [formerly 61e9833351] [formerly 4478983895] [formerly 7a3fec76fb3bab3a563be14dedf47104bfeca041 [formerly d4f63bdd454d528603209bfccf323090b3ffb746] [formerly 4478983895 [formerly 34c1af18a7]]]
Former-commit-id: e6620d5cc759f2d972760f747c44861c62214a1f [formerly 7568cea11c2e09ab775871667eabd4d94ff75e40] [formerly e548e47239 [formerly b5450572f2]]
Former-commit-id: e548e47239
Former-commit-id: 74476aa385
|
2013-12-10 18:27:33 -06:00 |
|
Richard Peter
|
b7f648e5f0
|
Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: f016666838 [formerly 2a2473f3bb] [formerly ff44393e90] [formerly ff44393e90 [formerly ea7dac5993]] [formerly f016666838 [formerly 2a2473f3bb] [formerly ff44393e90] [formerly ff44393e90 [formerly ea7dac5993]] [formerly 0281447166 [formerly ff44393e90 [formerly ea7dac5993] [formerly 0281447166 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]]]]
Former-commit-id: 0281447166
Former-commit-id: c2909355dc [formerly 8f9b6fa07c] [formerly d937861d05] [formerly 86bc5f664d4b6eff6dc3209a5e3fb11717206fb3 [formerly f8b518f19e6bc75858971de994088a9caa63f0de] [formerly d937861d05 [formerly f6808e6623]]]
Former-commit-id: 51d983e1f30c619efdd7944520c46d0c43aa2002 [formerly c7aa9d937c01012c67dfbd64e95131561967b13e] [formerly 54c056a310 [formerly 8cdd151d64]]
Former-commit-id: 54c056a310
Former-commit-id: 956a39cf72
|
2013-12-04 12:00:40 -06:00 |
|
Dave Hladky
|
06cc2e0d54
|
Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6
Former-commit-id: 9bdbabc098 [formerly bce11dec14] [formerly 6607e5fe30] [formerly 6607e5fe30 [formerly 483ec5d22f]] [formerly 9bdbabc098 [formerly bce11dec14] [formerly 6607e5fe30] [formerly 6607e5fe30 [formerly 483ec5d22f]] [formerly 593f24023d [formerly 6607e5fe30 [formerly 483ec5d22f] [formerly 593f24023d [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]]]]
Former-commit-id: 593f24023d
Former-commit-id: bbbfb8d925 [formerly 36f601253e] [formerly 09aa3a6c62] [formerly b40445648d87cf940631be19b9d91609156ef8e7 [formerly 035f4702c002daa8199c28c0d3ad1c8b496bd6ab] [formerly 09aa3a6c62 [formerly 4060748634]]]
Former-commit-id: 5dfacfb9867d58e8aec7ff75850c4d41925ad1b4 [formerly f25d919b9119ff63b128cb8bcb67039b0f6d8ae8] [formerly 25745e2782 [formerly dc5f5f3c87]]
Former-commit-id: 25745e2782
Former-commit-id: 4d222b0a16
|
2013-12-04 11:58:49 -06:00 |
|
Nate Jensen
|
6063edbe4d
|
Issue #2582 Fix decoding where OBS DTG are on separate lines, cleanup
VAA and remove dataURI
Change-Id: I984173a6e85eb7dc269fb98964af4915a9b5105e
Former-commit-id: c531475155 [formerly 77c23c6d0e] [formerly 9b3f871c21] [formerly 9b3f871c21 [formerly 6bf1fd8d3c]] [formerly c531475155 [formerly 77c23c6d0e] [formerly 9b3f871c21] [formerly 9b3f871c21 [formerly 6bf1fd8d3c]] [formerly 72c322c667 [formerly 9b3f871c21 [formerly 6bf1fd8d3c] [formerly 72c322c667 [formerly 148e7113abefd684dcacb5ccc28bb77192ff45c8]]]]]
Former-commit-id: 72c322c667
Former-commit-id: 7205f37f3b [formerly a25621ae6d] [formerly 476f9da5ad] [formerly f9a150104e9053263a7addd0e3a34157c41ead44 [formerly 58b83a2d53b306277cdc9a0820852147a2519f74] [formerly 476f9da5ad [formerly 2831ceb356]]]
Former-commit-id: 773fc11c38286bc8034f3ace3228e169714844f8 [formerly f8fdfa9a908f980ca803296046b6496e1b85e6e3] [formerly da9d1b2447 [formerly cbd12d4cc7]]
Former-commit-id: 4a6dff4a9913e332b454704c0b8eadb3c432d660 [formerly da9d1b2447]
Former-commit-id: 74c0067901
|
2013-12-02 16:10:26 -06:00 |
|
Richard Peter
|
89459f0994
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: d33f83272f [formerly 9bebb21be8] [formerly 800effdc5a] [formerly 800effdc5a [formerly 8fb79e7b73]] [formerly d33f83272f [formerly 9bebb21be8] [formerly 800effdc5a] [formerly 800effdc5a [formerly 8fb79e7b73]] [formerly c42f931118 [formerly 800effdc5a [formerly 8fb79e7b73] [formerly c42f931118 [formerly 13d284277bed2f0f731547ec443a262556df997c]]]]]
Former-commit-id: c42f931118
Former-commit-id: 6b051d88f5 [formerly b9da33bcea] [formerly e5dc8e2027] [formerly 8c896cdcda3edc1834470a523634aa1bfb977c97 [formerly d0ba6f0b34d98e888dee8eca0e8a59d14ff6436f] [formerly e5dc8e2027 [formerly 2b95bcfb31]]]
Former-commit-id: 391807d2950099eae2ea3edc6970d4e857bf3336 [formerly 6bd09bf526063f854e453bf474886432548c3c50] [formerly 2025e073ef [formerly e7d8e5e560]]
Former-commit-id: 2025e073ef
Former-commit-id: 170aeb49af
|
2013-11-14 14:56:59 -06:00 |
|
Brian Clements
|
59637dcd61
|
Issue #2505 removed recco from deployment
added update script to drop recco from db
Former-commit-id: e88bbe2aff [formerly 3204a2f7b5] [formerly 3551b731e0] [formerly 3551b731e0 [formerly 95f1621d3e]] [formerly e88bbe2aff [formerly 3204a2f7b5] [formerly 3551b731e0] [formerly 3551b731e0 [formerly 95f1621d3e]] [formerly 8cbe2c06a8 [formerly 3551b731e0 [formerly 95f1621d3e] [formerly 8cbe2c06a8 [formerly f4e66b8afce682014a0fa1ef9585b7ee6480e1e1]]]]]
Former-commit-id: 8cbe2c06a8
Former-commit-id: 27ebb8e6bb [formerly b5b94646cf] [formerly d2f0b73626] [formerly e25afb71a09ec42d78796d89ab5d9f1b601d1805 [formerly 3b2b0c50ce7169049fcf9a2ade66e9157fc2cf81] [formerly d2f0b73626 [formerly 49c8bd5ee9]]]
Former-commit-id: 7426be3e79f4d28179f5977aace075f5e8538851 [formerly 7384c5efc3b7d3bed603cfe7ab8ff291ceab0e23] [formerly 09101ca5ac [formerly d94f44d406]]
Former-commit-id: 09101ca5ac
Former-commit-id: bdf611db27
|
2013-11-13 13:45:44 -06:00 |
|
Steve Harris
|
758fbd3f55
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 4c49f74db0 [formerly 626b91c9c7] [formerly 2a8e926976] [formerly 2a8e926976 [formerly 108a4d908d]] [formerly 4c49f74db0 [formerly 626b91c9c7] [formerly 2a8e926976] [formerly 2a8e926976 [formerly 108a4d908d]] [formerly 1b3d4c8f67 [formerly 2a8e926976 [formerly 108a4d908d] [formerly 1b3d4c8f67 [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]]]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: 768b1b269d [formerly b3f0cc869f] [formerly a6ae5f9c2f] [formerly 70c6e248ee7294053655bec29cc70316e2b4f6a8 [formerly 8546b81d3f134c79637c6f5400cc76bdbfb21abe] [formerly a6ae5f9c2f [formerly 50d60d8101]]]
Former-commit-id: ea38fb10692ab4393604cb0fa5ccdd876a348b0a [formerly d0d675db0d0de1c4bbc79b22fb517649fb9235ae] [formerly eec64a2dbc [formerly 930b6ddb77]]
Former-commit-id: eec64a2dbc
Former-commit-id: b05c9a6aa2
|
2013-11-06 18:31:05 -06:00 |
|
Ben Steffensmeier
|
a89aeaa7a4
|
Issue #2493 remove mesowest.
Former-commit-id: aa0d33679e [formerly c40ec16df3] [formerly f761c701cf] [formerly f761c701cf [formerly d0b7966458]] [formerly aa0d33679e [formerly c40ec16df3] [formerly f761c701cf] [formerly f761c701cf [formerly d0b7966458]] [formerly 36916fedcd [formerly f761c701cf [formerly d0b7966458] [formerly 36916fedcd [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]]]
Former-commit-id: 36916fedcd
Former-commit-id: 289d95f83f [formerly 726d1728fd] [formerly 5d31aad5c2] [formerly 6676e0023b74fa5b284e1d321b15f6c18ef04c40 [formerly 80b4ead107b43174bee5092e0af3bc24e421205f] [formerly 5d31aad5c2 [formerly baebe37ba6]]]
Former-commit-id: 5cfcbc5e6bb5cf46834f6e4b975480d62380a3fe [formerly 855d5e9d4e64a0a70aaec8f5743dc44310b552bb] [formerly 925d8bca38 [formerly afe014af99]]
Former-commit-id: 925d8bca38
Former-commit-id: 235cea183a
|
2013-11-06 13:42:38 -06:00 |
|
Bryan Kowal
|
8169d12267
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh
rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh
rpms/awips2.core/Installer.tools/component.spec
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh
rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh
Former-commit-id: 526e590edc [formerly 7f9f20c8a8] [formerly d73aaf9753] [formerly d73aaf9753 [formerly 4bad21e6cd]] [formerly 526e590edc [formerly 7f9f20c8a8] [formerly d73aaf9753] [formerly d73aaf9753 [formerly 4bad21e6cd]] [formerly 3255bf3861 [formerly d73aaf9753 [formerly 4bad21e6cd] [formerly 3255bf3861 [formerly 4ad10d4cc3b189c65352f0c205fe8664a52bf407]]]]]
Former-commit-id: 3255bf3861
Former-commit-id: f8ce1f098b [formerly b85c53c8b0] [formerly 400b4a1328] [formerly 9852ff0e8bd023d165715e83cb9ebe36e0168d69 [formerly fda65eb7f8713472578cb95e718895ab10e4b197] [formerly 400b4a1328 [formerly 76726372e5]]]
Former-commit-id: 1d5b49211c039f830d583466bdc693282b016715 [formerly 5afe499eab30a20cc0a548514e8ce73b292bc5ca] [formerly 2c31c6f4ab [formerly 748ab480fb]]
Former-commit-id: 2c31c6f4ab
Former-commit-id: 19a648092a
|
2013-11-05 19:03:22 -06:00 |
|
Ben Steffensmeier
|
007721a9c6
|
Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64
Former-commit-id: 3a936fa6c4 [formerly 3273b6fc5f] [formerly 4639cd69f4] [formerly 4639cd69f4 [formerly 5b53cb4c98]] [formerly 3a936fa6c4 [formerly 3273b6fc5f] [formerly 4639cd69f4] [formerly 4639cd69f4 [formerly 5b53cb4c98]] [formerly 1d35086e8d [formerly 4639cd69f4 [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]]]
Former-commit-id: 1d35086e8d
Former-commit-id: cfad9eed2d [formerly 41a54ad666] [formerly b64221f27b] [formerly fb6513e3cb326072d3374f83c7247b4969a3a02d [formerly 5548cad8f6d7873bdd2beafefec42e2d00821e99] [formerly b64221f27b [formerly 8aefe5ff02]]]
Former-commit-id: ea5fb85bd6b5f7d8a08c6cdddf919e6f9c12aaba [formerly ba475ead914b07016d89a22aaa936b7307336535] [formerly 5cf9a6ed01 [formerly a97ec9b8e5]]
Former-commit-id: 5cf9a6ed01
Former-commit-id: 74a25404a0
|
2013-11-05 17:33:41 -06:00 |
|
Bryan Kowal
|
a7c2090e38
|
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: e1fcf67a5d [formerly 5164a7c0b1] [formerly 38464427d3] [formerly 38464427d3 [formerly feaacd9356]] [formerly e1fcf67a5d [formerly 5164a7c0b1] [formerly 38464427d3] [formerly 38464427d3 [formerly feaacd9356]] [formerly c8d7a32e2e [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: dcc3e85e23 [formerly d3062ea58f] [formerly f02d4b7a0b] [formerly 277c1bc520156ebcec2d5d08f4dd4bd272688ae2 [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f] [formerly f02d4b7a0b [formerly d366e70934]]]
Former-commit-id: 2e7c504a2a9e9829e8a0d93acae2c2159e685c7a [formerly a385091a8de68d44ac589d69363d2af9bd0275a7] [formerly f5bb76a01e [formerly eaaa3d022c]]
Former-commit-id: f5bb76a01e
Former-commit-id: 6a0ddf11e4
|
2013-10-31 15:34:46 -05:00 |
|
Steve Harris
|
780ebc3871
|
14.1.1-4 baseline
Former-commit-id: c3693c792e [formerly cb3b53f205] [formerly 82dec19b6a] [formerly 82dec19b6a [formerly bd95bb6a4e]] [formerly c3693c792e [formerly cb3b53f205] [formerly 82dec19b6a] [formerly 82dec19b6a [formerly bd95bb6a4e]] [formerly 99e3707c5b [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 530f8f1198 [formerly 2039d101ef] [formerly b60635cd70] [formerly e8f742116ac7b5dcef62ae15a6ae48ef875ab994 [formerly 2d757fef6618aded3efb26a4e6771f03101fe824] [formerly b60635cd70 [formerly 7590a56e0e]]]
Former-commit-id: ebd3e0601d59cc8c94018247b3c6a228c41cc169 [formerly 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa] [formerly da4589ec2b [formerly 98ae84da42]]
Former-commit-id: da4589ec2b
Former-commit-id: cbf859daf6
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
2ca9559de2
|
14.1.1-3 baseline
Former-commit-id: 0cc505a64a [formerly a0ba2e1252] [formerly 851f9df229] [formerly 851f9df229 [formerly 94f24e0d8a]] [formerly 0cc505a64a [formerly a0ba2e1252] [formerly 851f9df229] [formerly 851f9df229 [formerly 94f24e0d8a]] [formerly 5739b4f832 [formerly 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 6e4187af3c [formerly 2d30611c6d] [formerly aa59400b67] [formerly e5bec8304375023d2850a2bca444926f4925c949 [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19] [formerly aa59400b67 [formerly 4a6a209aea]]]
Former-commit-id: 04d097d14d16b1e927137c3ca7c25238be8c309d [formerly 9a1c18417dfee86a141522f27e066ec83d4258d5] [formerly 472c0a1a5e [formerly 8d67ffede4]]
Former-commit-id: 472c0a1a5e
Former-commit-id: c784003711
|
2013-10-28 10:46:02 -04:00 |
|
Benjamin Phillippe
|
c38d324123
|
Issue #1682 Delta script for ebxml registry query changes
Change-Id: I84a3007a3c23697c333e5862d8fd4a4aba9f23a2
Former-commit-id: b07719acb2 [formerly 9617e2ee10] [formerly d0c3d9575a] [formerly d0c3d9575a [formerly 0c56d5e859]] [formerly b07719acb2 [formerly 9617e2ee10] [formerly d0c3d9575a] [formerly d0c3d9575a [formerly 0c56d5e859]] [formerly 02dc390b98 [formerly d0c3d9575a [formerly 0c56d5e859] [formerly 02dc390b98 [formerly 9b6a0ce7404017dcd29cd0a14f0dba5d30e480b1]]]]]
Former-commit-id: 02dc390b98
Former-commit-id: 3cbb60867f [formerly ae638e7432] [formerly 15a92382c2] [formerly 63aa27c1c825a9ae4827c42f678c145c27ec08b8 [formerly 35a6370f7a88bbd036f10309fc2533697ca6cf75] [formerly 15a92382c2 [formerly 99b1cee644]]]
Former-commit-id: 8520079f2a267fbf62ae2f7b4bfa9f9133d91a70 [formerly 7f2f4bfe1b22741cce371eb2e960f3d98e6ff5a2] [formerly 32113dbdbc [formerly 3eec43afdb]]
Former-commit-id: 32113dbdbc
Former-commit-id: f7b697f12a
|
2013-10-23 10:01:34 -05:00 |
|
Ben Steffensmeier
|
7395a06292
|
Issue #2473 Remove unneeded ncgrib functionality.
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38
Former-commit-id: aa297372d5 [formerly 0c0e339894] [formerly 10f74a1812] [formerly 10f74a1812 [formerly d25df40634]] [formerly aa297372d5 [formerly 0c0e339894] [formerly 10f74a1812] [formerly 10f74a1812 [formerly d25df40634]] [formerly 51cd71c373 [formerly 10f74a1812 [formerly d25df40634] [formerly 51cd71c373 [formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]]]]
Former-commit-id: 51cd71c373
Former-commit-id: 62ff6dc7be [formerly 50f81cf656] [formerly dcae8c6aa2] [formerly 4d02fe9c5f7ebdbd448a1ecaf40b5787c19c3ced [formerly 91c71836947d0b2aea377fc28fa97fda33b6fd59] [formerly dcae8c6aa2 [formerly 24a6795677]]]
Former-commit-id: d7c513e06062c82369f7c676cb7789cb47e58736 [formerly ec49165c9e367122a2e3115a12c8a3e00aa1dbca] [formerly 9ed413f0c2 [formerly 92828fbaa0]]
Former-commit-id: 9ed413f0c2
Former-commit-id: 3af445a37a
|
2013-10-15 16:30:38 -05:00 |
|
Ben Steffensmeier
|
dc0b63b3ba
|
Issue #2473 Remove deprecated grib functionality
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23
Former-commit-id: 4b8d8a67e7 [formerly d5eaefeeed] [formerly c22ccb6c4c] [formerly c22ccb6c4c [formerly cfc8bb859f]] [formerly 4b8d8a67e7 [formerly d5eaefeeed] [formerly c22ccb6c4c] [formerly c22ccb6c4c [formerly cfc8bb859f]] [formerly 94560e37c8 [formerly c22ccb6c4c [formerly cfc8bb859f] [formerly 94560e37c8 [formerly 9d903e94114cacee2a6abec6f83880fa8b978180]]]]]
Former-commit-id: 94560e37c8
Former-commit-id: a874b82b8e [formerly 253ada50d5] [formerly c960405800] [formerly 985382630ede24a7ace7aef0ff7e44ba78180b77 [formerly f70cf023d739b92df09c9ab8e0c52a3bc0acf093] [formerly c960405800 [formerly 2e0698aa06]]]
Former-commit-id: 6eb4d88276c34da491eb10c48024a7e40a95e8ab [formerly d5e54c8a6cadae9ca6e0e739c958b4f515534447] [formerly 2f9bc8f6de [formerly 2b831863c5]]
Former-commit-id: 2f9bc8f6de
Former-commit-id: 7a2089f2dc
|
2013-10-15 10:48:29 -05:00 |
|
Max Schenkelberg
|
d06d2bf8db
|
Issue #2333 Removed more unused fields from satellite record
Change-Id: I02ec3ff328606673d717c31e583c2679389e87ec
Former-commit-id: 16a53bf134 [formerly f34750cb5f] [formerly 3c2492cdbe] [formerly 3c2492cdbe [formerly b68b8de21b]] [formerly 16a53bf134 [formerly f34750cb5f] [formerly 3c2492cdbe] [formerly 3c2492cdbe [formerly b68b8de21b]] [formerly 8fddd5a57b [formerly 3c2492cdbe [formerly b68b8de21b] [formerly 8fddd5a57b [formerly 91c5da670e6b23814532b473c93237744398369d]]]]]
Former-commit-id: 8fddd5a57b
Former-commit-id: 0b5e15d783 [formerly f28272fa6e] [formerly 9bd27e3c43] [formerly 8027e3861477d9ebd6edccd8e0061124ff8bdd05 [formerly f41b2ac789434c1654f92e97b783cd78ec044300] [formerly 9bd27e3c43 [formerly 3b53d18be4]]]
Former-commit-id: 522806578aba8fe7b3145ce5ed716a71480ead3b [formerly dd7ba2c0ac1354ae9cfc967b5ccd480daaad4e5f] [formerly 2bc44908ff [formerly 67491d2af0]]
Former-commit-id: f3a4ab11561790e4cabc5c23632e54466d5a6452 [formerly 2bc44908ff]
Former-commit-id: 2e77b6bdb9
|
2013-10-11 16:17:52 -05:00 |
|
Richard Peter
|
dd84a60a80
|
Merge "Issue #2402 Make grib large grid handling more dynamic. Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d" into development
Former-commit-id: 39182bdfc5 [formerly 0a802a9218] [formerly ea74adff8f] [formerly ea74adff8f [formerly a99e286c0f]] [formerly 39182bdfc5 [formerly 0a802a9218] [formerly ea74adff8f] [formerly ea74adff8f [formerly a99e286c0f]] [formerly dba525c5e6 [formerly ea74adff8f [formerly a99e286c0f] [formerly dba525c5e6 [formerly f0ab566352660170b71b46f6517e371d42f973df]]]]]
Former-commit-id: dba525c5e6
Former-commit-id: 3164baff7d [formerly d3598aaffb] [formerly 6dbdecfb9a] [formerly a0f136d26df07ce6011c89f767bf08b8de113fa5 [formerly eba7342fd247b0069dd81a78c0141f3af11af599] [formerly 6dbdecfb9a [formerly 2d1963c665]]]
Former-commit-id: bc33322409a8f1dc5c8d026c95127a3a41660bf5 [formerly fed529049b0cde68d4db324452ff2a38969a6783] [formerly bdc7d9e7d8 [formerly 14df7cc0c1]]
Former-commit-id: bdc7d9e7d8
Former-commit-id: cfc194f270
|
2013-10-11 15:34:31 -05:00 |
|
Ben Steffensmeier
|
df2aef5e16
|
Issue #2402 Make grib large grid handling more dynamic.
Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d
Former-commit-id: 2cd59abde5 [formerly 38ac706b80] [formerly 2de4562585] [formerly 2de4562585 [formerly 3fd473e25d]] [formerly 2cd59abde5 [formerly 38ac706b80] [formerly 2de4562585] [formerly 2de4562585 [formerly 3fd473e25d]] [formerly 0ecab8d44e [formerly 2de4562585 [formerly 3fd473e25d] [formerly 0ecab8d44e [formerly bec1391240d3bf2ac0da4e8b29ae6ce3985e3d32]]]]]
Former-commit-id: 0ecab8d44e
Former-commit-id: 99b355f14b [formerly 46e676c816] [formerly 0a125ce17b] [formerly 7794f498f2c26d425847dc679d819248fd7b5b4c [formerly bd8e77a0c857b6855c5e1bd662bfd797af1e0932] [formerly 0a125ce17b [formerly 78b278e4ef]]]
Former-commit-id: 9a1cf0bdb480be110d70a6430b3e1d1626c1131c [formerly 42f20bfbf1bf91b7d11aa8c27b6275d438752828] [formerly fb0f53feb8 [formerly 3f554d680f]]
Former-commit-id: fb0f53feb8
Former-commit-id: a5b8118b3c
|
2013-10-11 15:22:32 -05:00 |
|