Greg Armendariz
|
261677faf9
|
Omaha #3299 - Fix qpid dependency
Former-commit-id: 9d1630a617 [formerly 9d9ba5a78f [formerly d292734da643f003d9d04e03b32727bf9c007443]]
Former-commit-id: 9d9ba5a78f
Former-commit-id: 74500b05fc
|
2014-06-19 09:56:10 -05:00 |
|
Greg Armendariz
|
670fb899a5
|
Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1
Former-commit-id: 8c568a223e [formerly faebbc13f7 [formerly 2484a3407392f64b51b93bd3a4dab04194debea5]]
Former-commit-id: faebbc13f7
Former-commit-id: e73a0de182
|
2014-06-16 08:57:12 -05:00 |
|
Steve Harris
|
4d724b6474
|
Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Former-commit-id: e1c8ad2611 [formerly 9213369739 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]
Former-commit-id: 9213369739
Former-commit-id: 97843cf58e
|
2014-06-16 08:19:12 -05:00 |
|
Greg Armendariz
|
65ced96c6b
|
Omaha #3247 - Update qpid dependency
Former-commit-id: 70104bc9aa [formerly db4e94b713 [formerly 9a6a0c9941aaa9b49da7329cccb7e05456ad514c]]
Former-commit-id: db4e94b713
Former-commit-id: c14107d4cf
|
2014-06-14 08:13:14 -05:00 |
|
Brian.Dyke
|
c4ecd90117
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 6fcc2604e0 [formerly a011c0b6bb [formerly 0d441b5eebad07acf51d6d5c28ee5ac7770d9733]]
Former-commit-id: a011c0b6bb
Former-commit-id: e802508e98
|
2014-06-12 07:07:17 -04:00 |
|
Ana Rivera
|
c1e504cdfa
|
VLab Issue #3943, #3648 - fixes SwIT DR_17413 (ref: DCS_266), and fixes DR_16999
Change-Id: I51c576c4ea40367d21e0d395d1e1a5ad1437969e
Former-commit-id: 9da58db461 [formerly 65e90953c2 [formerly 83640ccce75b600d53a0d44ae1528c312b7947b5]]
Former-commit-id: 65e90953c2
Former-commit-id: 4b515bfd0a
|
2014-06-11 17:35:55 +00:00 |
|
Brian.Dyke
|
67cef121bf
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements...modified spec file
Former-commit-id: 7db87d6ccb [formerly d708eeb7d8 [formerly f671db68bfab4b9c17eb25050468e5b6306e6359]]
Former-commit-id: d708eeb7d8
Former-commit-id: de6a06bc8c
|
2014-06-04 11:52:00 -04:00 |
|
Brian.Dyke
|
a91c426ee7
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: 3919c9ec2f [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]
Former-commit-id: 61b206be0b
Former-commit-id: feb26ee9b7
|
2014-06-04 07:46:16 -04:00 |
|
Kenneth Sperow
|
764ffeb440
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8
Former-commit-id: f2a738cc25 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]
Former-commit-id: c302ef8967
Former-commit-id: a59743ebe0
|
2014-06-03 20:55:29 -07:00 |
|
Sean.Webb
|
7b1183d283
|
Merge "ASM #557 - Removed rh6 dependency from wxgtk rpm requirements" into asm_14.3.1
Former-commit-id: 94f2a4ab2a [formerly e46c62660b [formerly ca4cde97f7304f94bb990dcd53ac39e06c09c7de]]
Former-commit-id: e46c62660b
Former-commit-id: 411b64da45
|
2014-05-30 14:42:34 -05:00 |
|
Sean.Webb
|
0f181e50c0
|
ASM #557 - Removed rh6 dependency from wxgtk rpm requirements
Change-Id: I5a59edfb974c945a4d382fad109e513e3a51eeee
Former-commit-id: 73c2add28e [formerly af990fb412 [formerly bba964bd6af7d307a27ee85b11bce03d79f52e97]]
Former-commit-id: af990fb412
Former-commit-id: ba4f3b92ce
|
2014-05-30 14:40:44 -04:00 |
|
Sean.Webb
|
8241b1904d
|
ASM #552 - Increased postgres max_connections to 400
Change-Id: I6e4a3c02ff2645480ca20274f1fa445e25196a03
Former-commit-id: 75f8e82eeb [formerly c05e8e319e [formerly 88147ed5e5cd84e40acf61ad46d1baa554fd4e28]]
Former-commit-id: c05e8e319e
Former-commit-id: d899f42637
|
2014-05-30 14:27:59 -04:00 |
|
Nate Jensen
|
9fa1b78e76
|
Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
Former-commit-id: c43a2bf217 [formerly 5cfbcb7e98 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]
Former-commit-id: 5cfbcb7e98
Former-commit-id: a709601e2f
|
2014-05-29 13:51:09 -05:00 |
|
Brian Clements
|
de85e00fde
|
Omaha #2536 merge autobldsrv into text plugins
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52
Former-commit-id: 542d36f107 [formerly 5d0eaf02ab [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]
Former-commit-id: 5d0eaf02ab
Former-commit-id: 4aade4bf2e
|
2014-05-29 08:19:47 -05:00 |
|
Steve Harris
|
4469d87a8f
|
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: dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]
Former-commit-id: be80bd01f3
Former-commit-id: 718c78d984
|
2014-05-28 09:01:00 -05:00 |
|
Greg Armendariz
|
c7f349d5a5
|
Omaha #3215 - Correct script
Former-commit-id: 73765c31ca [formerly ac528037a1 [formerly 2565b4c918f9215fd65a5dc44778db3a200da8bf]]
Former-commit-id: ac528037a1
Former-commit-id: 9c26a31d27
|
2014-05-27 15:19:37 -05:00 |
|
Greg Armendariz
|
45856116c0
|
Omaha #3215 - Add option for RPM build,
Change-Id: Ic3a50f9a493c9cd7b92ac99aeb026d3d991f69a5
Former-commit-id: a2e157ed35 [formerly 265a455ca1 [formerly 615c83cb701e3c8ddf7cbcc1c1fb735711771d3b]]
Former-commit-id: 265a455ca1
Former-commit-id: 0806135d2e
|
2014-05-27 14:56:33 -05:00 |
|
Steve Harris
|
08308cd279
|
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: 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 99bc6f990c
Former-commit-id: 3de24b7b07
|
2014-05-27 14:48:24 -04:00 |
|
Kenneth Sperow
|
5e3a370777
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to 30173aa114 [formerly 476c78a2d7] [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly 189e3cc1f2 [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: 9fa9425aea [formerly 8490f7ea33 [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]
Former-commit-id: 8490f7ea33
Former-commit-id: 6f8b069dbe
|
2014-05-22 14:16:49 -07:00 |
|
Brad Gonzales
|
b0e8fea5d2
|
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: 1dd2a8bf65 [formerly 165f9a6e45 [formerly 71e43fad4acee381d7ffb7ca8ba0438283cd99f6]]
Former-commit-id: 165f9a6e45
Former-commit-id: 7d84f97bf8
|
2014-05-21 15:22:58 -05:00 |
|
Brian.Dyke
|
5afaee3d33
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]
Former-commit-id: 2fd18d14d6
Former-commit-id: 822ad181bf
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
8c0709798d
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]
Former-commit-id: 627541512d
Former-commit-id: f38d0138e6
|
2014-05-14 16:08:16 -04:00 |
|
Brian.Dyke
|
e705786d12
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: fb4c7e55b3 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]
Former-commit-id: e95bc87a19
Former-commit-id: 5a2e0c7e1b
|
2014-05-13 11:23:55 -04:00 |
|
Steve Harris
|
343444715e
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]
Former-commit-id: cf62cf4a6e
Former-commit-id: 848519177d
|
2014-05-12 16:13:19 -05:00 |
|
Ana Rivera
|
49512f29bf
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: 81a9d4fa44 [formerly 91715e7a3f [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]
Former-commit-id: 91715e7a3f
Former-commit-id: 7e74e047a0
|
2014-05-12 18:55:06 +00:00 |
|
Brian.Dyke
|
82ce970ad6
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]
Former-commit-id: 386ec058e1
Former-commit-id: 3aa2f7974b
|
2014-05-12 14:07:11 -04:00 |
|
Brad Gonzales
|
8e97465d95
|
Omaha #3013 added libgfortran and libf2c requires to the awips2-python-numpy rpm.
Change-Id: I3f232c800a7d2768b9b13b35703db97b83789a7b
Former-commit-id: abf6125958 [formerly 982503cb41 [formerly 632b2cad7a328dead678026c673b001be0657394]]
Former-commit-id: 982503cb41
Former-commit-id: c71a842639
|
2014-05-12 11:25:16 -05:00 |
|
Brian Clements
|
b6155d5482
|
Omaha #3147 removed spring from groovy RPM component spec
Former-commit-id: b334038a28 [formerly 3bb680802a [formerly 979ff20d55cc86319805f77ec53f32cb39555eb3]]
Former-commit-id: 3bb680802a
Former-commit-id: 9d67a6c30b
|
2014-05-09 10:31:28 -05:00 |
|
Brad Gonzales
|
286cecb8fb
|
Omaha #3032 updated jdk to java 1.7.0_55
Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8
Former-commit-id: 35f6a5ac25 [formerly 91f94499aa [formerly 49cc6d83ac5fffc3f737699ab605948fa38117db]]
Former-commit-id: 91f94499aa
Former-commit-id: ad464cc0da
|
2014-05-08 16:15:42 -05:00 |
|
Steve Harris
|
bffbcf61b8
|
Merge branch 'master_14.2.1' (14.2.1-23) into omaha_14.2.1
Former-commit-id: 0392577b6c [formerly c3509757f0 [formerly 575adeb94784b32ac0d89e3c4dd506c2fe500266]]
Former-commit-id: c3509757f0
Former-commit-id: a7211a72f0
|
2014-05-07 08:45:41 -05:00 |
|
Richard Peter
|
1a2d875bd0
|
Issue #3102: Fix edexBridge connection leak
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: b091a8827a [formerly 501980904d [formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]]
Former-commit-id: 501980904d
Former-commit-id: 2668f09447
|
2014-05-06 10:32:31 -05:00 |
|
Sathya.Sankarasubbu
|
faa48d1691
|
ASM #560 - LDM 6.11.5 GRIB library causing crash
Modified Release number in component.spce from 10 to 11
Change-Id: I2f011e472688fa63d605db5d715f1aef6589a966
Former-commit-id: 1246776d3e [formerly edd543c48d [formerly cdeb7f00af695c6d0a79958af23862bd6f3c7ee5]]
Former-commit-id: edd543c48d
Former-commit-id: 23102eaa8f
|
2014-05-05 14:33:20 -04:00 |
|
Steve Harris
|
010301045d
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
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_60.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_70.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_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
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/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]
Former-commit-id: 6ef3b9f1e5
Former-commit-id: 9e149df799
|
2014-05-05 08:21:02 -05:00 |
|
Greg Armendariz
|
fece69eb09
|
Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: 58eaf444bd [formerly 1e48076fb2 [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]
Former-commit-id: 1e48076fb2
Former-commit-id: 2994753636
|
2014-04-30 19:34:43 -05:00 |
|
Brian Clements
|
b3825b8032
|
Issue #3089 fixed init.d script for collaboration dataserver RPM
Former-commit-id: 1273846844 [formerly 57f5ac701c [formerly 9cdef44104a7453a4b968afd1f3845b1ba69ba06]]
Former-commit-id: 57f5ac701c
Former-commit-id: e49d150332
|
2014-04-30 16:41:14 -05:00 |
|
Greg Armendariz
|
239ce27244
|
Issue #2571 - Update maps.db snapshot and lake shapefile
Former-commit-id: 2d38c69ac1 [formerly 4981b6a438 [formerly c223bac540568492253cf70a7c7d7521eda3a62d]]
Former-commit-id: 4981b6a438
Former-commit-id: 4c245da2a2
|
2014-04-30 15:42:42 -05:00 |
|
Richard Peter
|
8b1a177110
|
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: 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 44b1782461
Former-commit-id: 67683dd891
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
362d882b40
|
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: 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: fb1f5aa593
Former-commit-id: f0b8ea5822
|
2014-04-25 11:06:11 -04:00 |
|
Richard Peter
|
b77f780b13
|
Merge "Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data." into development
Former-commit-id: a21a2bafe1 [formerly b53d914640 [formerly 45f01ee4e8bc0597c1fe55e1dbde7223f3dcc30d]]
Former-commit-id: b53d914640
Former-commit-id: c0656c811d
|
2014-04-24 15:43:15 -05:00 |
|
Brad Gonzales
|
6b41668093
|
Issue #3035 Increment java component.spec revision value.
Change-Id: I869e6f6adab74ef97d45a057fe42e48d1134dfbf
Former-commit-id: 7a0694adca [formerly 15985b9eac [formerly 245c5214910e1a69d1a6de4b46a36130dbd253b4]]
Former-commit-id: 15985b9eac
Former-commit-id: 86036c0afb
|
2014-04-24 12:48:40 -05:00 |
|
David Gillingham
|
0566286204
|
Issue #3068: Update pqact and bufrascat distribution patterns to support MetOp-B T winds data.
Change-Id: I750323b3330016a98eef9778e8491ac920ea77ec
Former-commit-id: 16adfb2573 [formerly eea20ba3ef [formerly 0b91ae192358aa162833fb332ba4e551878199f9]]
Former-commit-id: eea20ba3ef
Former-commit-id: 6186e67e5c
|
2014-04-24 11:11:06 -05:00 |
|
Brad Gonzales
|
9c6f68a56f
|
Issue #3024 Removed edex feature build.xml files. Removed bkowal from the buildEnvironment.sh script.
Change-Id: Ic1ee22e604a68c2c475cb002901413c55bda6bd1
Former-commit-id: 1fcffc5db8 [formerly fdfac581d6 [formerly fdf7e47c2ddcfe4154ee117a0b5a722cd420df20]]
Former-commit-id: fdfac581d6
Former-commit-id: 5957c45cea
|
2014-04-22 15:39:08 -05:00 |
|
Brad Gonzales
|
ed82a7f477
|
Issue #3035 Removed jrockit missioncontrol from awips2 java rpm build.
Change-Id: I558e0f080b46c76cbdfb759ef1c1a701925273ca
Former-commit-id: 4c21afaa1b [formerly 90c7e699fa [formerly 254c7e0298ba7fb3ad91af2d51a1bd41b0535631]]
Former-commit-id: 90c7e699fa
Former-commit-id: 3a3e0be7a4
|
2014-04-22 12:23:15 -05:00 |
|
Brian.Dyke
|
9075808d0a
|
Merged 13.5.5-1 into 1412
Former-commit-id: 35ad867281 [formerly 188d84cc87 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]
Former-commit-id: 188d84cc87
Former-commit-id: 65ad515a6e
|
2014-04-16 12:09:12 -04:00 |
|
Nate Jensen
|
8a1e3a9bef
|
Merge "Issue #2984 another attempt to fix build" into development
Former-commit-id: 26b20a770a [formerly 5424ffb850 [formerly 00ab3a620f85859976144f9cdddd52f4bc46c063]]
Former-commit-id: 5424ffb850
Former-commit-id: 7f56e20c03
|
2014-04-15 13:27:29 -05:00 |
|
Nate Jensen
|
fc8be532a1
|
Issue #2984 another attempt to fix build
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: 09305d263e [formerly a2354a1d2a [formerly 38195dc5de31cefd435f507a3aa9f7f60965c0ff]]
Former-commit-id: a2354a1d2a
Former-commit-id: cb406ef865
|
2014-04-15 13:16:17 -05:00 |
|
Richard Peter
|
bb04dd7885
|
Issue #2726: Fix context mappings for topics
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: 4ac996336e [formerly ecbd0d5720 [formerly b3d978d0e22b371eaa826d856156ba5360ee7be9]]
Former-commit-id: ecbd0d5720
Former-commit-id: f533275291
|
2014-04-15 12:49:15 -05:00 |
|
Richard Peter
|
63c484cf14
|
Issue #2726: Fix edex_camel to wait for process to finish on stop, add logging of service calls to log files.
Change-Id: Ie1e8fce80e7e06b294e01deaf9174a6fb7180d5d
Former-commit-id: fa25d55384 [formerly 4709e66b34 [formerly dc798a7ca6badfcd6d732b43bb3e0175770398be]]
Former-commit-id: 4709e66b34
Former-commit-id: 45e6301b91
|
2014-04-15 11:50:28 -05:00 |
|
Nate Jensen
|
f39f61518f
|
Issue #2984 attempt to fix build
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: 456359ab1a [formerly 4aaa7c7096 [formerly 60dc6b2552cc2108f9c5c0bc25eae4a1829b62f9]]
Former-commit-id: 4aaa7c7096
Former-commit-id: ce585ca9e4
|
2014-04-15 09:57:11 -05:00 |
|
Richard Peter
|
efd1003a50
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
|
2014-04-09 16:00:54 -05:00 |
|