Steve Harris
|
a0d17947a9
|
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: 97843cf58e [formerly 9213369739] [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]
Former-commit-id: e1c8ad2611
Former-commit-id: d7cd0ac02c [formerly 362988b9d7]
Former-commit-id: 8270fd8a9f
|
2014-06-16 08:19:12 -05:00 |
|
brian.dyke
|
45dd00f016
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2c2bb61e95 [formerly 95c5dc49c1] [formerly 2c2bb61e95 [formerly 95c5dc49c1] [formerly 03cc2fbbfb [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: b6623af1f7 [formerly e09bd1d283]
Former-commit-id: 3f9ac5ba24
|
2014-05-30 10:09:00 -04:00 |
|
Steve Harris
|
5fda99b1fe
|
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: 718c78d984 [formerly be80bd01f3] [formerly 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]
Former-commit-id: dc74953978
Former-commit-id: 0e9d0b2ef5 [formerly 713cfeffc7]
Former-commit-id: 6412cc1427
|
2014-05-28 09:01:00 -05:00 |
|
Daniel.Huffman
|
4fc007a417
|
ASM #512 - Need radar data watchdog functionality
Change-Id: I54bb10185d5940d27417d1d40e21310ed5aeb8e3
Former-commit-id: 343046c159 [formerly eab2733238] [formerly 343046c159 [formerly eab2733238] [formerly 8326f42ed8 [formerly b3f33a3c49607219a234bede34bd983178151f39]]]
Former-commit-id: 8326f42ed8
Former-commit-id: 1bd20432a3 [formerly b63c845a2b]
Former-commit-id: 0503a4f11d
|
2014-05-27 19:59:53 +00:00 |
|
Brian Clements
|
a7c2ce9095
|
Omaha #3152 switched radar server to use logback instead of log4j
removed unneeded custom rolling file appender
replaced log4j config with logback config
Former-commit-id: f84333e1ce [formerly f6e7dffe61] [formerly f84333e1ce [formerly f6e7dffe61] [formerly 132bd3948d [formerly ae91e2e2069f73bc661d0009a5d5c083a9d2a229]]]
Former-commit-id: 132bd3948d
Former-commit-id: e93c91abf6 [formerly b79a9a9e51]
Former-commit-id: 040284c727
|
2014-05-27 11:11:12 -05:00 |
|
David Friedman
|
f999df6859
|
Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: a920c5a5e4 [formerly c909746e0e] [formerly a920c5a5e4 [formerly c909746e0e] [formerly a55e851780 [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]]
Former-commit-id: a55e851780
Former-commit-id: f8c9026f79 [formerly 101f43d875]
Former-commit-id: 421d4a56c8
|
2014-05-16 16:40:38 -05:00 |
|
David Friedman
|
fa63aea622
|
ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb
Former-commit-id: b462660d75 [formerly caa38ec709] [formerly b462660d75 [formerly caa38ec709] [formerly eab9a6b6d7 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]]
Former-commit-id: eab9a6b6d7
Former-commit-id: 81abf8e7d9 [formerly 4efaa47d2d]
Former-commit-id: e576ddde57
|
2014-05-16 21:38:34 +00:00 |
|
David Friedman
|
32524f8d3c
|
ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5
Former-commit-id: 404f3af49e [formerly 1503bc4162] [formerly 404f3af49e [formerly 1503bc4162] [formerly 3b69a240c8 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]]
Former-commit-id: 3b69a240c8
Former-commit-id: ff0f8e731f [formerly b62ac936ba]
Former-commit-id: f8e5e96774
|
2014-05-16 21:34:59 +00:00 |
|
David Friedman
|
84b45a2ee0
|
ASM #240
Change-Id: Ie1e0b115e991c0bdc01e929a21d36a9f1413d940
Former-commit-id: 24ebf8854c [formerly 611503cd96] [formerly 24ebf8854c [formerly 611503cd96] [formerly 969c50b80f [formerly e34ceb8c86f0814c1be7af3bbd2eadec8daf48aa]]]
Former-commit-id: 969c50b80f
Former-commit-id: ecae4f3099 [formerly 8591015dfb]
Former-commit-id: d63a17f725
|
2014-02-03 19:03:50 +00:00 |
|
Steve Harris
|
2d928d328e
|
12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
7e1d1f6e08
|
12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
37f2b6e138
|
12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
0c25458510
|
12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82 [formerly a28d70b5c5]
Former-commit-id: e5543a0e86
|
2012-05-01 18:06:13 -05:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|