Brian Clements
|
10956e859c
|
Omaha #3675 startup shutdown log name includes child pid
fixed capture
Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7
Former-commit-id: 3207d12d51 [formerly 78c2aa3650] [formerly 3a12ab9bdf] [formerly 3207d12d51 [formerly 78c2aa3650] [formerly 3a12ab9bdf] [formerly 6d6d3d26e6 [formerly 3a12ab9bdf [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]]]]
Former-commit-id: 6d6d3d26e6
Former-commit-id: 9a6cadddef [formerly d2042e3485] [formerly 48621bab7fab090a86fae6efa6712fd9419d4b52 [formerly 470a695a1a]]
Former-commit-id: 48bcd5641ac621600750d0346b7d8a2f58f7c784 [formerly cf3e570667]
Former-commit-id: 46845ee755
|
2014-10-13 16:32:41 -05:00 |
|
Nate Jensen
|
18d63be7ec
|
Omaha #3675 cave.sh changes to ensure logfile pids match actual cave pid
Change-Id: Ibabf5e3f053c8796b70bb95de2459374891f7e59
Former-commit-id: 325a15e08f [formerly 5ae522c32a] [formerly b24faf99cd] [formerly 325a15e08f [formerly 5ae522c32a] [formerly b24faf99cd] [formerly 3eada560b7 [formerly b24faf99cd [formerly 12b8010ec08ec512a79d90b5ae3b3403acfa1c8c]]]]
Former-commit-id: 3eada560b7
Former-commit-id: 42b8cc19a1 [formerly 06a4cab622] [formerly 4d3864f439ff22df17470ff82898859a32ccc9e0 [formerly 26e9011f35]]
Former-commit-id: 30b2c101782c31faaa65ea59774ebdff9397595a [formerly 796db7518e]
Former-commit-id: 9acc1b0b57
|
2014-10-13 09:34:22 -05:00 |
|
Richard Peter
|
6c2cfadf4c
|
Merge "Omaha #3675 alertviz cleanly exits when killed by signal" into omaha_14.4.1
Former-commit-id: fddf14712a [formerly db0e85e501] [formerly ed2bd7a261] [formerly fddf14712a [formerly db0e85e501] [formerly ed2bd7a261] [formerly 26e4c16da4 [formerly ed2bd7a261 [formerly 5977e37b7368487867aca1cfdd362943633f92eb]]]]
Former-commit-id: 26e4c16da4
Former-commit-id: a3a6b0a554 [formerly e71b0562b5] [formerly d2e0631fa3248d80703a209983c63962831939c8 [formerly bdb3bb263d]]
Former-commit-id: df60de25e6bd0dd52c1aba0d041f5e2f0cde4782 [formerly bcc3432a9d]
Former-commit-id: 6f4a6c7f6d
|
2014-10-09 11:09:32 -05:00 |
|
Brian Clements
|
a8ee8adbad
|
Omaha #3675 alertviz cleanly exits when killed by signal
Change-Id: I0ef7c8936558ccd8b927edb64143315afcb04631
Former-commit-id: 2112fb8e60 [formerly 8d58b8d524] [formerly 119b2bff17] [formerly 2112fb8e60 [formerly 8d58b8d524] [formerly 119b2bff17] [formerly fbabf6f18d [formerly 119b2bff17 [formerly 6bc42c58541363bee9be1607b1bdf2aca6f5a000]]]]
Former-commit-id: fbabf6f18d
Former-commit-id: f7715d0c3b [formerly fa7a3e2e43] [formerly df78f5c496a36155869321af4867e6ab03d2ffb0 [formerly 6be495b787]]
Former-commit-id: b11048de8d398d05a7747684f0268aa35724516e [formerly f9e4622db7]
Former-commit-id: 0aa5f80ca8
|
2014-10-09 11:04:49 -05:00 |
|
Brian Clements
|
0be119b360
|
Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f
Former-commit-id: 84217692bf [formerly 4a824111ec] [formerly 8a4cda892f] [formerly 84217692bf [formerly 4a824111ec] [formerly 8a4cda892f] [formerly 577b3a5e11 [formerly 8a4cda892f [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]]]]
Former-commit-id: 577b3a5e11
Former-commit-id: fbffc63d5a [formerly 6ad5c3088d] [formerly 4cc2a0452da8ecf06e249d8ed7253d57b4357a97 [formerly 2de14cf885]]
Former-commit-id: 4ab31ef1abb0d696f1850c3f5c7dd3a3e55add19 [formerly 8ec3f473d7]
Former-commit-id: 3624ea94dc
|
2014-10-08 16:47:10 -05:00 |
|
Nate Jensen
|
efd471e4a9
|
Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh
Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662
Former-commit-id: 0aebb15a38 [formerly 9f74ca65bc] [formerly e964375fcc] [formerly 0aebb15a38 [formerly 9f74ca65bc] [formerly e964375fcc] [formerly 33e3281d55 [formerly e964375fcc [formerly 690868294ab74d5c3b73c12f81534d685bb652aa]]]]
Former-commit-id: 33e3281d55
Former-commit-id: 54d382fa7c [formerly 23ebf782f3] [formerly 021f3802d2585856e5af0f032cd3a2f6494ac93f [formerly 6670e31705]]
Former-commit-id: 8a5f64af32a17d5ab4c7881b654de0d811d9f419 [formerly b0e0632c7a]
Former-commit-id: e156cf3b33
|
2014-10-02 08:49:32 -05:00 |
|
Bryan Kowal
|
abbdc04cb3
|
Omaha #3481 - match additional FOSS patterns in p2-build.xml. Make it possible to specify features that should not be
built into an RPM for Work Assignments.
Former-commit-id: 0999a2c431 [formerly 5ec6da9f31] [formerly 2687b16d49] [formerly 0999a2c431 [formerly 5ec6da9f31] [formerly 2687b16d49] [formerly 1ad9e31075 [formerly 2687b16d49 [formerly 6a5bfb0e00bee647632f12d81bb532a3583f955e]]]]
Former-commit-id: 1ad9e31075
Former-commit-id: 77f8af81bf [formerly 623ae93747] [formerly 5ff12a4d2c0262aa471e34ba939dfac4844a22fb [formerly 782b92e376]]
Former-commit-id: 8e4f53e3ad010cc8defaac39d53709c400b1174e [formerly 657c028e4e]
Former-commit-id: 13cd362f8a
|
2014-08-06 17:46:39 -05:00 |
|
Brian Clements
|
f505d1221b
|
Omaha #3371 all subprocesses now killed when cave.sh is killed
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2
Former-commit-id: d6e181d301 [formerly 0973e5ac41] [formerly 7e70fbda27] [formerly d6e181d301 [formerly 0973e5ac41] [formerly 7e70fbda27] [formerly ae5fa893a9 [formerly 7e70fbda27 [formerly e4becce5325aad266fd93548d27e5e122b145011]]]]
Former-commit-id: ae5fa893a9
Former-commit-id: 97fc979b3b [formerly a1bce34fda] [formerly ef9dbe97b4271805e63ea28026e72a445813455e [formerly e72c34d361]]
Former-commit-id: dd87970cd72b7fb271a99e965d270def8120be94 [formerly 272c0a2e2d]
Former-commit-id: d8ce5db467
|
2014-07-14 08:05:18 -05:00 |
|
Brian Clements
|
8c248326c9
|
Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298
Former-commit-id: ed03db05ea [formerly 987d514fa3] [formerly 871a8655c8] [formerly ed03db05ea [formerly 987d514fa3] [formerly 871a8655c8] [formerly 0113e109d3 [formerly 871a8655c8 [formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]]]
Former-commit-id: 0113e109d3
Former-commit-id: 034bf93c29 [formerly ed9ba91d4e] [formerly 177f6db44761392bd73fa9adfd0d53bb7bd07a4b [formerly c32592fd1c]]
Former-commit-id: 6ad739e068be5779be4f5fd46af88fce9eedd972 [formerly 94f5989af7]
Former-commit-id: f2d27e2f8b
|
2014-07-10 16:31:11 -05:00 |
|
Brian Clements
|
0a5aa48230
|
Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: 92be869624 [formerly fdec99abc5] [formerly 013292ce9d] [formerly 92be869624 [formerly fdec99abc5] [formerly 013292ce9d] [formerly 2773cf8935 [formerly 013292ce9d [formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]]]
Former-commit-id: 2773cf8935
Former-commit-id: fff99d35ee [formerly 767d8abd20] [formerly 6f1522e1278daecbab2015532d3b9735aa656635 [formerly 648ffac146]]
Former-commit-id: dcb07a7cef6bd3e14b77eb9e604caed1f47d482d [formerly 6dea5ec026]
Former-commit-id: c502009375
|
2014-07-02 14:20:10 -05:00 |
|
Nate Jensen
|
a80e3727ab
|
Omaha #3165 build viz.useradmin before viz.datadelivery
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: a38a776ac6 [formerly 15d6ff7f79] [formerly f6cbccdc5c] [formerly a38a776ac6 [formerly 15d6ff7f79] [formerly f6cbccdc5c] [formerly 74e2bd1670 [formerly f6cbccdc5c [formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]]]
Former-commit-id: 74e2bd1670
Former-commit-id: 480b5b5863 [formerly db24013aa6] [formerly 75b52b38b35362eb3e87ef30cfcfd7e988c52e0c [formerly e9b31a4429]]
Former-commit-id: 3b726b72ea38dd26b8a5f934112cbe9fddad43c9 [formerly db9550e367]
Former-commit-id: f4540db824
|
2014-07-02 11:18:59 -05:00 |
|
Nate Jensen
|
2d6a340288
|
Omaha #3165 attempt to fix build
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 6f28f24afa [formerly 1373af3e55] [formerly a93af621d8] [formerly 6f28f24afa [formerly 1373af3e55] [formerly a93af621d8] [formerly 765ac1258b [formerly a93af621d8 [formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]]]
Former-commit-id: 765ac1258b
Former-commit-id: b31f618153 [formerly bbd50040a5] [formerly 54fa8041ee3052325df6cccd79220220bae3bcdd [formerly 264ac4d8a3]]
Former-commit-id: 4a6c0f0533d3de82d21896cbe01b6e6c1a176864 [formerly d1d3aa94a6]
Former-commit-id: ef967d42e3
|
2014-07-02 10:01:05 -05:00 |
|
Nate Jensen
|
be7402f054
|
Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7
Former-commit-id: e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly e9ffe3f2d6 [formerly d72b56b988] [formerly bca39f8b39] [formerly 48249301fc [formerly bca39f8b39 [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]]]
Former-commit-id: 48249301fc
Former-commit-id: 4dd144d873 [formerly 0f0e890fce] [formerly c525443c556f5d3c4e3585bc6ee865de49c0fa07 [formerly 1d6912b4dd]]
Former-commit-id: 8838747449e3a1b1a8d2c17d9a358b4e5376a19f [formerly 635e902b80]
Former-commit-id: d189ad3b7a
|
2014-06-30 15:53:41 -05:00 |
|
Brian Clements
|
984043b7b6
|
Omaha #3245 altered utility scripts to account for cave subprocess
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: bb9ea8688b [formerly 27a0d3fb28] [formerly 0f25ac3b5b] [formerly bb9ea8688b [formerly 27a0d3fb28] [formerly 0f25ac3b5b] [formerly 3b71bedd14 [formerly 0f25ac3b5b [formerly aceeff1e02c896ff27794755eb10fc275718a68c]]]]
Former-commit-id: 3b71bedd14
Former-commit-id: 2b0a3b71be [formerly 91d1378c31] [formerly 777e6a4c592f7446174da9efb1e7a8578faea8b6 [formerly be3d47e5e9]]
Former-commit-id: 02b429c884ef9326e34cb1c454c39abcfa429ef4 [formerly f1a30bf16e]
Former-commit-id: be85fe241f
|
2014-06-24 11:15:45 -05:00 |
|
Nate Jensen
|
933a80d387
|
Omaha #3245 remove -vm argument
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13
Former-commit-id: 37d6f292f1 [formerly 02372893b6] [formerly 123b22d90a] [formerly 37d6f292f1 [formerly 02372893b6] [formerly 123b22d90a] [formerly d60d2b5caf [formerly 123b22d90a [formerly 003c2d49ecc20cfae2cdefb14119e7d0b143e4c6]]]]
Former-commit-id: d60d2b5caf
Former-commit-id: 08636a5f5b [formerly 98e2cb8d62] [formerly 2cf929ecb091082bc5cd97818befbad8fe1ad67e [formerly ef20c3192e]]
Former-commit-id: 61c2610d9a6d317ba19e944b9cc1dc670350da6f [formerly 7af79aca86]
Former-commit-id: cc90e21628
|
2014-06-19 14:44:24 -05:00 |
|
Nate Jensen
|
699ab5b707
|
Omaha #3274 fix generation of viz .ini files
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: 68679fd1a5 [formerly f958ca8de2] [formerly 465a0fef71] [formerly 68679fd1a5 [formerly f958ca8de2] [formerly 465a0fef71] [formerly 17dc45e7ca [formerly 465a0fef71 [formerly dd628b80f7798bb66d3c54568b9549e66870ddec]]]]
Former-commit-id: 17dc45e7ca
Former-commit-id: 01cc17d563 [formerly fe17c9b8b9] [formerly 411a680a4d434801099ce173642a2327e3a87bab [formerly a9fc46a6fb]]
Former-commit-id: a985db7a3369f6d16bfd621324342acfe77dfc86 [formerly 4129bd518d]
Former-commit-id: 787b6d8a60
|
2014-06-18 10:03:17 -05:00 |
|
Nate Jensen
|
efb7cf3eed
|
Omaha #3245 fix GFE starting without a cave data
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 3828961fa0 [formerly 2ce0e5aee5] [formerly 19aa9dc96e] [formerly 3828961fa0 [formerly 2ce0e5aee5] [formerly 19aa9dc96e] [formerly 8ab7d86a8f [formerly 19aa9dc96e [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]]]
Former-commit-id: 8ab7d86a8f
Former-commit-id: f9b14d08c5 [formerly 5129fee3e6] [formerly cdb1fa18b658fe4839af6b138e615f2a46f7a0db [formerly 451b265ce6]]
Former-commit-id: ebea420f2290075cc42ea3c5f473c33e49cfb16a [formerly e59c180fdc]
Former-commit-id: 11753fc2d3
|
2014-06-17 16:31:20 -05:00 |
|
Nate Jensen
|
3c62a1a906
|
Omaha #3274 switch viz to G1 garbage collector
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 172777137a [formerly 14a520dbd9] [formerly 4a91c3320b] [formerly 172777137a [formerly 14a520dbd9] [formerly 4a91c3320b] [formerly 44cb0e6ae6 [formerly 4a91c3320b [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]]]
Former-commit-id: 44cb0e6ae6
Former-commit-id: a115e851fb [formerly 439e037d03] [formerly a3713f79ee49f1e6f01c9ebf4f56ac3cf08b2e8c [formerly 3981241355]]
Former-commit-id: b6228cb159c4073552fff5ecb789b070f81770b9 [formerly fe47ecf6ce]
Former-commit-id: 54b72c7108
|
2014-06-17 10:54:57 -05:00 |
|
Nate Jensen
|
4b0575e6f4
|
Omaha #3247 upgrade build.cave's xalan jar
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434
Former-commit-id: b19785409f [formerly 1a94d51831] [formerly d4471bf759] [formerly b19785409f [formerly 1a94d51831] [formerly d4471bf759] [formerly 95fe41966a [formerly d4471bf759 [formerly c2d32dddb2bba04b46099d8745ff541989e1a281]]]]
Former-commit-id: 95fe41966a
Former-commit-id: d8fb659d3e [formerly 08b53fe0fe] [formerly 742e659e07d4715632082d2607cfa0cbb343649e [formerly a6fa27a1b8]]
Former-commit-id: fb4eb629a6ea9c6fbc160bc4a8221664b7928424 [formerly 7fac05ac42]
Former-commit-id: 6f25339365
|
2014-06-12 11:38:22 -05:00 |
|
Steve Harris
|
cf2950abdb
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
|
2014-05-27 14:48:24 -04:00 |
|
Brian.Dyke
|
0febfec9e7
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: a6b42a776b [formerly b0837b4905] [formerly 91d88625eae6852df94fbb04133d89826c605aad [formerly 68f3a0169e]]
Former-commit-id: c54c6441e46c95271889db670ff46e1bedce8459 [formerly f87775928f]
Former-commit-id: 1d53f6d304
|
2014-05-14 16:08:16 -04:00 |
|
Bryan Kowal
|
0f31d0f4e3
|
Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: aacf4cd27a [formerly a352aadc90] [formerly 3535340136] [formerly aacf4cd27a [formerly a352aadc90] [formerly 3535340136] [formerly 8d5326cc1b [formerly 3535340136 [formerly 2b13221d7c644147f6eda1acb8b126667be00926]]]]
Former-commit-id: 8d5326cc1b
Former-commit-id: 1f5cd33be3 [formerly 1c64a47950] [formerly d3a06fdc9c2c6bb26a6dce8456bf87bd02b9492d [formerly 43eddea171]]
Former-commit-id: acd94bad9932a841706c10b0b8ac148bbe3c6f9f [formerly 4e3afb78fc]
Former-commit-id: ddf6cc758d
|
2014-05-13 14:43:04 -05:00 |
|
Shawn.Hooper
|
2490ae23eb
|
ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml
Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930
Former-commit-id: 5f03948ff5 [formerly 9182d8428a] [formerly a3e52e8cea] [formerly 5f03948ff5 [formerly 9182d8428a] [formerly a3e52e8cea] [formerly b4597dc021 [formerly a3e52e8cea [formerly 968a136e81b6247a03af9b78643c388d21a4218b]]]]
Former-commit-id: b4597dc021
Former-commit-id: a18261fed2 [formerly 1e4aeb5842] [formerly a33e6c43b4f06a881d7c8dd2482f3b36b99ffad5 [formerly eeaba5539f]]
Former-commit-id: b7ce6a6c977382c082a9531f683d1cb8e9dab4e7 [formerly 947b31eb6e]
Former-commit-id: b8a3b168d2
|
2014-04-25 10:40:43 -04:00 |
|
Richard Peter
|
626ab0bd58
|
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54]
Former-commit-id: a22345ea6b
|
2014-04-11 16:23:09 -05:00 |
|
David Friedman
|
8ea6e0b064
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1e4ac84f99 [formerly 1168a3eae5] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]]
Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3]
Former-commit-id: 8f8f55dd3c
|
2014-03-27 19:17:03 +00:00 |
|
Bryan Kowal
|
7cf013ef34
|
Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
Former-commit-id: d455d71216 [formerly 911c0a99c9] [formerly a554dc8c20] [formerly d455d71216 [formerly 911c0a99c9] [formerly a554dc8c20] [formerly 286051cbb9 [formerly a554dc8c20 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]]
Former-commit-id: 286051cbb9
Former-commit-id: 718bbc47f4 [formerly f0f10e2544] [formerly 92b3111cb9f6f27db1c947559a4696fd1d1b0a4b [formerly 6b28f08242]]
Former-commit-id: ce22ec280d942b3e0262be01d99c367f30ddd085 [formerly f5c1cf750b]
Former-commit-id: 6dc3ae2214
|
2014-03-26 14:57:46 -05:00 |
|
Bryan Kowal
|
55d6a3d893
|
Issue #2851 - 64-bit gridslice library for Windows
cave/build/static/win32.amd64/cave/lib/gridslice.pyd: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly
Former-commit-id: 4e4f55eb6c [formerly 065e1dac5e] [formerly 37a6b85483] [formerly 4e4f55eb6c [formerly 065e1dac5e] [formerly 37a6b85483] [formerly 53d1b8bcbb [formerly 37a6b85483 [formerly 687a060d44c88723de7f775925536adb9f71a257]]]]
Former-commit-id: 53d1b8bcbb
Former-commit-id: 5e07b5f00d [formerly 77601dbb9f] [formerly e2ae36264143a5a4e9f00cb98512d5d27750943e [formerly dcaac3d61d]]
Former-commit-id: c95efa5e24ae795fb1c31d13c054b1b9f956a07a [formerly 95f181f95f]
Former-commit-id: 6a9e1fec9c
|
2014-03-25 13:03:44 -05:00 |
|
Steve Harris
|
24c55c616c
|
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 1dd9192564 [formerly 5efb16fa8b] [formerly d0aeb854f5] [formerly 0c2c5ad4bd [formerly d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]]]]
Former-commit-id: 0c2c5ad4bd
Former-commit-id: 016a659753 [formerly 5d95d594f8] [formerly 0a080d6ea36c63666072fb90d560b4b114c279fb [formerly b5a2d2237f]]
Former-commit-id: fde598cdbbe0d12d61ab87081d43c79970894959 [formerly 3a82fa7ac6]
Former-commit-id: a936941dff
|
2014-03-17 15:55:41 -05:00 |
|
Brian.Dyke
|
85d43db6af
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 670c673e8a [formerly 24a63fb05a] [formerly 030a18f804] [formerly 670c673e8a [formerly 24a63fb05a] [formerly 030a18f804] [formerly 30084d7f84 [formerly 030a18f804 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]]]]
Former-commit-id: 30084d7f84
Former-commit-id: 024d49d48b [formerly 916fec5a4f] [formerly ef3d48a76a5bbff4e7d32e4ab3916273c583f0ec [formerly 2109409b24]]
Former-commit-id: 45c14c936cdd09a6b0550940abd94e61b8350680 [formerly f20020876a]
Former-commit-id: 92ed2895fb
|
2014-03-14 10:15:53 -04:00 |
|
Kevin P. Johnson
|
fd16da4ae4
|
ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67
Former-commit-id: c791f55d02 [formerly e3a951da78] [formerly b2797a0788] [formerly c791f55d02 [formerly e3a951da78] [formerly b2797a0788] [formerly 4c833d3389 [formerly b2797a0788 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]]]]
Former-commit-id: 4c833d3389
Former-commit-id: 54316530e4 [formerly 32b372db4b] [formerly 6cd2437734cdee7992443a141d1ae3334e20f72d [formerly 17a4229072]]
Former-commit-id: 692a687b6edde3278b185df9e4ad90705444abee [formerly eb12ec9c14]
Former-commit-id: 90a9e642e3
|
2014-03-13 20:42:12 +00:00 |
|
Richard Peter
|
493e805cbe
|
Merge branch 'omaha_14.2.1' (14.2.1-11) into development
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1
Former-commit-id: 751b37616e [formerly 042468f761] [formerly 7af0cfaf38] [formerly 751b37616e [formerly 042468f761] [formerly 7af0cfaf38] [formerly 7ebbc0cf78 [formerly 7af0cfaf38 [formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]]]]
Former-commit-id: 7ebbc0cf78
Former-commit-id: abf39442ba [formerly f5e1fb569a] [formerly 67499353bc5b2802a0bbc17ca5f119b6ddd6836d [formerly e8ea7b80e6]]
Former-commit-id: cbe3cfa55d05a9b0aaca0d648dd1b36fd4c563be [formerly e2ae7de485]
Former-commit-id: 8b425fed86
|
2014-03-12 09:47:29 -05:00 |
|
Nate Jensen
|
611915a88c
|
Issue #2779 update memory settings for renamed NC perspective
Former-commit-id: ebf5186d75 [formerly 17aa39ce0a] [formerly ccb06db199] [formerly ebf5186d75 [formerly 17aa39ce0a] [formerly ccb06db199] [formerly 5eb892f4cf [formerly ccb06db199 [formerly bc1c10ee0039906ec0b48e834e533332611ac0d3]]]]
Former-commit-id: 5eb892f4cf
Former-commit-id: 219f232fcb [formerly 42c545804c] [formerly dc64b4c9b5a35e0a38967549f2d086cd34c1fedf [formerly 22ff235bcf]]
Former-commit-id: c46da055ba6866f0ae818586090fa0544db52dc7 [formerly 15a2fb216e]
Former-commit-id: 391deee18c
|
2014-03-11 10:28:01 -05:00 |
|
Steve Harris
|
52b2a36583
|
Merge branch 'omaha_14.2.1' (OB_14.2.1-11) into development
Former-commit-id: d8badc8bea [formerly e62a399e9f] [formerly 4c52fb5bb3] [formerly d8badc8bea [formerly e62a399e9f] [formerly 4c52fb5bb3] [formerly cfc9fea413 [formerly 4c52fb5bb3 [formerly 7be5e87cee69f0d20ae8d01a10b65f2fcadb0ba3]]]]
Former-commit-id: cfc9fea413
Former-commit-id: 15035a01cc [formerly 0c0bc58b3e] [formerly 47d576172614afbe5d714782f88cfa8fc696489d [formerly 57f2a3204e]]
Former-commit-id: 773d007dceef6da9d83355be4f40dbf2ad6307ff [formerly 51150e544b]
Former-commit-id: b40eee35c7
|
2014-03-10 16:01:16 -05:00 |
|
Nate Jensen
|
c508c4d9bb
|
Issue #2779 add .ini generation of memory settings for other components
Former-commit-id: b77dde280f [formerly 5a88f31a2b] [formerly 6a75fe686a] [formerly b77dde280f [formerly 5a88f31a2b] [formerly 6a75fe686a] [formerly d599db4af2 [formerly 6a75fe686a [formerly 71a7f485c5a32caeabc98f23164c9fc87cfa1787]]]]
Former-commit-id: d599db4af2
Former-commit-id: d32d855bb2 [formerly 39aa26c2b6] [formerly 097c1a455c355cc0ebe8f7b95797516bfc05c8c6 [formerly 5094008bea]]
Former-commit-id: fdddd15a0dc1ec336fdf3059c126c4240f794f5c [formerly 19a0cfb972]
Former-commit-id: 6bafc51abe
|
2014-03-10 10:03:02 -05:00 |
|
Steve Harris
|
9c0f484340
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae [formerly c24108e75b] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433]
Former-commit-id: ed7921643c
|
2014-03-07 15:43:40 -06:00 |
|
Steve Harris
|
3348f6857a
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: a94f800324 [formerly 4d1fbf8743] [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]]
Former-commit-id: 0b70d2b7739772b630136c56408866dc53a2bdcd [formerly ea01373320]
Former-commit-id: e29b96b6bd
|
2014-03-07 15:16:18 -06:00 |
|
Brian.Dyke
|
603695a2a4
|
Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: c2449e7821 [formerly a0e3f08fce] [formerly 394076196b] [formerly c2449e7821 [formerly a0e3f08fce] [formerly 394076196b] [formerly 7b798ab5d2 [formerly 394076196b [formerly 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7]]]]
Former-commit-id: 7b798ab5d2
Former-commit-id: eb6abe6faa [formerly fa189c0ef6] [formerly e502d460a99724c0ff3efb14c8d0f8d731aad320 [formerly 6ced1bedc2]]
Former-commit-id: c243cc113e92d596862d61e7a6a2878bf1eafda3 [formerly c8b3730fef]
Former-commit-id: ac07a4fc49
|
2014-03-07 09:01:09 -05:00 |
|
Brian.Dyke
|
b8ee763baa
|
Merge branch 'fun_merge' into master_14.2.1
Former-commit-id: e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly e1cc8eb59a [formerly 0bbf137b05] [formerly 312cd8a3e8] [formerly 6414bdab57 [formerly 312cd8a3e8 [formerly bb169bc0992f28fe1527cb0106771c35415cea24]]]]
Former-commit-id: 6414bdab57
Former-commit-id: 50621ec3e5 [formerly 2eec413d72] [formerly 1e0890d0f70a0aeffbbcabd7f8be3e396daae297 [formerly 2f94480121]]
Former-commit-id: d006a47edee1a1939aadf15ef61024f22a80931d [formerly 8f2271403d]
Former-commit-id: da36dde938
|
2014-03-07 08:57:07 -05:00 |
|
Brian.Dyke
|
ed94e1bc6b
|
14.1.1-22 baseline
Former-commit-id: 1dcc56775d [formerly fe30e1d545] [formerly 21f17d4f9b] [formerly 1dcc56775d [formerly fe30e1d545] [formerly 21f17d4f9b] [formerly 08d8f1a0ee [formerly 21f17d4f9b [formerly ae37ad5bac445251d1456f37588819fccfede061]]]]
Former-commit-id: 08d8f1a0ee
Former-commit-id: 3c9cde458a [formerly 9406a1d6c0] [formerly f1658f5e11228e084b4f3ed536ccf891c20f621a [formerly a4c136fd60]]
Former-commit-id: 385ffc492ff49872acfb40d1c47fffb7dff76ec2 [formerly 067802b104]
Former-commit-id: c1dab50ce0
|
2014-03-07 08:49:00 -05:00 |
|
Brad Gonzales
|
81c47e89ba
|
Issue #2885 Updated java version in build.properties.p2.
Change-Id: Ifb266696902142ab59977025ae75010540836ed5
Former-commit-id: 5cdaee1f29 [formerly dadcd2e10b] [formerly 2e224094ad] [formerly 5cdaee1f29 [formerly dadcd2e10b] [formerly 2e224094ad] [formerly b47dc5df40 [formerly 2e224094ad [formerly d1f3c5e508cf268198531a31fd3a91faba0159df]]]]
Former-commit-id: b47dc5df40
Former-commit-id: 57edccd75d [formerly 574f6f8d92] [formerly ed7d205dcc0e144d1e2e5f8235030437d4f247ca [formerly 66386f340a]]
Former-commit-id: 17ffdf3bef26803fabc92808abfef89b3f6355e2 [formerly 7b3b48d9b3]
Former-commit-id: c50ea20d9e
|
2014-03-06 17:35:43 -06:00 |
|
Brad Gonzales
|
e7295b16d2
|
Issue #2885 Updated all of the PDE builds to Java 1.7.
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly 885a9567bc [formerly a24cbcfa77] [formerly 0e3dc17872] [formerly dea17a19da [formerly 0e3dc17872 [formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]]]]
Former-commit-id: dea17a19da
Former-commit-id: 09c083ce1f [formerly 4ba60d8a6f] [formerly f2869efb05c763771e03bc02057aa196d29b6d1a [formerly 78d35d4033]]
Former-commit-id: f70dd002a68a434eb5e81131bb0b82d4784e717e [formerly c4064160ec]
Former-commit-id: 4cbc3b1b05
|
2014-03-06 16:29:37 -06:00 |
|
Brian.Dyke
|
db44e7f0ec
|
ASM #124 - Display GLD360 lightning data
Former-commit-id: 972c2c284b [formerly bd81ebd8c2] [formerly db274c890f] [formerly 972c2c284b [formerly bd81ebd8c2] [formerly db274c890f] [formerly eefe8c45fe [formerly db274c890f [formerly 1edba9216beac913f9bd867da9988e213394a396]]]]
Former-commit-id: eefe8c45fe
Former-commit-id: 6ef9f7fd37 [formerly 26140187b1] [formerly 44a38ade0727afc9f135777d46659f273033a036 [formerly b657767cb1]]
Former-commit-id: 5fde31dc71e51a7f747df35d265aff302392ec26 [formerly b9e9126e11]
Former-commit-id: 8de6b2d57b
|
2014-03-06 10:54:15 -05:00 |
|
Steve Harris
|
a19beb1e5d
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
c8111a7ebb
|
OB_14.1.1-21 baseline
Former-commit-id: 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]]
Former-commit-id: 29681c7ca4
Former-commit-id: c1ef56e0d7 [formerly c68649b4f9] [formerly 146eb0a75db603df40a613354b8cbc0908ec3abb [formerly 7cad374af5]]
Former-commit-id: db6e513aaa9a15a7b11a5aee1b3716c9a5587928 [formerly 079cc93f89]
Former-commit-id: ea56516bf5
|
2014-03-04 11:47:42 -05:00 |
|
Richard Peter
|
ef2ff1d0f7
|
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
|
2014-02-27 15:18:26 -06:00 |
|
Richard Peter
|
7f36cf564b
|
Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: 63da19f472 [formerly c267c5a08f] [formerly 86d42ed603] [formerly 63da19f472 [formerly c267c5a08f] [formerly 86d42ed603] [formerly 862069dfd3 [formerly 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]]
Former-commit-id: 862069dfd3
Former-commit-id: 9f43d8e4b2 [formerly 237ada7b8b] [formerly 2ae63270ca0112aca619a0c7564fa8a1154ef4f9 [formerly c0d495d9c3]]
Former-commit-id: 1a965b16ce71e4ece17a9ac8efbc506a1d823b59 [formerly 9489565efb]
Former-commit-id: 68eade49a2
|
2014-02-27 13:46:47 -06:00 |
|
Richard Peter
|
0f7ab600e6
|
Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: ae39697315 [formerly a23c8f2c27] [formerly 729d608a15] [formerly ae39697315 [formerly a23c8f2c27] [formerly 729d608a15] [formerly d54fee5dae [formerly 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]]
Former-commit-id: d54fee5dae
Former-commit-id: 3b09c69f65 [formerly 67093287a0] [formerly 08cbaa7fb54883ec7360be105a26ab8de2e57993 [formerly 229437773b]]
Former-commit-id: c9048aab5203dfd97a994e794f6e95e3997674d5 [formerly 9ca22fce7f]
Former-commit-id: 8d35f1ce5f
|
2014-02-27 13:20:49 -06:00 |
|
Brian.Dyke
|
7316b34ef5
|
OB_14.1.1-20 baseline
Former-commit-id: 2613e13e08 [formerly b2401d2f0d] [formerly 324696c436] [formerly 2613e13e08 [formerly b2401d2f0d] [formerly 324696c436] [formerly 2bad40cfee [formerly 324696c436 [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]]
Former-commit-id: 2bad40cfee
Former-commit-id: 89b66fcb5b [formerly c873f20d04] [formerly ed8e6914deb29235289414c9240bc93a504f11a5 [formerly 16117255f3]]
Former-commit-id: 9b0f4d8a2c398c18300fab2c3d13cb0bf783a1ef [formerly 5feadbe4d9]
Former-commit-id: f9587d39d1
|
2014-02-26 17:39:15 -05:00 |
|
Brian.Dyke
|
de9e6553a9
|
OB_14.1.1-19 baseline
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb [formerly c41dd22ff2] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564]
Former-commit-id: f86f9f8918
|
2014-02-21 06:50:59 -05:00 |
|
Ron Anderson
|
c3b687b9a5
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 410f956cff [formerly e7f2b6883d] [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 32bcf9d0d0 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 8779564e3a [formerly 0135771eec] [formerly daf9f7ed0c92599e36d2d85d87483ca351cda108 [formerly d4ba9eba94]]
Former-commit-id: 55baedb811a56a020df3ba68f97e40ee6307fb4c [formerly 68e03bf02f]
Former-commit-id: 8a7af092f2
|
2014-02-18 10:45:20 -06:00 |
|