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
Nate Jensen
e1536e8a6e
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: 5386e7fabcfbac366bb5335f601bcd0719b4f32c
2015-03-10 15:41:32 -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
d0e4a2690c
Omaha #4015 Clean up in edex loggers.
...
Former-commit-id: b0fd25aa5575a73af8217303f9d4cc27a8302108
2015-02-23 14:02:52 -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
Steve Harris
78b41638b9
Merge tag 'OB_14.4.1-13m' into omaha_15.1.1
...
14.4.1-13
Former-commit-id: ea76883b615967a79e8c9d0ee16accebd210ee0b
2015-02-20 13:17:47 -06:00
Steve Harris
118f52263f
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Former-commit-id: ffee274d844442a36d633deda5776c09a758cb38
2015-02-12 12:48:29 -06:00
Nate Jensen
35095e702f
Omaha #3974 remove dead code
...
Change-Id: Idf364d069ffbb38f2ce05359643d425daa17e690
Former-commit-id: 6abc0be453cfdb29db40073af54c0c84e85ee9de
2015-02-10 09:18:10 -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
Bryan Kowal
5b7f86d9d4
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: d881ba5d55c41647e5b3c4dfecd7ea89ad7ec2eb
2014-12-04 16:17:53 -06:00
