Commit graph

6306 commits

Author SHA1 Message Date
Brian Clements
69542586af Omaha #3333 grid lightning image by default, log style rule
Change-Id: Iaec485a35cce1deba7943ae4550c004badbf0a32

Former-commit-id: e018ec56dd [formerly a6b414bd1f] [formerly e018ec56dd [formerly a6b414bd1f] [formerly e5a63e5cf5 [formerly 127cdbea94ed37f0a2c3ddf113df8f093549d077]]]
Former-commit-id: e5a63e5cf5
Former-commit-id: 40c4f63196 [formerly 8ecbbdebc1]
Former-commit-id: 02d41cb45c
2014-07-24 13:34:43 -05:00
Greg Armendariz
5f1b06cd2b Merge "Omaha #3417 - Update Linux Java to v1.7.0_65" into omaha_14.4.1
Former-commit-id: 61094bf77a [formerly e7d4631fe1] [formerly 61094bf77a [formerly e7d4631fe1] [formerly 04f52094f6 [formerly 96f32d193633cb166be86057a244ea8df06fd03e]]]
Former-commit-id: 04f52094f6
Former-commit-id: 79e339b381 [formerly 24eca33662]
Former-commit-id: a4683a9171
2014-07-23 16:06:20 -05:00
Nate Jensen
fcadce5212 Merge "Omaha #3390 Fix alertviz build." into omaha_14.4.1
Former-commit-id: 419b19d54b [formerly 1b3a3c3e64] [formerly 419b19d54b [formerly 1b3a3c3e64] [formerly 8070fcdd87 [formerly b4d2f2ab1d0a29cd10d72599c3e1c49319aeadad]]]
Former-commit-id: 8070fcdd87
Former-commit-id: bd072904ea [formerly 1da8cc159f]
Former-commit-id: d22e6abc43
2014-07-23 14:23:10 -05:00
Ben Steffensmeier
cfe82040a1 Omaha #3390 Fix alertviz build.
Former-commit-id: cfd1ba5911 [formerly d8e305fecc] [formerly cfd1ba5911 [formerly d8e305fecc] [formerly b5e91a6547 [formerly b1d0566f20359b0ffcc1ccd8f6a7469f8c7db0e9]]]
Former-commit-id: b5e91a6547
Former-commit-id: a282c066f7 [formerly 3f704bf8ea]
Former-commit-id: 2162133298
2014-07-23 14:18:22 -05:00
Greg Armendariz
80915bec01 Omaha #3417 - Update Linux Java to v1.7.0_65
Change-Id: Ib6ea40b5ee4e20f419aae32edcc951470a935311

Former-commit-id: 58e1da9361 [formerly 83e2b2c4c4] [formerly 58e1da9361 [formerly 83e2b2c4c4] [formerly b41ff3e082 [formerly 2a8b1ed12d9e1fe7132105bd7cc6cd8405dcd46d]]]
Former-commit-id: b41ff3e082
Former-commit-id: b22b3ce997 [formerly 4cfa594750]
Former-commit-id: 6706a87b98
2014-07-23 14:17:21 -05:00
Nate Jensen
5281e53643 Merge "Omaha #3185 harden using DAF through jep, implement new DAF methods for JepRouter" into omaha_14.4.1
Former-commit-id: 55b5078b7d [formerly 78ae5e9ecb] [formerly 55b5078b7d [formerly 78ae5e9ecb] [formerly 3d2854a921 [formerly 1b1e49a9784d393fada6a8656c3dbb18a5936d68]]]
Former-commit-id: 3d2854a921
Former-commit-id: f7a389415a [formerly c30cab5e26]
Former-commit-id: 928ce9641f
2014-07-23 13:48:04 -05:00
Nate Jensen
e536e734cf Merge "Omaha #3422 Move HydroPointResource and HydroPointResourceData to MPE plugin" into omaha_14.4.1
Former-commit-id: 87429112e4 [formerly a6e37028f5] [formerly 87429112e4 [formerly a6e37028f5] [formerly be928b5b3e [formerly c92c83d1012fcc872e956b46d884d9e3de13ddf4]]]
Former-commit-id: be928b5b3e
Former-commit-id: 22aa9333da [formerly e8adbd27b3]
Former-commit-id: 8aff5b086f
2014-07-23 13:43:06 -05:00
Nathan Bowler
f96ec1d2d9 Omaha #3392 Adding unmodified, existing a2acars scripts in order to maintain history.
Change-Id: Ifd853cec4a97d7008e58e6beee40a90731d16e12

