Steve Harris
|
82204ef840
|
Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 79a5171143 [formerly a8a97501ac] [formerly a16abe1b8b] [formerly 79a5171143 [formerly a8a97501ac] [formerly a16abe1b8b] [formerly 9de825c332 [formerly a16abe1b8b [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]]]]
Former-commit-id: 9de825c332
Former-commit-id: 2955b2190c [formerly 548f32e067] [formerly 29ce0315e9304041fd7bae8c79ce27a5695cbd1b [formerly 5e6aa15038]]
Former-commit-id: 64fc53589e5e7392560fcbddd6c72901e00e8798 [formerly 2695a061f4]
Former-commit-id: 399b05ad5e
|
2014-11-10 08:42:01 -06:00 |
|
Nate Jensen
|
ee100addef
|
Merge "Omaha #3760 Derived parameter definitions should be split to appropriate plugins" into omaha_14.4.1
Former-commit-id: 6fe6b01722 [formerly 58306dab17] [formerly d5f3bc859e] [formerly 6fe6b01722 [formerly 58306dab17] [formerly d5f3bc859e] [formerly caa74b3938 [formerly d5f3bc859e [formerly abd111e667be780e9e5eb3c416b7e4fcf73f5e9a]]]]
Former-commit-id: caa74b3938
Former-commit-id: e77259e591 [formerly 272fc19c16] [formerly 0ed52515b62cd9acfa8339619b697aa3c8288b2d [formerly 0bf717f338]]
Former-commit-id: 225a8353b6a16fbadcd9a855f349851ff07b7b3b [formerly bee42bdcf1]
Former-commit-id: e0354cc22c
|
2014-11-07 13:35:57 -06:00 |
|
Mark Peters
|
58c23f1396
|
Omaha #3760 Derived parameter definitions should be split to appropriate plugins
Change-Id: I9dfd7623b778e64982dd2de6f00d944c90401611
Former-commit-id: 5ae124cae7 [formerly 9d6ddb5cec] [formerly 2ee1a9b31f] [formerly 5ae124cae7 [formerly 9d6ddb5cec] [formerly 2ee1a9b31f] [formerly 54139d0b0c [formerly 2ee1a9b31f [formerly d4da6be1b1972df984ea1fb3eb1c5476af5d4cfa]]]]
Former-commit-id: 54139d0b0c
Former-commit-id: 4e1538e5bd [formerly 7ee53bf981] [formerly 469c7cd309cb16b77dadf924ee81bafd29c729d8 [formerly cee5c4fc4b]]
Former-commit-id: 5950e74cdc32c12fbeb7b538c9389db9fdaef686 [formerly 8ab327d689]
Former-commit-id: 0a37ff3dfb
|
2014-11-07 12:09:04 -06:00 |
|
Lee Venable
|
de831033f5
|
Merge "Omaha #3667 - Corrected functionality of dialog." into omaha_14.4.1
Former-commit-id: 00865caec7 [formerly bac800fb79] [formerly b9ae93b31d] [formerly 00865caec7 [formerly bac800fb79] [formerly b9ae93b31d] [formerly 6e70e2edd7 [formerly b9ae93b31d [formerly d0812d4d7ce5a01f6a5de7ceea84dd098f3c4354]]]]
Former-commit-id: 6e70e2edd7
Former-commit-id: e55b12424f [formerly 7218fb48b0] [formerly 2754c67d90437338b33c019b236067735f4a7397 [formerly 83b8275545]]
Former-commit-id: 503ceba9b3ee044bd2308e8402ba7c136ff6617c [formerly 04814b0e58]
Former-commit-id: 1aa3af7535
|
2014-11-07 12:07:12 -06:00 |
|
Richard Peter
|
648e5f1446
|
Merge "Omaha #3643 Archive menu entries consolidated under Archive." into omaha_14.4.1
Former-commit-id: 8091ea1c5f [formerly 2f5db5008b] [formerly 4bdb77ea6a] [formerly 8091ea1c5f [formerly 2f5db5008b] [formerly 4bdb77ea6a] [formerly 8328d538cd [formerly 4bdb77ea6a [formerly e10b35d2537f6aec5cd007e071f570734098c802]]]]
Former-commit-id: 8328d538cd
Former-commit-id: 2138c90174 [formerly f474978bb7] [formerly 65dbae9e01fe97f64db7cd515c78c6824ad87a34 [formerly c9989a4425]]
Former-commit-id: c432b974a702ed39b08c34295d15e626da16cf70 [formerly 89455a1dd5]
Former-commit-id: 494217f808
|
2014-11-07 10:01:32 -06:00 |
|
Richard Peter
|
0fb45a6aca
|
Merge "Omaha #3353 Fix deadlock that freezes cave." into omaha_14.4.1
Former-commit-id: 7a94e63ace [formerly 4608c2ff2c] [formerly b92033924b] [formerly 7a94e63ace [formerly 4608c2ff2c] [formerly b92033924b] [formerly f1499db1c3 [formerly b92033924b [formerly 24f3f08d27ac6d3e2cba7b5f6f5a3fd8e6452700]]]]
Former-commit-id: f1499db1c3
Former-commit-id: 54c4a505bc [formerly bd7a9c2327] [formerly 544038892111fa7d560a47dcff706963343f0eab [formerly 6cf6dff0f1]]
Former-commit-id: c5ac7413b3fe311a009b7ffd5d1006d26284c09e [formerly 6995c6b05c]
Former-commit-id: 532ee1b6b7
|
2014-11-07 09:50:34 -06:00 |
|
Nate Jensen
|
ede2580f12
|
Omaha #3356 fix thin client startup when localization caching is
disabled
Change-Id: I38a9299d9cc50c3e6f1b5d781c0754c2af70d478
Former-commit-id: b3a72a66c7 [formerly 62f1088e05] [formerly 6173ea452d] [formerly b3a72a66c7 [formerly 62f1088e05] [formerly 6173ea452d] [formerly 9c79b4851f [formerly 6173ea452d [formerly b4817236399d6084da219892d97b6db38d44d64a]]]]
Former-commit-id: 9c79b4851f
Former-commit-id: 03882e82a9 [formerly 88d5fa6edb] [formerly 694a6d6f5b262bf739353a45a969ddc0691324b7 [formerly 2c08bc1e38]]
Former-commit-id: 9e04f3e1903b43776c937d621eeab19a43bd0ee6 [formerly e87243e0ee]
Former-commit-id: a5f86aeaf3
|
2014-11-06 16:48:11 -06:00 |
|
Slav Korolev
|
fee32a7db1
|
Omaha #3667 - Corrected functionality of dialog.
Former-commit-id: 4c4bfa4caf [formerly 45c9b0560a] [formerly fbb9e62cfc] [formerly 4c4bfa4caf [formerly 45c9b0560a] [formerly fbb9e62cfc] [formerly 9f0b1a68e6 [formerly fbb9e62cfc [formerly cf354d6ac5668ba502feb188bdf17a0967168b19]]]]
Former-commit-id: 9f0b1a68e6
Former-commit-id: 86ce2c3b01 [formerly a49a3bbcc4] [formerly 30c397b4d689693d46f2fd6397cd152d2fc5c34b [formerly a3aaf1a744]]
Former-commit-id: 1991a0498f5dcd9f48094a5cf08d1796b85a0371 [formerly 0ba3e8d678]
Former-commit-id: 37a7beb45e
|
2014-11-06 15:24:12 -05:00 |
|
Brian.Dyke
|
346b21fb94
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
Former-commit-id: bb6e90eb2e [formerly 43b6c9ff82] [formerly 1cd471ed72] [formerly bb6e90eb2e [formerly 43b6c9ff82] [formerly 1cd471ed72] [formerly 1e7d47d2aa [formerly 1cd471ed72 [formerly b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f]]]]
Former-commit-id: 1e7d47d2aa
Former-commit-id: 653bc91a5b [formerly f2fad2a476] [formerly c28431a0aad0e60e10b4a8da7fd42e9ae7fcb70b [formerly 331a06fedb]]
Former-commit-id: 30c2b3b055199d708c7c63f16e6f0e62eb968874 [formerly 66d8327025]
Former-commit-id: 0c9c29bff8
|
2014-11-06 13:14:24 -05:00 |
|
Brian.Dyke
|
7110577c6d
|
Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 5cdd9f4256 [formerly 4ac24af0a9] [formerly aae68215c8] [formerly 5cdd9f4256 [formerly 4ac24af0a9] [formerly aae68215c8] [formerly acf00264f4 [formerly aae68215c8 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]]]
Former-commit-id: acf00264f4
Former-commit-id: 2e2d7c8172 [formerly 2743718323] [formerly d0f054998cbe947b901e2eae4a437cb153a73dde [formerly 2b470ad1a1]]
Former-commit-id: 4be36e5bccda05c1cb9a4bc60ef64c8efe6da078 [formerly 54f82d7f6f]
Former-commit-id: f25f4ecb2c
|
2014-11-06 12:55:21 -05:00 |
|
Dave Hladky
|
d8bd453375
|
Omaha #3132 merge in PDA into 14.4.1
Former-commit-id: 42338b40d3 [formerly 23f945bad9] [formerly b954a12e79] [formerly 42338b40d3 [formerly 23f945bad9] [formerly b954a12e79] [formerly ef29e2883c [formerly b954a12e79 [formerly 38944c601a800e96fbdd34d51034bb7e42ae4a27]]]]
Former-commit-id: ef29e2883c
Former-commit-id: 4407ad0ee3 [formerly df8a326878] [formerly c8943a493602dc93a62b5278c0c885f21df8a2bf [formerly d4edc92ec5]]
Former-commit-id: 409d11f03cffe41a2d01278020cafc872872150a [formerly 750200f237]
Former-commit-id: 2d38aa6ada
|
2014-11-06 09:48:54 -06:00 |
|
Dave Hladky
|
f463c96311
|
Merge branch 'omaha_pda' into omaha_14.4.1
Former-commit-id: f7025174e7 [formerly 6176578771] [formerly 1c6282503e] [formerly f7025174e7 [formerly 6176578771] [formerly 1c6282503e] [formerly 1923af2aab [formerly 1c6282503e [formerly 465a3cff39ad6f0159de561aaf6e8e89e99762ed]]]]
Former-commit-id: 1923af2aab
Former-commit-id: 5c010a7d48 [formerly 0cbbdd5755] [formerly 40efe0e356c0a8bfd513a6e8dd0e2c6199987b48 [formerly b0a481d29d]]
Former-commit-id: a9bef6f69473b1f13cac4652c40b977fb828c030 [formerly 8cd9d3bb55]
Former-commit-id: 4c18bc4e66
|
2014-11-06 09:34:39 -06:00 |
|
Steve Harris
|
34c4c701ee
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 579af18bc8 [formerly 1d162b6476] [formerly 1a8817803d] [formerly 579af18bc8 [formerly 1d162b6476] [formerly 1a8817803d] [formerly 4d0eef66f3 [formerly 1a8817803d [formerly 3fdd69aade32e40d4684da739b19a414e0ba37df]]]]
Former-commit-id: 4d0eef66f3
Former-commit-id: 4833fed904 [formerly d5303fecde] [formerly c454d4284e86e02ff12feacbb3100e6eee81af9f [formerly c2d4ce5ba0]]
Former-commit-id: 719264457554de6cf1810c7d3f86f2917b5c77d4 [formerly 4a4db9b9a1]
Former-commit-id: b05ff6ebad
|
2014-11-05 07:58:05 -06:00 |
|
Ron Anderson
|
3b1117029e
|
Omaha #3557 Fixed NPE when parm is removed from display
Change-Id: I14a82967256a788c25d049a4fd119289c909ad91
Former-commit-id: 2e42452c28 [formerly 377f1a5acb] [formerly f0b58e1daa] [formerly 2e42452c28 [formerly 377f1a5acb] [formerly f0b58e1daa] [formerly 1f0fee6536 [formerly f0b58e1daa [formerly 4ba96e15f55e276cf78b06f71d3e5d6c98bcab8b]]]]
Former-commit-id: 1f0fee6536
Former-commit-id: 2188c70a10 [formerly e8df187d74] [formerly 88c7c028b82135c0c99b09963d9d6dbb13af7608 [formerly c80c3a2661]]
Former-commit-id: 573f8bf51123c019c3ec0695b53acde3cc9401e8 [formerly 5c4a180d27]
Former-commit-id: 195085cbd9
|
2014-11-04 17:41:19 -06:00 |
|
Roger Ferrel
|
97e63339df
|
Omaha #3353 Fix deadlock that freezes cave.
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b
Former-commit-id: 733a59f2f1 [formerly 334b156d2e] [formerly 398a8d6043] [formerly 733a59f2f1 [formerly 334b156d2e] [formerly 398a8d6043] [formerly acbde703a2 [formerly 398a8d6043 [formerly 871fa68ddf242f1e63286939b1324fc3197c7336]]]]
Former-commit-id: acbde703a2
Former-commit-id: 4f012e194d [formerly 304a337a0f] [formerly 58e0390a3e30c9034645286d5dc16b8a6ec9a925 [formerly f27f2c456a]]
Former-commit-id: 0b747852fe8b43c8f636e75192d3866e9a9e20ef [formerly 4ebf8669f4]
Former-commit-id: effdc7ec2a
|
2014-11-04 14:13:29 -06:00 |
|
Steve Harris
|
a2aea9d68a
|
Merge tag 'OB_14.3.1-31m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
Former-commit-id: aca1f23f98 [formerly 472d9bd206] [formerly a5398d8035] [formerly aca1f23f98 [formerly 472d9bd206] [formerly a5398d8035] [formerly e770670ebf [formerly a5398d8035 [formerly 361f7bcf425edaf687cbfc63d4c165790b45a5bf]]]]
Former-commit-id: e770670ebf
Former-commit-id: 656299af9f [formerly e42a5d296f] [formerly 7d1363970cdca069a342dab040a10da42868bb16 [formerly 42db241877]]
Former-commit-id: 525a9c1f06f3c03a307699b4295d9e57e237bbd6 [formerly c4b8243a6e]
Former-commit-id: ada6d69ce0
|
2014-11-04 13:17:44 -06:00 |
|
Steve Harris
|
0dac6e50c8
|
Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
Former-commit-id: fdbbbca1dc [formerly 0acbe91e58] [formerly 98f2a877f6] [formerly fdbbbca1dc [formerly 0acbe91e58] [formerly 98f2a877f6] [formerly 2ed98bb227 [formerly 98f2a877f6 [formerly b70eb5b35985453e77ef2337728c65161ba60422]]]]
Former-commit-id: 2ed98bb227
Former-commit-id: 2c50a992fc [formerly 1deef1254f] [formerly bcdca38e9131f482352631612ce56dbd5e3f8fdf [formerly 585bebbf12]]
Former-commit-id: 9aa1527261ab831d455bce831ae7acefc31a751e [formerly b72af6ee72]
Former-commit-id: 4614ea10a5
|
2014-11-04 13:05:36 -06:00 |
|
Ron Anderson
|
f71fde47d4
|
Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db.
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785
Former-commit-id: ae81f91f32 [formerly af9fd16f73] [formerly b508a7134c] [formerly ae81f91f32 [formerly af9fd16f73] [formerly b508a7134c] [formerly dd230d9f01 [formerly b508a7134c [formerly de45da45f39169e3924122a7baf68ab6762e74e2]]]]
Former-commit-id: dd230d9f01
Former-commit-id: 8dd8a3852f [formerly 3b2b59689b] [formerly 5febd9ef9398e24dbc4f577ed60f3401628379a1 [formerly 47aadc52c1]]
Former-commit-id: 57397641e560233a895aba26208162da0e7f6958 [formerly 023abd756b]
Former-commit-id: 6c57033c28
|
2014-11-04 11:03:42 -06:00 |
|
Roger Ferrel
|
d52f2ff77e
|
Omaha #3643 Archive menu entries consolidated under Archive.
Former-commit-id: be33cbd170 [formerly 4877ec1cc6] [formerly 18ef2df48c] [formerly be33cbd170 [formerly 4877ec1cc6] [formerly 18ef2df48c] [formerly 78614a83b2 [formerly 18ef2df48c [formerly 4eca2144b9d1109250dc9ceefe82701c66754980]]]]
Former-commit-id: 78614a83b2
Former-commit-id: 4b2b686229 [formerly ad29b504dd] [formerly 95edbde89785f04b585dc69044262ccdb7e99f79 [formerly 8a7c197d84]]
Former-commit-id: b61db8f1696d47dccdb92587e7cd7e8e8cded6af [formerly 4de983bb97]
Former-commit-id: c1c76e4fe0
|
2014-11-04 10:04:30 -06:00 |
|
Brian.Dyke
|
373307cb12
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 05aa513de3 [formerly e4ce5f5af5] [formerly f3b80f319d] [formerly 05aa513de3 [formerly e4ce5f5af5] [formerly f3b80f319d] [formerly 327491a3a8 [formerly f3b80f319d [formerly 4be7b001bc98e6fe81b3e66940d025fd7511060b]]]]
Former-commit-id: 327491a3a8
Former-commit-id: 165f82baa6 [formerly 4b47c8a5b8] [formerly 5457b558fea660ea182777aee2d28845ca9b22b7 [formerly 196e5e37ac]]
Former-commit-id: 18b51643bb2fa9df166ef6c18ae525114e0a5c31 [formerly 319b2f9b15]
Former-commit-id: 2c716cdca3
|
2014-11-03 14:45:24 -05:00 |
|
Nate Jensen
|
c67c195d17
|
Merge "Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin" into omaha_14.4.1
Former-commit-id: d100e29e58 [formerly adf63118e3] [formerly d5efa99fce] [formerly d100e29e58 [formerly adf63118e3] [formerly d5efa99fce] [formerly 0c4be8f4cb [formerly d5efa99fce [formerly afe1e532e582e442c556679adcba4e8388b98bbb]]]]
Former-commit-id: 0c4be8f4cb
Former-commit-id: e9b414f29f [formerly effda35668] [formerly c40fb34a7eaf74c7e2bb57e21908f817db3f471b [formerly fcf278072c]]
Former-commit-id: 81d29c7c672345a83ef5ce5f7ac6a7e74edab86a [formerly 3b033437fe]
Former-commit-id: bff937e2ab
|
2014-11-03 09:59:06 -06:00 |
|
Matthew Howard
|
8e034c9fd1
|
Merge "ASM #16693 handles more swear words" into asm_14.3.1
Former-commit-id: bef8c1d1dd [formerly 921bd882fa] [formerly 36e73a31df] [formerly bef8c1d1dd [formerly 921bd882fa] [formerly 36e73a31df] [formerly 39ed75df43 [formerly 36e73a31df [formerly a6ed07b8c01df8576cc54f88dc52d2110d211707]]]]
Former-commit-id: 39ed75df43
Former-commit-id: 81db161133 [formerly 5fc103daf4] [formerly bab8ffcd981dcb3193723398db21c309e45ec6aa [formerly d90db01d4e]]
Former-commit-id: 69febf97096e52f6517807446621276da6ce0018 [formerly c4fc8042ba]
Former-commit-id: 2868a0bf5a
|
2014-11-03 09:56:09 -05:00 |
|
Mark Peters
|
3edaa12d73
|
Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin
Change-Id: I5e407aeff99d7dc9a393d713096971a7ed4c01a6
Former-commit-id: 903cef25a2 [formerly a460792af8] [formerly 88b07ddb46] [formerly 903cef25a2 [formerly a460792af8] [formerly 88b07ddb46] [formerly bc9c564192 [formerly 88b07ddb46 [formerly d946679c5a9b383f689ac3acc66d4aae4ecc4bde]]]]
Former-commit-id: bc9c564192
Former-commit-id: 7c4a21b823 [formerly bf2ec95e77] [formerly 9f74ce45df839f0d03491da44065d4c4b7e889f8 [formerly 64e9590b5b]]
Former-commit-id: 12780e8ab5fe335736ea2caa6b642f0a4e931b2f [formerly b253e61810]
Former-commit-id: 87e18fa4d3
|
2014-10-31 13:32:42 -05:00 |
|
Mark Peters
|
d705b70b5e
|
Omaha #3768 Pluginize the D2D Upper Air menu
Change-Id: I58f76a59a40170fefe93d779760b6581c3f8490a
Former-commit-id: de63344455 [formerly 5199f9b9ee] [formerly 1c2e38dbd1] [formerly de63344455 [formerly 5199f9b9ee] [formerly 1c2e38dbd1] [formerly c11bd6816b [formerly 1c2e38dbd1 [formerly 4554ba073c7a97a335d8020f7068bc5521c0b47a]]]]
Former-commit-id: c11bd6816b
Former-commit-id: 4b617860d9 [formerly ddc78ffe66] [formerly 840d986a002a312b1f9db16c3e019bed88b63371 [formerly d732bfe002]]
Former-commit-id: b19d052d72f1e40d285b24a355c1c27859ee07a1 [formerly db1cf9ae2f]
Former-commit-id: fa20ab259b
|
2014-10-30 19:15:52 -05:00 |
|
Brian.Dyke
|
bf02ea00db
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 2db7d09544 [formerly ce4a1c042f] [formerly 5e04756c0c] [formerly 2db7d09544 [formerly ce4a1c042f] [formerly 5e04756c0c] [formerly 0f8e11aad4 [formerly 5e04756c0c [formerly 78923886791099b8e4564dd780d8ed64db16a5c1]]]]
Former-commit-id: 0f8e11aad4
Former-commit-id: 9839e39668 [formerly 6907e0d17b] [formerly 71934fda04b2e214188a6c985420d8b7ac8f5e5f [formerly 6c13091ec2]]
Former-commit-id: 6daae8746f33dc00f1e4dbe99c5193c38e5abea4 [formerly 189db02dfe]
Former-commit-id: 79070ce122
|
2014-10-30 15:03:19 -04:00 |
|
Ying-Lian.Shi
|
c1a876c044
|
ASM #16693 handles more swear words
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7
Former-commit-id: f66932209e [formerly e592171fe2] [formerly 3ae011ba22c7d49600733543ad05625de7fee6f4 [formerly ea9e231074]] [formerly f66932209e [formerly e592171fe2] [formerly 3ae011ba22c7d49600733543ad05625de7fee6f4 [formerly ea9e231074]] [formerly 3d9fa4e763 [formerly ea9e231074 [formerly 6133c233bd3e02b0a8e1540dd6c496997184f11d]]]]
Former-commit-id: 3d9fa4e763
Former-commit-id: c74916d334 [formerly 49aafc099b] [formerly 3fd48b78dd7589b2a55474fa8a67b769df26421c [formerly c8cfe6a2a7]]
Former-commit-id: a627c5ae79fea64096f63d3ad640f19c1a13445f [formerly a9d2b2aa5a]
Former-commit-id: bef4398770
|
2014-10-30 18:22:34 +00:00 |
|
Ben Steffensmeier
|
439506651d
|
Omaha #3668 Give grid a custom job pool.
Former-commit-id: 930859c61a [formerly e00f394424] [formerly 596578281a] [formerly 930859c61a [formerly e00f394424] [formerly 596578281a] [formerly b41b28ed57 [formerly 596578281a [formerly 14e82b9f400b47b4f446bf1c5c5e729cf442b153]]]]
Former-commit-id: b41b28ed57
Former-commit-id: f54feb8d9b [formerly 9ea0a6f1bd] [formerly 7e02a778142c5f41ee1e30aa754d8f15767ac0fe [formerly 90e9458999]]
Former-commit-id: 2c47d89ae92f7ad3f106af922afd04fc1e4f4579 [formerly 19298bd6f1]
Former-commit-id: 4bec5cf1cd
|
2014-10-29 18:07:28 -05:00 |
|
Ron Anderson
|
0dbdae01ef
|
Issue #3776 Cache SWT fill patterns used in history mode.
Change-Id: Ibb48a997fd0b9c2308ae9f492c7837a10db7285d
Former-commit-id: 96ea0c0f1b [formerly 8f220702f9] [formerly 0c3e19449f] [formerly 96ea0c0f1b [formerly 8f220702f9] [formerly 0c3e19449f] [formerly 53144f55f0 [formerly 0c3e19449f [formerly baefc78796f3d4826d32e5324dd88fa01d242ed5]]]]
Former-commit-id: 53144f55f0
Former-commit-id: a097c88c82 [formerly e946ac633e] [formerly 2fff32fdc3fc2fecdf03b053f430293af5005b48 [formerly 5f83ca27f1]]
Former-commit-id: 41b98b7fa220b25b443be4de2d99d7ba624e1aa4 [formerly 5a57491701]
Former-commit-id: f3069463b5
|
2014-10-29 15:20:18 -05:00 |
|
Steve Harris
|
cb69b74034
|
Merge tag 'OB_14.3.1-29m' into omaha_14.4.1
Former-commit-id: 031f20c5e9 [formerly 7da796e1b0] [formerly 0322884798] [formerly 031f20c5e9 [formerly 7da796e1b0] [formerly 0322884798] [formerly 0f40604bcb [formerly 0322884798 [formerly e5cd617f80e90dcfba52058b2a439fade1cfe15e]]]]
Former-commit-id: 0f40604bcb
Former-commit-id: 63c3c6efe9 [formerly 1d89136dd2] [formerly c85c61002691759da9f05e7e752c8231138765b6 [formerly 0d2cbbfe4a]]
Former-commit-id: e9c590ae92741bc04ffa3f70f88e94c7b48065e1 [formerly 627ebd7dbf]
Former-commit-id: b514fdc3f7
|
2014-10-29 10:03:20 -05:00 |
|
Steve Harris
|
e67084fa73
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 6bfc363c0c [formerly 893a0d91e5] [formerly 315423d014] [formerly 6bfc363c0c [formerly 893a0d91e5] [formerly 315423d014] [formerly f23b0fc310 [formerly 315423d014 [formerly 38fbd41a54b5dd9afe0482f83ed3b4d7d5a2aa2e]]]]
Former-commit-id: f23b0fc310
Former-commit-id: c5a83047d1 [formerly 5bda487c3b] [formerly 0c33778636a77307bcc10ea934de9d7adb33c95f [formerly a3dd8f7e88]]
Former-commit-id: 25c7606904635e5ef9c05afe71092c15657d6592 [formerly a4ebab6079]
Former-commit-id: f9a276cdcb
|
2014-10-29 09:55:14 -05:00 |
|
Steve Harris
|
1d8062aa4e
|
Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1
Former-commit-id: 06351e31d9 [formerly 9646f78f5d] [formerly 1753861b41] [formerly 06351e31d9 [formerly 9646f78f5d] [formerly 1753861b41] [formerly 15d91d4b2d [formerly 1753861b41 [formerly 9d95570c1686978a5c84a21af29dbc84e53355a3]]]]
Former-commit-id: 15d91d4b2d
Former-commit-id: ee3cd699ae [formerly 51175a1556] [formerly 14adccb1585650d52b7124eca4306560aa4c3d4f [formerly 2a46e1a813]]
Former-commit-id: 98a4a8876c239208add31c9eee0cb8754c9d9f31 [formerly e9b43ad7b6]
Former-commit-id: cbe613818b
|
2014-10-29 08:21:13 -05:00 |
|
Nate Jensen
|
af8ea4d3b3
|
Merge "Omaha #3681 SatBlended implements Interrogatable" into omaha_14.4.1
Former-commit-id: a865d5f724 [formerly c4c4fd4cf8] [formerly afc652edfe6a7da00a10fa65a4123fc67e7b57b8 [formerly 040f9f0877]] [formerly a865d5f724 [formerly c4c4fd4cf8] [formerly afc652edfe6a7da00a10fa65a4123fc67e7b57b8 [formerly 040f9f0877]] [formerly c89de11b63 [formerly 040f9f0877 [formerly 17861a7e752838399a918c3b09dcaba8095a6a18]]]]
Former-commit-id: c89de11b63
Former-commit-id: 019804f83a [formerly 1d4b172f30] [formerly 48697a6dd45a9f20393ccac478aca6a012a6e603 [formerly 5d3e3e58dd]]
Former-commit-id: 77de756141bf05533e4ec9c58b06fcfe7e1228e0 [formerly 302373258b]
Former-commit-id: 62d09b5325
|
2014-10-28 15:32:32 -05:00 |
|
Ron Anderson
|
6ed68ac422
|
Merge "Omaha #3685 Fix spell checker to use mixed case. Fix bug in importShapefile" into omaha_14.4.1
Former-commit-id: caf058fb94 [formerly ca7c91e795] [formerly ee12f5dc65] [formerly caf058fb94 [formerly ca7c91e795] [formerly ee12f5dc65] [formerly 30d031989e [formerly ee12f5dc65 [formerly e076201872a69829228a6e78d632287839acf3d8]]]]
Former-commit-id: 30d031989e
Former-commit-id: 0776442d18 [formerly 93301efdcb] [formerly 40b4dc55f1d567aab6cc60c16596b6b4082a5119 [formerly d20a38f031]]
Former-commit-id: 047c8e0e7989a263993d5cddae88aca4f0506791 [formerly d5537d06a1]
Former-commit-id: 2f3ef2ec36
|
2014-10-28 15:15:26 -05:00 |
|
Ron Anderson
|
9df9de7f42
|
Merge "Omaha #3685 Add support for sending specific products in mixed case" into omaha_14.4.1
Former-commit-id: b3f991fee2 [formerly 89acc631a3] [formerly 8b32ac8f54] [formerly b3f991fee2 [formerly 89acc631a3] [formerly 8b32ac8f54] [formerly 9bd76e678f [formerly 8b32ac8f54 [formerly 453e478604f048ae019eeee9bb8e46883b58254e]]]]
Former-commit-id: 9bd76e678f
Former-commit-id: f5b6bc408a [formerly 7dc3b17ac9] [formerly e42547d3d18eafbb278cdef5e00bc87fc78184be [formerly f448c493a8]]
Former-commit-id: f7211367b6f613b785525942bb31cca775972f80 [formerly bc941a71dc]
Former-commit-id: fe9904a7c6
|
2014-10-28 15:15:16 -05:00 |
|
Ben Steffensmeier
|
36df1e299b
|
Issue #3767 Change default image export name to screenCapture.png.
Former-commit-id: baa1fc1f7f [formerly 4e24cde257] [formerly 1591c9cbb8] [formerly baa1fc1f7f [formerly 4e24cde257] [formerly 1591c9cbb8] [formerly 80c209fef7 [formerly 1591c9cbb8 [formerly 021367d3212e185a2d8d4e5970fc268204bf070b]]]]
Former-commit-id: 80c209fef7
Former-commit-id: 0476884815 [formerly 89194b9816] [formerly 99f53b8aeb02e9794b90d3491a2455d6323c9259 [formerly 14dbd71e9d]]
Former-commit-id: fd2a838bcdafc89a7491a17dc63a52397be2a464 [formerly 101c92c99c]
Former-commit-id: e74823bc2d
|
2014-10-28 14:18:02 -05:00 |
|
Steve Harris
|
fe901cfcb1
|
Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
rpms/awips2.core/Installer.gfe.climo/component.spec
Former-commit-id: bf83d93e3f [formerly 40225d128a] [formerly 1b83d045ea] [formerly bf83d93e3f [formerly 40225d128a] [formerly 1b83d045ea] [formerly 19527f50bb [formerly 1b83d045ea [formerly 353674cd0deec2dd86c38dc75c7593d1477a7e78]]]]
Former-commit-id: 19527f50bb
Former-commit-id: 210224a441 [formerly 8db5f15d53] [formerly 74f06c8118b91a36ff764543245780724877dfce [formerly bd4b324ebe]]
Former-commit-id: ccc865fc9b47d08ae4a5a12fb9b56ce09b645ecf [formerly f3e7b20ac7]
Former-commit-id: 74c0a4bc61
|
2014-10-28 13:32:31 -05:00 |
|
Ben Steffensmeier
|
ffbc221ddd
|
Omaha #3681 SatBlended implements Interrogatable
Former-commit-id: bc029ab047 [formerly 9d375a5617] [formerly 790dee3349] [formerly bc029ab047 [formerly 9d375a5617] [formerly 790dee3349] [formerly 5e63b30ab0 [formerly 790dee3349 [formerly 10b1129bb8c938d99b9c74816927f3879a1ef6a2]]]]
Former-commit-id: 5e63b30ab0
Former-commit-id: f155b32503 [formerly cba6b0d5b0] [formerly bdf94dd893731133791297446b5077f743a86e63 [formerly 2bca486744]]
Former-commit-id: d71960717193edcf2cfc4665e13ecbed0d3a8b56 [formerly 43f33db057]
Former-commit-id: 53e138540e
|
2014-10-27 18:16:49 -05:00 |
|
Max Schenkelberg
|
d85fbda309
|
Omaha #3612 Fixed Thin client plugin blacklist
Change-Id: I989656df46a6ebd9dd64c41f44f9335591848d42
Former-commit-id: e93b4867af [formerly c17fd3d774] [formerly 629d56f480] [formerly e93b4867af [formerly c17fd3d774] [formerly 629d56f480] [formerly 1fa0ff4c67 [formerly 629d56f480 [formerly b3f42acd1a8fc814b7fa1e094f1f39f8a374567d]]]]
Former-commit-id: 1fa0ff4c67
Former-commit-id: a3a4340b20 [formerly e8ce4acfaf] [formerly 93a16a32ad13b2e0842a76779a47e56636e7d401 [formerly b7fcd1a455]]
Former-commit-id: b16612469a17daa5669f5dc717c6fb5c5ba7f277 [formerly 17fcea56d0]
Former-commit-id: 807772ef45
|
2014-10-27 13:07:50 -05:00 |
|
Matthew Howard
|
5e3fe4310b
|
Merge "ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility" into asm_14.3.1
Former-commit-id: 6d3950c97f [formerly 56dc0eb99f] [formerly f1d793c8f5] [formerly 6d3950c97f [formerly 56dc0eb99f] [formerly f1d793c8f5] [formerly 4b542e6e5b [formerly f1d793c8f5 [formerly aa43d958820f8873a982d24d9c73760eb430ddc7]]]]
Former-commit-id: 4b542e6e5b
Former-commit-id: 0f2fc451a6 [formerly 09162268b9] [formerly ba098f3578276e3355fc5775d4d829b552c5891c [formerly 92d4322bf4]]
Former-commit-id: 55a8df085ae8e51188771e989d3d6c67ca480101 [formerly eb8961b4e2]
Former-commit-id: c95af0262e
|
2014-10-24 10:06:56 -05:00 |
|
Rici.Yu
|
828b61ba1c
|
ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility
Change-Id: Ia377d571db68d0078399460ad1d434ba4dad510b
Former-commit-id: 1db772c16a [formerly 28294702a5] [formerly 45e3b2895b] [formerly 1db772c16a [formerly 28294702a5] [formerly 45e3b2895b] [formerly b9269162a6 [formerly 45e3b2895b [formerly 902d1b1e4fed90ff216eab2ee5fc3f198bf7fc6d]]]]
Former-commit-id: b9269162a6
Former-commit-id: b799ab1760 [formerly 7de71523c3] [formerly 4598e27b9cba040bb7530be3e3e565fde4745bfc [formerly c65088c5da]]
Former-commit-id: 0c7be7be876ab7101bea6f0744f0740ebef52c0d [formerly 66189dcad2]
Former-commit-id: a4d0114a0a
|
2014-10-24 10:54:37 -04:00 |
|
Shawn.Hooper
|
aad0417806
|
ASM #16871 - Checkin: MPE Gage Table: columns do not sort in descending order
Change-Id: I197c3049e39ad0c5f5edca8926ff1afdaca20e2f
Former-commit-id: 9b732881ec [formerly 1c025e7a9d] [formerly 7a7d877c17] [formerly 9b732881ec [formerly 1c025e7a9d] [formerly 7a7d877c17] [formerly f5b9798c3d [formerly 7a7d877c17 [formerly ce7ade3d25263f5af09073e4877b018a84f195a3]]]]
Former-commit-id: f5b9798c3d
Former-commit-id: a3a1bcc22f [formerly 0510185ff8] [formerly 0f8fb519365cb97655f4b3d8a2c872230862d6d7 [formerly 154ad67a31]]
Former-commit-id: 4de4c2d822446c9a477f0a8e82e8cbea13cce285 [formerly f66225d338]
Former-commit-id: dd3d444885
|
2014-10-24 09:47:54 -04:00 |
|
Greg Armendariz
|
3db710744b
|
Merge "Omaha #3299 attempt to fix cave p2-install order" into omaha_14.4.1
Former-commit-id: 3d6e80d1e2 [formerly d4c7882e4f] [formerly 8d25cfcc94] [formerly 3d6e80d1e2 [formerly d4c7882e4f] [formerly 8d25cfcc94] [formerly abfcd2505f [formerly 8d25cfcc94 [formerly 2604e7f68719bf1e5b4ba1d2e212f26341926938]]]]
Former-commit-id: abfcd2505f
Former-commit-id: 58bf92c68c [formerly 0ebf2f4b29] [formerly bd55f0de509a97e907ee9da84ca8db887cd81be9 [formerly 8c46b21075]]
Former-commit-id: ffe63904338ab58811ed2720d86daedfd34bae5c [formerly af235215d9]
Former-commit-id: 1f2f2c302f
|
2014-10-23 11:45:00 -05:00 |
|
Nate Jensen
|
3b47772355
|
Omaha #3299 attempt to fix cave p2-install order
Change-Id: Ic02c4a1c28d6be67cff709e0ea50fed3e36ca6b3
Former-commit-id: 3c7db651d5 [formerly 7f0bc3f860] [formerly 972245b270] [formerly 3c7db651d5 [formerly 7f0bc3f860] [formerly 972245b270] [formerly ca94deb789 [formerly 972245b270 [formerly d8ef7657cada2a7ec2bf1c3b2c70011a3d160913]]]]
Former-commit-id: ca94deb789
Former-commit-id: 5e6fefb989 [formerly 6877642c65] [formerly 5d55e779fcea1ff102206d4a75bb5dacf6694293 [formerly d17c972d04]]
Former-commit-id: 68f584e160b1c7ec182ce4c26c38585ca49eedcf [formerly 19d56eca8e]
Former-commit-id: 873f38db4d
|
2014-10-23 11:35:44 -05:00 |
|
Nate Jensen
|
ad5f8d760a
|
Merge "Omaha #3668 Switch grid requests to job pool." into omaha_14.4.1
Former-commit-id: c721f2f06c [formerly 7bff603b2c] [formerly 138b73a020743f216f4062817e06da2c478f3507 [formerly b9ffe1b4ce]] [formerly c721f2f06c [formerly 7bff603b2c] [formerly 138b73a020743f216f4062817e06da2c478f3507 [formerly b9ffe1b4ce]] [formerly d50a3bab27 [formerly b9ffe1b4ce [formerly 6360d4efca94ed47661c239a7a84088661027d64]]]]
Former-commit-id: d50a3bab27
Former-commit-id: 9fc03a6229 [formerly d693703c63] [formerly 723989b954efe79664a0eff6420cabf0f658947f [formerly 04ba3e6583]]
Former-commit-id: a6e05534caf6d5e06195fd3b039d2cf5ee077b0d [formerly 9435df398f]
Former-commit-id: d56f2baea8
|
2014-10-23 11:15:58 -05:00 |
|
Ben Steffensmeier
|
36c9ce5f78
|
Omaha #3668 Switch grid requests to job pool.
Former-commit-id: b7846be63a [formerly a61eaa6695] [formerly f940b4d3d4] [formerly b7846be63a [formerly a61eaa6695] [formerly f940b4d3d4] [formerly d5d432e7bd [formerly f940b4d3d4 [formerly 6552b496329f6ef9404a4872048a61e020ab9565]]]]
Former-commit-id: d5d432e7bd
Former-commit-id: 8a79c7225d [formerly 8eb62f63c7] [formerly 84cdf59bb250e18663dd94c54e50fe11660a7199 [formerly ee38a062d0]]
Former-commit-id: 8563500c76f4d3db72e2c4ff05ed3446a0885e14 [formerly b044d1cf80]
Former-commit-id: 9f8fedddc3
|
2014-10-23 10:30:27 -05:00 |
|
Ron Anderson
|
5ec703b74b
|
Omaha #3685 Fix spell checker to use mixed case.
Fix bug in importShapefile
Change-Id: I818bef97b2306cb47e07d4885e77906d1fd5c793
Former-commit-id: 70cab6c52e [formerly ea43af0c3a] [formerly 6ab8c36e83] [formerly 70cab6c52e [formerly ea43af0c3a] [formerly 6ab8c36e83] [formerly 5c1570eafd [formerly 6ab8c36e83 [formerly 25ded2580ec97f4a966297f0af6dbb5d0e66956a]]]]
Former-commit-id: 5c1570eafd
Former-commit-id: 6657f45bd4 [formerly 2cee0f2bb9] [formerly b4a014417f46b4e52e12aa9035e13b25ba194e2c [formerly c8042a4ee2]]
Former-commit-id: b84ce33ac66994d5ae7142ee3af937816ace4e63 [formerly 31553de133]
Former-commit-id: 83ff68647a
|
2014-10-23 09:02:16 -05:00 |
|
Steve Harris
|
7ee0c7ea80
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: da5c17e11b [formerly f4fc695a4d] [formerly b5377ec6f1] [formerly da5c17e11b [formerly f4fc695a4d] [formerly b5377ec6f1] [formerly 7ddf027412 [formerly b5377ec6f1 [formerly 1cbff6bc3dd08f5123e8ad052ad89e548ee63578]]]]
Former-commit-id: 7ddf027412
Former-commit-id: 943981ad62 [formerly 15c6bce647] [formerly 6e970aedd56faa6c2f75513f52d0643612bf1f56 [formerly 27f39e0c28]]
Former-commit-id: 5a482b9fa91304ad9d55daef6948687010f30319 [formerly e1ee6c563a]
Former-commit-id: 283ccdfa13
|
2014-10-23 08:47:06 -05:00 |
|
Nate Jensen
|
e2a5f9c0e8
|
Omaha #3713 fix build
Change-Id: I84adced908a1f09e802cb5c05fa86ce65f0c3af6
Former-commit-id: 9dfe801b5d [formerly 028b8b4609] [formerly 129e6031e6] [formerly 9dfe801b5d [formerly 028b8b4609] [formerly 129e6031e6] [formerly 318badc290 [formerly 129e6031e6 [formerly ec59ed4c41cb867e80340ef9ff44b5e575f0da55]]]]
Former-commit-id: 318badc290
Former-commit-id: 0125d2584b [formerly 664e764874] [formerly c2476f33cf2619dace9fdc23344907f13cbdf6e4 [formerly 8b93f74b65]]
Former-commit-id: 9dbf4549b8e5d4b386648d02c3430a13cdb0e2a2 [formerly 150fc23bfe]
Former-commit-id: 994c8ae829
|
2014-10-22 17:00:27 -05:00 |
|
Nate Jensen
|
9df78df82e
|
Merge "Omaha #3713 The aviation advisory menu items should be contributed by the com.raytheon.uf.viz.aviation.advisory plugin" into omaha_14.4.1
Former-commit-id: 983c1acc7d [formerly fb1a02c800] [formerly 7cd4d5aa0d] [formerly 983c1acc7d [formerly fb1a02c800] [formerly 7cd4d5aa0d] [formerly b8ed807e4e [formerly 7cd4d5aa0d [formerly 6a7420db347a08d5200f0549e80d684c1e3ad83f]]]]
Former-commit-id: b8ed807e4e
Former-commit-id: 47cbcd2ec1 [formerly 37660eee4a] [formerly 675675094e00057e0b4ff3bc11c8f3bf1fadef8b [formerly 3e0c5af32b]]
Former-commit-id: 40561c578c4982117fd0b368a6e43c53d56e53c5 [formerly 608160de55]
Former-commit-id: b1a258d7f9
|
2014-10-22 15:21:48 -05:00 |
|
Ron Anderson
|
779a5f59eb
|
Omaha #3685 Add support for sending specific products in mixed case
Change-Id: I3c7e8bfe285ce7344ddfccf28173a68f3396b126
Former-commit-id: 24989f60b0 [formerly 64162dd9c0] [formerly e729cd8814] [formerly 24989f60b0 [formerly 64162dd9c0] [formerly e729cd8814] [formerly 5d07d13aa0 [formerly e729cd8814 [formerly 18d4fc13ebbd77b3a476bc70252fae1322d631c6]]]]
Former-commit-id: 5d07d13aa0
Former-commit-id: b4f0bcf30c [formerly ba737603f1] [formerly b19a1bfd8fdde387cbe24e24036130761b12c523 [formerly 5e711922d7]]
Former-commit-id: 11e1b6d8e8ec4c312af84389b87680ad8e5d98d0 [formerly 3f248e341a]
Former-commit-id: 94c875ced4
|
2014-10-22 14:29:30 -05:00 |
|