Steve Harris
373c816e6a
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 647cd97e29
[formerly 7fec0d039c
] [formerly 455eb8b39d
[formerly 45250149681f057cf168f4d3cb27276279f62c05]]
Former-commit-id: 455eb8b39d
Former-commit-id: ec743199f1
2014-06-02 11:21:46 -05:00
Brian.Dyke
3961c75ecd
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: a0a879be7d
[formerly a8737e18f0
] [formerly 3f1e12effc
[formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]
Former-commit-id: 3f1e12effc
Former-commit-id: 66aacd6578
2014-05-30 10:46:25 -04:00
Richard Peter
121f0e00a4
Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
...
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289
Former-commit-id: 3beef299b1
[formerly 558699a370
] [formerly e2288769d3
[formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]
Former-commit-id: e2288769d3
Former-commit-id: 220f7aa97a
2014-05-29 15:50:59 -05:00
Roger Ferrel
dae52ad3a0
Issue #2838 Archive binary feeder creation.
...
Change-Id: I4e431d62e3d27565af75d52012fe042a18fd1f9c
Former-commit-id: ac03675880
[formerly 9b7715e5e0
] [formerly 995d962a66
[formerly 16c38960863df2f993c6ee7e18de31824cbdbb08]]
Former-commit-id: 995d962a66
Former-commit-id: 03843090fa
2014-02-27 07:45:40 -06:00
Richard Peter
c97efbf656
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
...
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 25df870b67
[formerly fa7d77ae97
] [formerly 93c776022a
[formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]
Former-commit-id: 93c776022a
Former-commit-id: 520dd57f02
2013-11-07 14:25:45 -06:00
Richard Peter
1b65a09a52
Issue #2499 : Fix build
...
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c
Former-commit-id: 15fd2f7a55
[formerly f3d8768b94
] [formerly c09f68615c
[formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]
Former-commit-id: c09f68615c
Former-commit-id: a653f9625a
2013-11-06 13:09:32 -06:00
Greg Armendariz
93b71934c0
13.5.1-6 baseline
...
Former-commit-id: 5894853996
[formerly 7e09fa5a0b
] [formerly b9044b1195
[formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]
Former-commit-id: b9044b1195
Former-commit-id: 12a09f9aa7
2013-07-10 10:04:22 -04:00
Richard Peter
f8213c16bd
Merge branch 'omaha_13.5.1' (13.5.1-4) into development
...
Conflicts:
edexOsgi/build.edex/build.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
Former-commit-id: edeb3e255b
[formerly 162261c395
] [formerly 76bc31aa77
[formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]
Former-commit-id: 76bc31aa77
Former-commit-id: d3017ca60f
2013-07-01 00:04:43 -05:00
Brad Gonzales
d6fb315096
Issue #1965 added File filtering by file date extension in archive purge.
...
Amend: updated purge cron time to once every hour.
moved archive.purge.cron to cron.properties.
removed purge code from DataArchiver.
added back isHoursToKeep in DataArchiver.
updated CategoryFileDateHelper for CategoryConfig dirPattern lists.
updates from peer review.
updated test cases to work with Roger's refactoring.
fixes for ArchiveConfigManager createArchive.
clean up of ArchiveConfigManager purgeFile.
Change-Id: I096c2a103211caab7b7ec00f18111077cfe3e519
Former-commit-id: 67b4a2e202
[formerly 137c66539e
] [formerly 276f05233f
[formerly 2094b7f9fde97873c759da217498bcf62254a287]]
Former-commit-id: 276f05233f
Former-commit-id: 4f54596904
2013-06-27 11:46:44 -05:00
Dustin Johnson
e617f569ff
Issue #2090 Create Data Provider Agent feature
...
Amend: Remove dataplugins feature from dataprovideragent
Change-Id: I7ff421d478ad060c67eaffd4a1b2b40209ed2901
Former-commit-id: fd61a1e056
[formerly e33cd9d00d
] [formerly 45600f3d55
[formerly 2147018ade8a96b4a89c6117e345d569b4d1af76]]
Former-commit-id: 45600f3d55
Former-commit-id: dfdfbe642b
2013-06-12 15:41:32 -05:00
Steve Harris
0aab285b8a
13.5.1-1 baseline
...
Former-commit-id: 6384018950
[formerly 998961612c
] [formerly fe872355a7
[formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
2013-06-10 15:17:17 -04:00
Steve Harris
ef413da5f7
13.3.1-17 baseline
...
Former-commit-id: f28b85d42f
[formerly 7bf9966dcb
] [formerly a3fe998f8f
[formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
2013-04-01 12:04:56 -05:00
Steve Harris
6e48567370
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 069ee8a748
[formerly 9a321b6ac8
] [formerly 3073951b3d
[formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]
Former-commit-id: 3073951b3d
Former-commit-id: a4bf236cc7
2013-03-27 22:16:15 -05:00
Dustin Johnson
2591041c9d
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: fbcfdd0ca1
[formerly 52c27ec57f
] [formerly 1684507bdb
[formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]
Former-commit-id: 1684507bdb
Former-commit-id: f27ebfbc1b
2013-03-27 15:38:36 -05:00
Max Schenkelberg
fc58e7431a
Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
...
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62
Former-commit-id: 1769edc026
[formerly ec40d261e5
] [formerly 547c593dec
[formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]
Former-commit-id: 547c593dec
Former-commit-id: 13a4056335
2013-02-27 16:19:58 -06:00
Steve Harris
d9be4dce21
13.2.1-2 baseline
...
Former-commit-id: 33bc5fd816
[formerly 83e9157df7
] [formerly 328c6dccad
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
2013-01-23 11:18:44 -05:00
Steve Harris
cd4185ef5c
13.1.2-2 baseline
...
Former-commit-id: 51208e5515
[formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Steve Harris
2c82d9cb07
12.11.1-4 baseline
...
Former-commit-id: 98171b5de9
[formerly d3497e47eb
] [formerly 6958b861f0
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
2012-10-16 13:27:07 -05:00
Steve Harris
7fb0b17bd5
12.9.1-5 baseline
...
Former-commit-id: a1d931fd44
[formerly 61f269f54c
] [formerly f2fac39428
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00
Steve Harris
f2102bfb24
12.7.1-8 baseline
...
Former-commit-id: 11f96dbedd
[formerly 16bf591a33
] [formerly c42ae0fa39
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
2012-07-19 16:20:40 -05:00
Steve Harris
dc50bc8443
12.6.1-9 baseline
...
Former-commit-id: 7c064b6868
[formerly 2c0ff851ca
] [formerly 27afa60345
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
2012-07-10 07:53:49 -05:00
Steve Harris
97c4db937e
12.5.1-15 baseline
...
Former-commit-id: 8552902906
[formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Steve Harris
a2a6a18fae
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Nate Jensen
802607c79f
Issue #181 fixing edex feature and component deploys
...
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d
Former-commit-id: fae8fd5a6d
[formerly 8e3730adbf
] [formerly 1dabb12dce
[formerly 0c82def5c753aab240848aac8dc906a161461ac3]]
Former-commit-id: 1dabb12dce
Former-commit-id: 9c4ad58867
2012-01-24 12:15:01 -06:00
root
8e80217e59
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c
[formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00