Commit graph

38 commits

Author SHA1 Message Date
Greg Armendariz
91e1bcf9b2 Omaha #3309 - Remove reference to slf4j-log4j library
Change-Id: Ib68dfa51f5240e52325f43865aa885cb3dff04e2

Former-commit-id: f391c4c4a9 [formerly 58f93a0ecf] [formerly 7764f65707] [formerly f391c4c4a9 [formerly 58f93a0ecf] [formerly 7764f65707] [formerly 58158a9e73 [formerly 7764f65707 [formerly 2b2133b9d38453848c6f014704b7625668bcd980]]]]
Former-commit-id: 58158a9e73
Former-commit-id: 7b3b30fd88 [formerly 91357204db] [formerly 4da0ef882938a79525fd990f4df125fa4cf0480a [formerly 0fa9ec49a0]]
Former-commit-id: 28da2fa135a4d51e0cf2db6822db78163cfae090 [formerly 8389d99db2]
Former-commit-id: bff7c674d0
2014-06-26 11:34:47 -05:00
Steve Harris
563cf7b455 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: 4d724b6474 [formerly 97843cf58e] [formerly 9213369739] [formerly 4d724b6474 [formerly 97843cf58e] [formerly 9213369739] [formerly e1c8ad2611 [formerly 9213369739 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]]
Former-commit-id: e1c8ad2611
Former-commit-id: 6cc0c35e76 [formerly d7cd0ac02c] [formerly 9dc77519d1d40439f9609aa1b8bb1f64c8a1ab8a [formerly 362988b9d7]]
Former-commit-id: 54590884305d436b0bff6e041169417a3fab2fbb [formerly 8270fd8a9f]
Former-commit-id: a0d17947a9
2014-06-16 08:19:12 -05:00
brian.dyke
0511ff697f Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: f9cf99e369 [formerly 2c2bb61e95] [formerly 95c5dc49c1] [formerly f9cf99e369 [formerly 2c2bb61e95] [formerly 95c5dc49c1] [formerly 03cc2fbbfb [formerly 95c5dc49c1 [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: 0cbd37db4f [formerly b6623af1f7] [formerly 3bc9505e32a1d8fc6fd49b2e6e13c333e4573bb6 [formerly e09bd1d283]]
Former-commit-id: 2f8e75b3b74d8ab1aa705815c003473f38cbc788 [formerly 3f9ac5ba24]
Former-commit-id: 45dd00f016
2014-05-30 10:09:00 -04:00
Brian Clements
39fb9517c3 Omaha #3152 modified rcm build to deploy logback instead of log4j
Change-Id: I829bea003053d5f2b0cf17234fc26a8ff35334ac

Former-commit-id: edb365530e [formerly 3b2acfc091] [formerly c227a54da0] [formerly edb365530e [formerly 3b2acfc091] [formerly c227a54da0] [formerly 190e877633 [formerly c227a54da0 [formerly d9c3f3845e51f5892c80ec6e4b8ed6efc2769d0e]]]]
Former-commit-id: 190e877633
Former-commit-id: a67277b954 [formerly eb101fbafd] [formerly 20c6492e20b9015c6149c8d09099773ee7d7607a [formerly 16e80de9b4]]
Former-commit-id: 8c3bc5ef6857e0c2bd83ee89217be08147a7e016 [formerly 0dcd0ebd4e]
Former-commit-id: 927857cbd7
2014-05-28 12:17:39 -05:00
Steve Harris
86d6a0cd4d 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: 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]
Former-commit-id: dc74953978
Former-commit-id: aa133cc8a3 [formerly 0e9d0b2ef5] [formerly b7d992179f759d29da9804b9ffcafec8048bcefa [formerly 713cfeffc7]]
Former-commit-id: 4b80090552f8712feaf5137c27c2f010cda148e2 [formerly 6412cc1427]
Former-commit-id: 5fda99b1fe
2014-05-28 09:01:00 -05:00
Daniel.Huffman
9f807e53d4 ASM #512 - Need radar data watchdog functionality
Change-Id: I54bb10185d5940d27417d1d40e21310ed5aeb8e3

Former-commit-id: 5019e2d171 [formerly 343046c159] [formerly eab2733238] [formerly 5019e2d171 [formerly 343046c159] [formerly eab2733238] [formerly 8326f42ed8 [formerly eab2733238 [formerly b3f33a3c49607219a234bede34bd983178151f39]]]]
Former-commit-id: 8326f42ed8
Former-commit-id: f1d7154915 [formerly 1bd20432a3] [formerly 4cfe1fd8c4dca6cc4a10913b48925c9c91e851e2 [formerly b63c845a2b]]
Former-commit-id: 1fbadfd2f874be9a3dab9e49e668e0d863835bb6 [formerly 0503a4f11d]
Former-commit-id: 4fc007a417
2014-05-27 19:59:53 +00:00
Steve Harris
cf2950abdb 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: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
2014-05-27 14:48:24 -04:00
Brian Clements
7e0f7477b9 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: 00d3fbad8f [formerly f84333e1ce] [formerly f6e7dffe61] [formerly 00d3fbad8f [formerly f84333e1ce] [formerly f6e7dffe61] [formerly 132bd3948d [formerly f6e7dffe61 [formerly ae91e2e2069f73bc661d0009a5d5c083a9d2a229]]]]
Former-commit-id: 132bd3948d
Former-commit-id: a33678e3d6 [formerly e93c91abf6] [formerly 2703a85ab37736c687ec4b4a99e58c9b68e47e13 [formerly b79a9a9e51]]
Former-commit-id: add86e4e11b21c4f7086d1bbfbe0ee88059d767f [formerly 040284c727]
Former-commit-id: a7c2ce9095
2014-05-27 11:11:12 -05:00
Nate Jensen
063cd0d83b Omaha #3133 remove org.apache.mina from radar server
Change-Id: I62e71f4766cb84c5dfc923a52ae8ced97798a089

Former-commit-id: 968d4828e3 [formerly 9b9338a23f] [formerly 3de37239b4] [formerly 968d4828e3 [formerly 9b9338a23f] [formerly 3de37239b4] [formerly 4294684ec6 [formerly 3de37239b4 [formerly 8ef634c2c2d45313bcc7c973f101cab445900e24]]]]
Former-commit-id: 4294684ec6
Former-commit-id: 3e014a1497 [formerly 5da01d7f7e] [formerly a876bfde88b3cc0750826541ee7480aed98b314a [formerly 40714c9226]]
Former-commit-id: e50784b8e0b2a27163445f22d68174d09c553a73 [formerly 04692e46e2]
Former-commit-id: b5ed8c1960
2014-05-19 11:50:11 -05:00
David Friedman
cdd250c2df Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2
Former-commit-id: 99edfe0a17 [formerly a920c5a5e4] [formerly c909746e0e] [formerly 99edfe0a17 [formerly a920c5a5e4] [formerly c909746e0e] [formerly a55e851780 [formerly c909746e0e [formerly a4c1c5524c31384c3532076ee151fd9a294367d2]]]]
Former-commit-id: a55e851780
Former-commit-id: 57712d2038 [formerly f8c9026f79] [formerly bee35b0f50c15c2acee4d04f32450273a1e35f20 [formerly 101f43d875]]
Former-commit-id: 8add7e0f674985ab73fd82e03a1a771477439c2f [formerly 421d4a56c8]
Former-commit-id: f999df6859
2014-05-16 16:40:38 -05:00
David Friedman
e4ec928222 ASM #240 - RPS lists delivered by awips2-rcm out of date
Change-Id: I811bfebab480c5655f7260b85daa36f69e9550eb

Former-commit-id: a13190aeb9 [formerly b462660d75] [formerly caa38ec709] [formerly a13190aeb9 [formerly b462660d75] [formerly caa38ec709] [formerly eab9a6b6d7 [formerly caa38ec709 [formerly 880c5d7259a5af17f2452fa3bd9f18d852c81d82]]]]
Former-commit-id: eab9a6b6d7
Former-commit-id: d06f8def65 [formerly 81abf8e7d9] [formerly 5fa6cc8307089b8f052ac6ad0cfa79f0362dc0ab [formerly 4efaa47d2d]]
Former-commit-id: 80202f6447063c949a9a1aa3353a7e14f3d4094a [formerly e576ddde57]
Former-commit-id: fa63aea622
2014-05-16 21:38:34 +00:00
David Friedman
3ea4f1dc1b ASM #592 - RadarServer does not sent OTRs for RSS product to TDWRs
Change-Id: Iabb354391ea63b6f9c316ea8316fc28128a956f5

Former-commit-id: 39e412aac8 [formerly 404f3af49e] [formerly 1503bc4162] [formerly 39e412aac8 [formerly 404f3af49e] [formerly 1503bc4162] [formerly 3b69a240c8 [formerly 1503bc4162 [formerly 4fd6bbfba29a39bf125269ab8342b826995e3d86]]]]
Former-commit-id: 3b69a240c8
Former-commit-id: 3a6e887a7c [formerly ff0f8e731f] [formerly ab442fed2bdf78f10c432839c809a8791bac6aed [formerly b62ac936ba]]
Former-commit-id: 21090d6cbb605d49bb525d9b72ed9817b4fb6d94 [formerly f8e5e96774]
Former-commit-id: 32524f8d3c
2014-05-16 21:34:59 +00:00
Richard Peter
626ab0bd58 Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	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.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.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
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54]
Former-commit-id: a22345ea6b
2014-04-11 16:23:09 -05:00
Steve Harris
24c55c616c Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753 [formerly 5d95d594f8] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6]
Former-commit-id: a936941dff
2014-03-17 15:55:41 -05:00
Brad Gonzales
e7295b16d2 Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b

Former-commit-id: 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly dea17a19da [formerly 0e3dc17872 [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]]
Former-commit-id: dea17a19da
Former-commit-id: 09c083ce1f [formerly 4ba60d8a6f] [formerly f2869efb05c763771e03bc02057aa196d29b6d1a [formerly 78d35d4033]]
Former-commit-id: f70dd002a68a434eb5e81131bb0b82d4784e717e [formerly c4064160ec]
Former-commit-id: 4cbc3b1b05
2014-03-06 16:29:37 -06:00
David Friedman
b62acbc154 ASM #74 - Fix RadarServer configuration import utility JAR dependency
Change-Id: I36dbd6f75d0183831fba92d2325c7c182c1dea70

Former-commit-id: e7def94c5f [formerly fa849dfefa] [formerly 11d0d191fd] [formerly e7def94c5f [formerly fa849dfefa] [formerly 11d0d191fd] [formerly d08597a0d4 [formerly 11d0d191fd [formerly 1a4183ed991cf1aed5895334c7b823a66ad58a7a]]]]
Former-commit-id: d08597a0d4
Former-commit-id: 3d09743022 [formerly 7efff2943c] [formerly 0bdcf1f23aab3fbfc22ef2ba180d8b9df0c2616a [formerly 591ce333dc]]
Former-commit-id: 89fc9937b925fbd68ad74bb2b24a9bffae38c3df [formerly 89b6f79565]
Former-commit-id: 3dde8aeda7
2014-03-06 17:07:23 +00:00
David Friedman
8b3da18a7f ASM #240
Change-Id: Ie1e0b115e991c0bdc01e929a21d36a9f1413d940

Former-commit-id: 9caca1ee5a [formerly 24ebf8854c] [formerly 611503cd96] [formerly 9caca1ee5a [formerly 24ebf8854c] [formerly 611503cd96] [formerly 969c50b80f [formerly 611503cd96 [formerly e34ceb8c86f0814c1be7af3bbd2eadec8daf48aa]]]]
Former-commit-id: 969c50b80f
Former-commit-id: 50718c4b94 [formerly ecae4f3099] [formerly 77ef332e564a2c699a3b6861f3fd44e198b991d1 [formerly 8591015dfb]]
Former-commit-id: 79da3bf76b673096339786e9dcd1acc881b16184 [formerly d63a17f725]
Former-commit-id: 84b45a2ee0
2014-02-03 19:03:50 +00:00
Greg Armendariz
5e2df6a0b4 Issue #2754 - Remove commons logging calls
Former-commit-id: 689ca84b3f [formerly efe8011970] [formerly fa27142ec2] [formerly 689ca84b3f [formerly efe8011970] [formerly fa27142ec2] [formerly 6ae002cf46 [formerly fa27142ec2 [formerly 7458fc7a7d3276fb14d963c92f55c89ced838837]]]]
Former-commit-id: 6ae002cf46
Former-commit-id: 05e48bb7f4 [formerly 9f09293f2e] [formerly 5cf42a9b3e606e1eccdf9c5c70d6bb76b2ced605 [formerly accf0505a5]]
Former-commit-id: 9cccab557a978db071ec2a16d72dccc77908920c [formerly e568b3792d]
Former-commit-id: 4600cda583
2014-02-03 12:17:30 -06:00
David Friedman
788b4fbd22 Issue #74
Change-Id: I68539f26778ddea09ad23f4f938122157a6813b1

Former-commit-id: 0eb9282611 [formerly baea134dd9] [formerly 53c48228d9] [formerly 0eb9282611 [formerly baea134dd9] [formerly 53c48228d9] [formerly 88332356d7 [formerly 53c48228d9 [formerly f70942c4a5ea08110fa937a184876a9f64ddfb8d]]]]
Former-commit-id: 88332356d7
Former-commit-id: 838e6e07a1 [formerly a23db3e2d8] [formerly 69fb8ad726141c1b24cd2910d6717e3def193407 [formerly 4a75e255a8]]
Former-commit-id: f954fe4e54cfde2408f25f495800aa2d1ead77c7 [formerly 154c8a6f68]
Former-commit-id: 93814cfacc
2013-12-18 16:37:36 +00:00
Steve Harris
c784003711 14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
2013-10-28 10:46:02 -04:00
Richard Peter
be84d709e4 Merge branch 'omaha_13.5.1' (13.5.1-8) into development
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: e439ecafe6 [formerly 464352f731] [formerly 26df62db53] [formerly e439ecafe6 [formerly 464352f731] [formerly 26df62db53] [formerly f97a27796d [formerly 26df62db53 [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]]
Former-commit-id: f97a27796d
Former-commit-id: 7f46fbf78f [formerly a67f0bf2da] [formerly ea1df038b44fa6b4c0db240a0fb0b45969d773c0 [formerly 3f1e17765a]]
Former-commit-id: 9973bf82bd2bdd62c09a917e8fc0870c0a2147d1 [formerly 5314b90720]
Former-commit-id: 33d4f95c3e
2013-07-31 12:54:12 -05:00
Steve Harris
dded20dc93 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 340e7bab60 [formerly a7d4c6274e] [formerly 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]]
Former-commit-id: 25e673600ebb4cafb2c67928841e30149139a498 [formerly 1a3197efdf]
Former-commit-id: 767b7fdb4d
2013-07-26 09:02:34 -04:00
Nate Jensen
4c394503c6 Issue #2142 fix radar server logging
Change-Id: Ic4678f22ffb7ab5edaa97f76b27e1e6ffd14b4ff

Former-commit-id: b4265150dd [formerly 0857f9334a] [formerly a6bd01028c] [formerly b4265150dd [formerly 0857f9334a] [formerly a6bd01028c] [formerly a421f83b66 [formerly a6bd01028c [formerly 8c139d0200e9619afaa2cd2cd95c8a5a7410ca19]]]]
Former-commit-id: a421f83b66
Former-commit-id: 4212d6f808 [formerly c551c5ea8f] [formerly 3a5c003e612589c93adb927cf083a1622dfa0422 [formerly 641b52bbab]]
Former-commit-id: f09ddaaebb7b95d5d83d683c7669c4811e140866 [formerly 69f59343b9]
Former-commit-id: cf151e4e1b
2013-07-11 14:25:36 -05:00
Bryan Kowal
c39a671b1d Issue #2164 - fix pde build for RadarServer.
Change-Id: I439fb9db7d26d1e80bff5e1620691246c92608e3

Former-commit-id: 8924d8fc22 [formerly 4815b78b6f] [formerly b4df3267bd] [formerly 8924d8fc22 [formerly 4815b78b6f] [formerly b4df3267bd] [formerly 92b2c6ae65 [formerly b4df3267bd [formerly b5f4fb2cfb101a9a43bb7036a952bf58ed388721]]]]
Former-commit-id: 92b2c6ae65
Former-commit-id: 27686fad8b [formerly ad1d8e35e0] [formerly 705f7197809a3a559d87c56da87de7baa0ca23a6 [formerly 5e4350392b]]
Former-commit-id: 568e321d20a3d8de2757a381fc09aed57c4492e4 [formerly b07e3f47da]
Former-commit-id: e34d55b8bd
2013-07-03 19:36:42 -05:00
Steve Harris
97a4c59662 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Bryan Kowal
47d6de2275 Issue #1927 - add quartz as a RadarServer build dependency
Change-Id: I1bc64bc347ebd54e249dbd8e4b2cadfa65c28b56

Former-commit-id: 1b8179bbf2 [formerly 01413b17dd] [formerly 047a3de7bd] [formerly 1b8179bbf2 [formerly 01413b17dd] [formerly 047a3de7bd] [formerly 99a5290083 [formerly 047a3de7bd [formerly f3dc0db70d9c3c680b56c07f18c84e2fbc2daaa2]]]]
Former-commit-id: 99a5290083
Former-commit-id: 0493669c67 [formerly f57a730309] [formerly 5c17e84fa3ea240adbc88fa40b2adcf31c7cdca3 [formerly 63fa948ba8]]
Former-commit-id: 4859ba98ba249ddd22070655c299a50b4c825a27 [formerly 7692701168]
Former-commit-id: 2deeffdb51
2013-05-15 12:38:02 -05:00
Steve Harris
4647d70fd8 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 29777b406e [formerly 344054d3e9] [formerly 1a6fd7edfd] [formerly 29777b406e [formerly 344054d3e9] [formerly 1a6fd7edfd] [formerly 0f76c3cbee [formerly 1a6fd7edfd [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]]]
Former-commit-id: 0f76c3cbee
Former-commit-id: f83b6daf56 [formerly c1349f4a6d] [formerly 40a0e843311ddd470a12258a3bc95ce73d614c01 [formerly 99a7521fd6]]
Former-commit-id: aa7844c83d5bb0a0e9bf3d45f714ce4f67810c47 [formerly 764924cd1e]
Former-commit-id: e1a369a499
2013-05-03 09:20:30 -05:00
Steve Harris
ba48ab0362 13.4.1-4 baseline
Former-commit-id: ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 7d085660f8 [formerly 4357e2dacc] [formerly 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32]]
Former-commit-id: 6fc143d13d42b0d419bcede3614f0ee982260764 [formerly e0986cfda8]
Former-commit-id: 5dbfeb38ac
2013-05-02 10:00:38 -05:00
Steve Harris
43942dad11 13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 3cbf22bd96 [formerly 936e4adda2] [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]]
Former-commit-id: 8c6b23e522a402fa4cd1e6df150e646e4689e3b0 [formerly 8237fdadaa]
Former-commit-id: f59f1f02b0
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
a503ef0938 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 0d765a2fcf [formerly 0d9119a1c7] [formerly 2b6aa86371] [formerly 0d765a2fcf [formerly 0d9119a1c7] [formerly 2b6aa86371] [formerly ed544fc17c [formerly 2b6aa86371 [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]]
Former-commit-id: ed544fc17c
Former-commit-id: 4b0e7e77d3 [formerly b201d9dee2] [formerly b850b70906a6763277fa77ce5a2f3e638139e35a [formerly 646b61f653]]
Former-commit-id: 054b143635c076ebd5e79c9bbfe409552cff76ec [formerly 498d153e40]
Former-commit-id: 4cde2bd826
2013-03-20 13:05:54 -05:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
98059f9ef1 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
2012-08-21 15:27:03 -05:00
Steve Harris
867586657b 12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 71b024e3a1 [formerly 36c108e960] [formerly dcda3a2290] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3 [formerly d7d60cc623] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501]
Former-commit-id: 7e1d1f6e08
2012-08-15 15:19:10 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
2012-07-10 07:53:49 -05:00
Steve Harris
7f90924706 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
2012-05-01 18:06:13 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00