Former-commit-id: 22f8746715 [formerly 43d9e401af] [formerly 22f8746715 [formerly 43d9e401af] [formerly 97d38c86cf [formerly 86d82d1942f6c8c85eda7ba5fb16b75740a2d972]]]
Former-commit-id: 97d38c86cf
Former-commit-id: ee2a991810 [formerly 104fecf1f2]
Former-commit-id: 9a920a79c6
2014-07-23 08:23:45 -04:00
Nate Jensen
5962391ed5 Omaha #3185 harden using DAF through jep, implement new DAF methods for
JepRouter

Change-Id: Id923a9267eee1242ef826414c037c1391f2effd6

Former-commit-id: a85f1054f3 [formerly 94ad041a46] [formerly a85f1054f3 [formerly 94ad041a46] [formerly b9caab11c9 [formerly de69306f1d3804b5c4cb09736aec3fa9a889646c]]]
Former-commit-id: b9caab11c9
Former-commit-id: a2d2677a25 [formerly 0db0812d68]
Former-commit-id: aaae894bcb
2014-07-22 17:37:20 -05:00
Mark Peters
0a1e272abb Omaha #3422 Move HydroPointResource and HydroPointResourceData to MPE plugin
Change-Id: I222f99b0b952d9cef91208eb27f6adca43e13669

Former-commit-id: 85bf675f6a [formerly 92b1e9a9cf] [formerly 85bf675f6a [formerly 92b1e9a9cf] [formerly 29bc0fae50 [formerly 7929e5b809d83a0f682e9f1c6953c9a090ed7310]]]
Former-commit-id: 29bc0fae50
Former-commit-id: 034616b4b7 [formerly 6727654e2d]
Former-commit-id: a87ed6f7af
2014-07-22 14:57:35 -05:00
Nate Jensen
42ada8c3ac Merge "Omaha #3422 Replace drawFilledCircle and drawArc calls" into omaha_14.4.1
Former-commit-id: d419c9b8ca [formerly 87ec4fed2c] [formerly d419c9b8ca [formerly 87ec4fed2c] [formerly 415c9e73fd [formerly eac41695224c18aa566e4b1fdcbaf48647d93fdf]]]
Former-commit-id: 415c9e73fd
Former-commit-id: d4a11f062e [formerly aeb224e2c7]
Former-commit-id: 41b01e96ac
2014-07-22 14:21:27 -05:00
Nate Jensen
6ec4a3c6df Merge "Omaha #3214 fixed typos in LightningFrameRetriever" into omaha_14.4.1
Former-commit-id: fd997ad030 [formerly 464e252e96] [formerly fd997ad030 [formerly 464e252e96] [formerly 3128374080 [formerly 5a2968189edd1abe58560404fc01dcea82957b5f]]]
Former-commit-id: 3128374080
Former-commit-id: 716f83ef2a [formerly cef2844dbc]
Former-commit-id: 78bf4db27e
2014-07-22 14:01:08 -05:00
Mark Peters
3a160929d5 Omaha #3422 Replace drawFilledCircle and drawArc calls
Change-Id: I2ecd1e2fd9614317addc248130bfc8ececc3d80e

Former-commit-id: f1b1aa1b5d [formerly 9532289be3] [formerly f1b1aa1b5d [formerly 9532289be3] [formerly b0e9c73eaf [formerly f0575e788549a1728c6d6fff7b99e3764c3739d8]]]
Former-commit-id: b0e9c73eaf
Former-commit-id: 9937dc0028 [formerly 4d7d9ec799]
Former-commit-id: 75e25d7710
2014-07-22 13:50:39 -05:00
Brian Clements
a2117edf9f Omaha #3333 grid lightning ignores strikes outside of map
Change-Id: I188aac28b50b7ac8a107d785b52471c1d7fe6d14

