Steve Harris
e812613c42
Omaha #4337 - merge modification of logback.xml
...
Former-commit-id: 9f26e02dc66486a684a2
2015-03-26 15:56:04 -05:00
Steve Harris
663bf8c2f9
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: 165971a4f625bd3ee930
2015-03-26 09:57:17 -05:00
Nate Jensen
3f10021049
Omaha #4234 initialize the main python interpreter on a different thread
...
than the sub-interpreters, or warn when that happens
Change-Id: Id4d2c2401c96f6d884e5c468419f2d5893f6eafd
Former-commit-id: e1536e8a6e7318d0e603
2015-03-10 15:41:32 -05:00
Roger Ferrel
d258223784
Omaha #4015 Fix ingestGrib and ingestDat entries for performance logs.
...
Change-Id: Ia736962faca2dbf4711bef6cd356b2327a85f92f
Former-commit-id: 77fe14ea9beb12b8a70b
2015-03-03 10:53:30 -06:00
Roger Ferrel
c916170498
Omaha #4015 Clean up in edex loggers.
...
Former-commit-id: d0e4a2690cfdfd84e3a9
2015-02-23 14:02:52 -06:00
Roger Ferrel
120de0e2ba
Omaha #4015 Move redundant entries to logback include files for alertviz and edex.
...
Change-Id: I23c592a1c05eda309047e73d136a3e1092143611
Former-commit-id: d15abc2257dd3d9708d7
2015-02-23 12:27:50 -06:00
Steve Harris
6b97a1bbe9
Merge tag 'OB_14.4.1-13m' into omaha_15.1.1
...
14.4.1-13
Former-commit-id: 78b41638b9266e2af93a
2015-02-20 13:17:47 -06:00
Steve Harris
e15ab39329
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: 118f52263f32d42215a3
2015-02-12 12:48:29 -06:00
Nate Jensen
51faeff2d3
Omaha #3974 remove dead code
...
Change-Id: Idf364d069ffbb38f2ce05359643d425daa17e690
Former-commit-id: 35095e702fd0ab3a6c4b
2015-02-10 09:18:10 -06:00
David Lovely
c1a1c05967
Omaha #3945 Moved the ESB folder to deploy.edex.awips2 and updated the build scripts.
...
Former-commit-id: b8a10c4336fa557d08e3
2015-01-28 15:15:15 -06:00
Bryan Kowal
dc5cae7ea1
Omaha #3836 - initial commit of the groovy-based developer deployment.
...
Please refer to the: build/deploy.edex/ReadMe.txt
amend: remove files that are not used by the developer deployment
Change-Id: I7caaf61e88d315ea0d065d46036d3ba9530c29ec
Former-commit-id: 5b7f86d9d4c963a90ce0
2014-12-04 16:17:53 -06:00
