Richard Peter
|
21ae3b5fcd
|
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: bd13bc332bcdd87723bec8669885f4594ad483b9
|
2014-04-11 16:23:09 -05:00 |
|
David Friedman
|
969c50b80f
|
ASM #240
Change-Id: Ie1e0b115e991c0bdc01e929a21d36a9f1413d940
Former-commit-id: e34ceb8c86f0814c1be7af3bbd2eadec8daf48aa
|
2014-02-03 19:03:50 +00:00 |
|
Richard Peter
|
8ba840f1d9
|
Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13
Former-commit-id: 8a8eff74685abb8a709480fa33f2c56dd7923ab9
|
2013-07-26 14:36:46 -05:00 |
|
Nate Jensen
|
fc691cbb2f
|
Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: b0ad25ccd9e20b6bf994a3a46ce38298c363adff
|
2013-05-29 16:19:28 -05:00 |
|
Nate Jensen
|
3f3e0a788d
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: b7b619e1a3a85ac8c5f22a36317e22e15ad557a2
|
2013-05-29 14:49:43 -05:00 |
|
Nate Jensen
|
1fd2f8965f
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: a9330ce9247b05a0044778aeea46e0e986f05f2d
|
2013-05-23 11:20:40 -05:00 |
|
Steve Harris
|
ce6a06a7e3
|
13.3.1-18 baseline
Former-commit-id: 245ab5d951a10e74aba53b036001316e1c7653fe
|
2013-04-03 14:58:29 -05:00 |
|
Steve Harris
|
3d8ed484be
|
13.3.1-15 baseline
Former-commit-id: 369cf4feaee63c96725cb6efc5774b8f6b8cbf08
|
2013-04-01 11:33:20 -05:00 |
|
Steve Harris
|
9fba973fd0
|
13.3.1-14 baseline
Former-commit-id: 0b52508caf520abeba4a75d38c9ed9130cc12c9e
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
566b677d09
|
13.3.1-6 baseline
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
c63f9bcae0
|
13.2.1-1 baseline
Former-commit-id: 6831a29efca54cfde39ab6a462f76ca2ac206f49
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
4ba416aeb3
|
13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
1e02387ff1
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: da126f587a1e3761dbe16ee2a41aee0caba85bfc
|
2012-10-08 13:26:20 -05:00 |
|
Steve Harris
|
2a216f333c
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
c83e5ff474
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
06a8b51d6d
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|