Former-commit-id: 0bd9bb7c21 [formerly a9284b35ff] [formerly 0bd9bb7c21 [formerly a9284b35ff] [formerly 62dcdda0bc [formerly bb55bde76765d330f782524965fe79d5373b6e9f]]]
Former-commit-id: 62dcdda0bc
Former-commit-id: b069785d53 [formerly 0deb06ba40]
Former-commit-id: 976404c8b7
2014-07-22 13:42:18 -05:00
Brian Clements
3c19ca5c17 Omaha #3214 fixed typos in LightningFrameRetriever
Change-Id: I1616b5f64c3d6c99f034c7f7c526a453e0f5578c

Former-commit-id: 319cbe37b3 [formerly 45d52c2298] [formerly 319cbe37b3 [formerly 45d52c2298] [formerly 3f82ead0b5 [formerly 7f5868947a0c7bee586908f832f3bb9030c3e84e]]]
Former-commit-id: 3f82ead0b5
Former-commit-id: acf2c60fd3 [formerly 02cf0078d4]
Former-commit-id: 43f5ee1032
2014-07-22 13:33:26 -05:00
Nathan Bowler
d49ed2283d Omaha #3392 Change Doubles to Float in ACARS and ACARSSoundingLayer
Change-Id: I6c07c51a3118d6317418a22be56b7899734e5917

Former-commit-id: 7d352f77a3 [formerly 06b9d253f3] [formerly 7d352f77a3 [formerly 06b9d253f3] [formerly 4f3a729894 [formerly 9ac070996c42b004f3683d7ee253feb54f05264c]]]
Former-commit-id: 4f3a729894
Former-commit-id: 0067bc04d3 [formerly 085fe0e479]
Former-commit-id: 0bfeb9fd7f
2014-07-22 14:05:16 -04:00
Nate Jensen
3453fda1a0 Omaha #3185 python newDataRequest() now supports
optional/default/keyword args

Change-Id: Iaab83d9915899d96114c078fb82c99be3b59e0dc

Former-commit-id: bab319cf15 [formerly 88aa123a5a] [formerly bab319cf15 [formerly 88aa123a5a] [formerly e1291395b0 [formerly 66804918e06afc9616fcfe0f0a12afd75a8143e1]]]
Former-commit-id: e1291395b0
Former-commit-id: 8299c6c46e [formerly e04dff7fa7]
Former-commit-id: 8f20278430
2014-07-22 11:57:53 -05:00
Nate Jensen
397d61cdce Merge "Omaha #3373 fixed jaxb pooling performance issues" into omaha_14.4.1
Former-commit-id: 55421c88dd [formerly 9c1e1974ce] [formerly 55421c88dd [formerly 9c1e1974ce] [formerly ee5fca16ff [formerly e59c0863348b800dc6ea990df1b4848b12a314fe]]]
Former-commit-id: ee5fca16ff
Former-commit-id: f109f2cd8f [formerly 3f6c47786d]
Former-commit-id: 2ad09ed481
2014-07-21 17:49:20 -05:00
Nate Jensen
e63c0a840e Merge "Omaha #3412 Replace drawCircle calls" into omaha_14.4.1
Former-commit-id: 4633cc855f [formerly c47892bf95] [formerly 4633cc855f [formerly c47892bf95] [formerly 25c79387ca [formerly 61846ea9ec93ae255bdc4be7332a63252012aa9f]]]
Former-commit-id: 25c79387ca
Former-commit-id: 0274bcd3c1 [formerly 56d62848c6]
Former-commit-id: 40ea1b75a3
2014-07-21 17:47:24 -05:00
Mark Peters
969c6a4685 Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca

