mjames-upc
9ad921645b
removing datadelivery references
...
Former-commit-id: 8d5dd215da
2015-12-30 14:03:13 -07:00
Ron Anderson
7bd2279d70
Omaha #4522 Add proper primary key to active table
...
Change-Id: Id1c6f4ce0b317211e3a1eed0240f2463bd842f40
Former-commit-id: 75c224ead5
[formerly 99243fee7951395b37730327a19c6391832cbc36]
Former-commit-id: f7d30d71bd
2015-05-27 13:56:14 -05:00
Fay.Liang
d6936db8c3
Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into int_15.1.1
...
Former-commit-id: 8cce7a082c
[formerly fb0b41ff7b119e80d81e028bd8a768d6df335cf3]
Former-commit-id: 3e63965908
2015-05-13 15:11:13 -04:00
Roger Ferrel
30962a10fa
Omaha #4419 Add com.raytheon.uf.common.bmh to excludes list for DatabaseSessionConfiguration.
...
Change-Id: Iae4d3b9fe179c94d72782d3fd8b1717febaf03db
Former-commit-id: c58a008d3d
[formerly db2feae191b036fc20257807ae6923238bdea9fd]
Former-commit-id: 20bf0e0cfe
2015-05-07 08:30:50 -05:00
Shawn.Hooper
14873814b6
ASM #17024 - Moved ndmMenuIngester.sh to build/deploy.edex.awips2/esb/bin/
...
Change-Id: I13f0db113db1582c57c6f2a42a5b2903a118530b
Former-commit-id: 83906db315
[formerly 209589704fecd76aae472171ef6266eab39cefbb]
Former-commit-id: d9d27d625b
2015-05-04 10:53:21 -04:00
Shawn.Hooper
d18a2fea70
ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33
...
Merge 14.4.1-33 into 15.1.1-8
Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c
Former-commit-id: 48e06c41ad
[formerly 1f63e395c67afa5106bde7b96b72d4b3111221d3]
Former-commit-id: 7eac415eaa
2015-05-01 16:12:48 -04:00
Steve Harris
e812613c42
Omaha #4337 - merge modification of logback.xml
...
Former-commit-id: 9f26e02dc6
[formerly 8f555a33c557fabce3c9035bdd91c8627362cf50]
Former-commit-id: 6486a684a2
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: 165971a4f6
[formerly 0db97a3cefc6f709d336883202e51f1d5255ad75]
Former-commit-id: 25bd3ee930
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: e1536e8a6e
[formerly 5386e7fabcfbac366bb5335f601bcd0719b4f32c]
Former-commit-id: 7318d0e603
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: 77fe14ea9b
[formerly e8ace2fef2a1cd5a73238f43b9faa27874188085]
Former-commit-id: eb12b8a70b
2015-03-03 10:53:30 -06:00
Roger Ferrel
c916170498
Omaha #4015 Clean up in edex loggers.
...
Former-commit-id: d0e4a2690c
[formerly b0fd25aa5575a73af8217303f9d4cc27a8302108]
Former-commit-id: fdfd84e3a9
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: d15abc2257
[formerly 6e840bc94847162ef66aab3ce961e6fa222801c5]
Former-commit-id: dd3d9708d7
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: 78b41638b9
[formerly ea76883b615967a79e8c9d0ee16accebd210ee0b]
Former-commit-id: 266e2af93a
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: 118f52263f
[formerly ffee274d844442a36d633deda5776c09a758cb38]
Former-commit-id: 32d42215a3
2015-02-12 12:48:29 -06:00
Nate Jensen
51faeff2d3
Omaha #3974 remove dead code
...
Change-Id: Idf364d069ffbb38f2ce05359643d425daa17e690
Former-commit-id: 35095e702f
[formerly 6abc0be453cfdb29db40073af54c0c84e85ee9de]
Former-commit-id: d0ab3a6c4b
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: b8a10c4336
[formerly b9868fc974226fe6b003b0361ce1b18507b2d810]
Former-commit-id: fa557d08e3
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: 5b7f86d9d4
[formerly d881ba5d55c41647e5b3c4dfecd7ea89ad7ec2eb]
Former-commit-id: c963a90ce0
2014-12-04 16:17:53 -06:00