Commit graph

5 commits

Author SHA1 Message Date
Steve Harris
9f26e02dc6 Omaha #4337 - merge modification of logback.xml
Former-commit-id: 8f555a33c557fabce3c9035bdd91c8627362cf50
2015-03-26 15:56:04 -05:00
Steve Harris
165971a4f6 Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
14.4.1-20m

 Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
2015-03-26 09:57:17 -05:00
Roger Ferrel
77fe14ea9b Omaha #4015 Fix ingestGrib and ingestDat entries for performance logs.
Change-Id: Ia736962faca2dbf4711bef6cd356b2327a85f92f

Former-commit-id: e8ace2fef2a1cd5a73238f43b9faa27874188085
2015-03-03 10:53:30 -06:00
Roger Ferrel
d15abc2257 Omaha #4015 Move redundant entries to logback include files for alertviz and edex.
Change-Id: I23c592a1c05eda309047e73d136a3e1092143611

Former-commit-id: 6e840bc94847162ef66aab3ce961e6fa222801c5
2015-02-23 12:27:50 -06:00
David Lovely
b8a10c4336 Omaha #3945 Moved the ESB folder to deploy.edex.awips2 and updated the build scripts.
Former-commit-id: b9868fc974226fe6b003b0361ce1b18507b2d810
2015-01-28 15:15:15 -06:00
Renamed from edexOsgi/build.edex/esb/conf/logback.xml (Browse further)