Former-commit-id: b5a25e7372 [formerly e638d2f41b] [formerly b5a25e7372 [formerly e638d2f41b] [formerly e4c455f5c0 [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]]
Former-commit-id: e4c455f5c0
Former-commit-id: 30a6e96d7c [formerly e48c2b7116]
Former-commit-id: 3aee17fbb5
2014-07-21 17:07:02 -05:00
Brian Clements
334dd1a466 Omaha #3373 fixed jaxb pooling performance issues
Change-Id: Icf7949e956f2b21ba156f4f0a19a2c41d0037681

Former-commit-id: 6d2204c33e [formerly 37d97b9e48] [formerly 6d2204c33e [formerly 37d97b9e48] [formerly a20345bf50 [formerly 2ec52d8956b77aad30d46d7b4b2202c868b38a4d]]]
Former-commit-id: a20345bf50
Former-commit-id: 44a19a5df4 [formerly 6f8dc96c3d]
Former-commit-id: 65bda7536e
2014-07-21 17:05:29 -05:00
Nate Jensen
38a18e98a2 Merge "Omaha #2768 removed workaround for edex localization notifications" into omaha_14.4.1
Former-commit-id: acba540802 [formerly 4e94590075] [formerly acba540802 [formerly 4e94590075] [formerly 3b23caee5d [formerly 7f3040fd6aefbae1af344a3177bf2fd7f7ad48fb]]]
Former-commit-id: 3b23caee5d
Former-commit-id: aafdff4f97 [formerly 9f7f79fbc5]
Former-commit-id: f0076e7c85
2014-07-21 13:02:56 -05:00
Greg Armendariz
e1180e770a Merge branch 'omaha_15.1.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java

Former-commit-id: e5919e105b [formerly f12b1a1098] [formerly e5919e105b [formerly f12b1a1098] [formerly 8773e17083 [formerly 111178b736cc4e894f59bc7127ec2bddda96264c]]]
Former-commit-id: 8773e17083
Former-commit-id: 49bd932339 [formerly a6133db8d2]
Former-commit-id: ec12c703fe
2014-07-21 12:12:32 -05:00
Brian Clements
0a1f74fc79 Omaha #2768 removed workaround for edex localization notifications
Change-Id: I34bc85f1d7331f2a6da8d14410836634f6239a17

Former-commit-id: 4b9c886ab4 [formerly 9693094664] [formerly 4b9c886ab4 [formerly 9693094664] [formerly e5f5fb76cf [formerly c142ac8f463951ed58d68bed24fb966adc289c2b]]]
Former-commit-id: e5f5fb76cf
Former-commit-id: 5a091ca2bb [formerly c29be3e09e]
Former-commit-id: 8c286d5547
2014-07-21 09:53:34 -05:00
Greg Armendariz
88fe72c588 Omaha #2914 - Remove calls to PropertiesFactory
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be

Former-commit-id: e3f927e52c [formerly b34486973e] [formerly e3f927e52c [formerly b34486973e] [formerly 09f6bd471c [formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]]]
Former-commit-id: 09f6bd471c
Former-commit-id: d51ab07c0e [formerly fcf1b5ee8a]
Former-commit-id: 5c5ab0f36c
2014-07-17 15:41:38 -05:00
Steve Harris
0e4a0fd1d3 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Former-commit-id: 933355b964 [formerly 6b19a1ccb5] [formerly 933355b964 [formerly 6b19a1ccb5] [formerly a5491e2d9f [formerly 3dceeec9d010a590353f6ab3327743781cd014f1]]]
Former-commit-id: a5491e2d9f
Former-commit-id: 2a410a3aff [formerly 3eb889da68]
Former-commit-id: 5f1272961b
2014-07-17 10:40:27 -05:00
Nate Jensen
6e2a1020f1 Merge "Omaha #3350 Fix build...again" into omaha_14.4.1
Former-commit-id: b72ef26e13 [formerly 1bc55915ac] [formerly b72ef26e13 [formerly 1bc55915ac] [formerly 006642adfb [formerly 5645cbc048baa63287c6599c0774949cf363edc9]]]
Former-commit-id: 006642adfb
Former-commit-id: 72743c4a37 [formerly b25365720c]
Former-commit-id: 0f0b4e01cb
2014-07-17 08:59:05 -05:00
Benjamin Phillippe
5767e9f9ca Omaha #3350 Fix build...again
Former-commit-id: 8c060c7854 [formerly ad6b7cb8f3] [formerly 8c060c7854 [formerly ad6b7cb8f3] [formerly e99a59d8fb [formerly 4ca53671a23ea0b232d17453aee12c72d8f80bce]]]
Former-commit-id: e99a59d8fb
Former-commit-id: 908bf3f983 [formerly 65c4765b03]
Former-commit-id: 9f32f2b3d1
2014-07-17 08:53:40 -05:00
Richard Peter
3c0adc8ead Merge "Omaha #3350 Fix Build" into omaha_14.4.1
Former-commit-id: 9e8c84a1c3 [formerly 4675d335f4] [formerly 9e8c84a1c3 [formerly 4675d335f4] [formerly 6054cb4b6e [formerly 362aa326ca9792cfc5507f3324d37dac74cfb106]]]
Former-commit-id: 6054cb4b6e
Former-commit-id: 84d45183e4 [formerly 0938ffd640]
Former-commit-id: 12ac1df8fa
2014-07-16 17:03:58 -05:00
Benjamin Phillippe
12836e489d Omaha #3350 Fix Build
Former-commit-id: 09a62bb1cc [formerly 31e2999556] [formerly 09a62bb1cc [formerly 31e2999556] [formerly b203666598 [formerly 71268a5d54542628d36f7e7ea6665761b9d4342f]]]
Former-commit-id: b203666598
Former-commit-id: 672c33d83a [formerly 6e13dfa624]
Former-commit-id: ca61ebd856
2014-07-16 16:54:45 -05:00
Greg Armendariz
cbe889f71a Merge "Omaha #3300 moving 15.1.1 deltascript back into 14.4.1" into omaha_14.4.1
Former-commit-id: 5c8e4250a3 [formerly b787ba53db] [formerly 5c8e4250a3 [formerly b787ba53db] [formerly d410f5b2fd [formerly 8d25cc0eb9bc92d29fa2e4832b8fa974953a5609]]]
Former-commit-id: d410f5b2fd
Former-commit-id: 24cea675e7 [formerly 1427299141]
Former-commit-id: 708029cdf7
2014-07-16 15:26:25 -05:00
Richard Peter
9627c94733 Merge "Omaha #3389: Add ability for deploy-install.xml to run WA-specific deploy script for standalone components." into omaha_14.4.1
Former-commit-id: 37151ec879 [formerly 4d9c25c63e] [formerly 37151ec879 [formerly 4d9c25c63e] [formerly 74b806cbb7 [formerly eb2dbad6c50eb770a57dcbb59ceb7a08e88b059f]]]
Former-commit-id: 74b806cbb7
Former-commit-id: 79e3db1c47 [formerly b02c52e887]
Former-commit-id: e575132d51
2014-07-16 15:05:45 -05:00
Steve Harris
6682b900c9 Omaha #3300 moving 15.1.1 deltascript back into 14.4.1
Former-commit-id: 17ec38ef34 [formerly b9a02bf34a] [formerly 17ec38ef34 [formerly b9a02bf34a] [formerly 74fff3659f [formerly 33cde5250c39fda59bbb08d7b8075cb5645c028f]]]
Former-commit-id: 74fff3659f
Former-commit-id: 611a8d3f1e [formerly 672709571d]
Former-commit-id: c39ac82323
2014-07-16 14:53:18 -05:00
Steve Harris
f5d6fb1dee Merge branch 'omaha_15.1.1' into omaha_14.4.1
Former-commit-id: 76d548cdc4 [formerly 308246ac7b] [formerly 76d548cdc4 [formerly 308246ac7b] [formerly 5e04680687 [formerly 7605f77e2027026c83c0cc4c1e27ba617efbe70f]]]
Former-commit-id: 5e04680687
Former-commit-id: 08b4236055 [formerly 588bd8dda3]
Former-commit-id: ec1a1bbbf1
2014-07-16 13:21:53 -05:00
Benjamin Phillippe
ec91eaed8f Omaha #3350 Added user/role authentication. Added XACML authorization
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df

Former-commit-id: d4997f5a90 [formerly cebfbebea6] [formerly d4997f5a90 [formerly cebfbebea6] [formerly 6cb73e63a1 [formerly 81d0249971d4004067b6aef672e00417ddb83b36]]]
Former-commit-id: 6cb73e63a1
Former-commit-id: 6959bdcdb2 [formerly 576e2eb0f8]
Former-commit-id: b0ddc103a7
2014-07-16 10:49:24 -05:00
Brian Clements
5adc1da0ac Omaha #3373 jaxb manager refactor
api changes
reworked ogc jaxb manager to use parent class

Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48

Former-commit-id: 33684f3c97 [formerly e4c85f7cd5] [formerly 33684f3c97 [formerly e4c85f7cd5] [formerly e428f257cb [formerly 125c31f035057676d8c97a9b6c7a1d7b1b7f5bcb]]]
Former-commit-id: e428f257cb
Former-commit-id: cf3bc3e4f4 [formerly 58a4410763]
Former-commit-id: 80ae53ed0f
2014-07-16 09:00:59 -05:00
David Gillingham
58044f4592 Omaha #3389: Add ability for deploy-install.xml to run WA-specific deploy script for standalone components.
Change-Id: I39fe60ae80c8a62b9ed6052e353e314783bba999

Former-commit-id: f9ca189dfc [formerly fc715e98a5] [formerly f9ca189dfc [formerly fc715e98a5] [formerly afc28adc7a [formerly 334cfcf418b0659b496088d7ac2b2f111cf8bc72]]]
Former-commit-id: afc28adc7a
Former-commit-id: 922a586bf5 [formerly 9295534bea]
Former-commit-id: 00e01257ff
2014-07-15 16:00:46 -05:00
Richard Peter
6e58663cb6 Merge "Omaha #3184 throw incompatible request exceptions when trying to get levels on FFMP or IHFS" into omaha_15.1.1
Former-commit-id: 6eb299d022 [formerly 58628db2c5] [formerly 6eb299d022 [formerly 58628db2c5] [formerly 0a24d7452f [formerly 95816d39509fa3499494b369ad09fb026c07108d]]]
Former-commit-id: 0a24d7452f
Former-commit-id: f44852d4e1 [formerly b3583a805d]
Former-commit-id: f82c1d522e
2014-07-14 17:05:22 -05:00
Richard Peter
d5ea4c44bd Issue #3146 Fix alert viz log statement.
Change-Id: Id55d73a77b7f408e02ea6fe6d528650839e535d0

Former-commit-id: 148bbebd42 [formerly e484749e1c] [formerly 148bbebd42 [formerly e484749e1c] [formerly 216d3ba749 [formerly deef73c921f9ba90b3db0f5793355f05ae861ffa]]]
Former-commit-id: 216d3ba749
Former-commit-id: 1a861317f9 [formerly dbb440eeb4]
Former-commit-id: 5230703065
2014-07-14 17:01:53 -05:00
Roger Ferrel
d2f1b81551 Omaha #3344 Updated import for GRID_FILL_VALUE.
Former-commit-id: 8fdfb4b6e2 [formerly 3ce6447418] [formerly 8fdfb4b6e2 [formerly 3ce6447418] [formerly 88aa28c46b [formerly d490bc82905d37ad284485d30a493c1fd7e3ed6f]]]
Former-commit-id: 88aa28c46b
Former-commit-id: 2ab74b9b59 [formerly 805a26bbd0]
Former-commit-id: b439bc92aa
2014-07-14 17:01:32 -05:00
Nate Jensen
1731505de4 Omaha #3184 throw incompatible request exceptions when trying to get
levels on FFMP or IHFS

Change-Id: I599799cc95835708fdb48b6ce8a8e977daceff26

Former-commit-id: 8cc62dae6b [formerly 9c1e33521e] [formerly 8cc62dae6b [formerly 9c1e33521e] [formerly a1dadba524 [formerly 2fdb210c8fe8e6763b6a6422b5710c35ee7e48a8]]]
Former-commit-id: a1dadba524
Former-commit-id: 29816caa7e [formerly fcd43442ad]
Former-commit-id: 864615a083
2014-07-14 14:25:51 -05:00
Steve Harris
bd9067626f Merge branch 'omaha_14.4.1' into omaha_15.1.1
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java

Former-commit-id: a893b9b08a [formerly 05de3fbe54] [formerly a893b9b08a [formerly 05de3fbe54] [formerly a43ffbe052 [formerly 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3]]]
Former-commit-id: a43ffbe052
Former-commit-id: 6920a273e5 [formerly 202c1a0316]
Former-commit-id: 7bf6b4de06
2014-07-14 12:08:09 -05:00
Steve Harris
ff86c20fb8 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 27b08f8bcd [formerly 0cb8d202f5] [formerly 27b08f8bcd [formerly 0cb8d202f5] [formerly 4df5ae5a60 [formerly f352b47e1d930bfe2bc46f956c781375881e41f9]]]
Former-commit-id: 4df5ae5a60
Former-commit-id: bf236d5aa1 [formerly 51d4907b76]
Former-commit-id: 8f9ab0a62c
2014-07-14 11:54:53 -05:00
Nate Jensen
fd9475853b Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
Former-commit-id: a55162c74b [formerly 2531649c55] [formerly a55162c74b [formerly 2531649c55] [formerly 9f58d2e08b [formerly 97a0d0d8be7dd87e472dc0422a68df94d43095e1]]]
Former-commit-id: 9f58d2e08b
Former-commit-id: 289a4bf786 [formerly 363766fcca]
Former-commit-id: ad23d7e95d
2014-07-14 11:15:01 -05:00
Brian Clements
b08210f013 Omaha #2587 update script to set reftime as non null in db
Change-Id: Ibcfb61b607645fcbb91e793f2088c8fb7432ecf4

Former-commit-id: fbf4111d6c [formerly 2a5af8ce1f] [formerly fbf4111d6c [formerly 2a5af8ce1f] [formerly faa29355b0 [formerly dfafe89ab5cb4589d2408564b82a03adc9fc1143]]]
Former-commit-id: faa29355b0
Former-commit-id: b52e7ef948 [formerly ade89ff05d]
Former-commit-id: 9d739ff37f
2014-07-14 08:40:37 -05:00
Brian Clements
d8ce5db467 Omaha #3371 all subprocesses now killed when cave.sh is killed
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2

Former-commit-id: 0973e5ac41 [formerly 7e70fbda27] [formerly 0973e5ac41 [formerly 7e70fbda27] [formerly ae5fa893a9 [formerly e4becce5325aad266fd93548d27e5e122b145011]]]
Former-commit-id: ae5fa893a9
Former-commit-id: a1bce34fda [formerly e72c34d361]
Former-commit-id: 272c0a2e2d
2014-07-14 08:05:18 -05:00
Richard Peter
878c3fe29e Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
Former-commit-id: 88419fb8f3 [formerly 0222a89cd4] [formerly 88419fb8f3 [formerly 0222a89cd4] [formerly 1c40dc11ef [formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]]]
Former-commit-id: 1c40dc11ef
Former-commit-id: d16ddba2f5 [formerly 2b75d79e0f]
Former-commit-id: d1af1f615d
2014-07-11 17:46:14 -05:00
Brian Clements
b384c87dff Omaha #3333 added grid lightning to cave
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221

Former-commit-id: 555251982b [formerly a50f1e8e70] [formerly 555251982b [formerly a50f1e8e70] [formerly 29fc7e7ec4 [formerly 33736a713a2c360e70f5a06972a7a21937f2b34c]]]
Former-commit-id: 29fc7e7ec4
Former-commit-id: 140a4a4b15 [formerly e25961a39a]
Former-commit-id: db47c98989
2014-07-11 12:18:05 -05:00
Benjamin Phillippe
0c80abcc15 Omaha #3379 Removing DWR
Former-commit-id: cc9e9b427a [formerly d110e8428b] [formerly cc9e9b427a [formerly d110e8428b] [formerly 4e1d93abf8 [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: 5eea012728 [formerly 06e73cd55f]
Former-commit-id: 11a8186cbc
2014-07-11 11:56:44 -05:00
Brian Clements
f9af313995 Omaha #3364 added jmap -heap to capture script
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153

Former-commit-id: 146318e49e [formerly 82cf017cbe] [formerly 146318e49e [formerly 82cf017cbe] [formerly d5506736df [formerly 65c88529acfb31c408777337f456da5dce879146]]]
Former-commit-id: d5506736df
Former-commit-id: 10a01f3556 [formerly 2c4fb16c12]
Former-commit-id: c134d1f514
2014-07-11 10:20:48 -05:00