Nate Jensen
|
9bfbabcd4d
|
Merge "Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin" into omaha_14.4.1
Former-commit-id: c52a832f1a [formerly 6273bfd13e] [formerly c52a832f1a [formerly 6273bfd13e] [formerly cdcaf9962d [formerly 0ff3f331f61b98e5132dc497d247a61828a8fdf0]]]
Former-commit-id: cdcaf9962d
Former-commit-id: 632fa47154 [formerly bfa3d7d8e2]
Former-commit-id: 8133f5958e
|
2014-09-16 17:40:58 -05:00 |
|
Mark Peters
|
2c4d9a098c
|
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
Change-Id: I10eb6cb16dda6390480bc9498af55ad9838592c7
Former-commit-id: a8e70e107b [formerly d406dc21d0] [formerly a8e70e107b [formerly d406dc21d0] [formerly 78ade15843 [formerly 854dfd074dba9a8ed68835c53118cc197e83488f]]]
Former-commit-id: 78ade15843
Former-commit-id: cbf8bc76c7 [formerly 27f9153442]
Former-commit-id: ec4ecf6718
|
2014-09-16 16:42:56 -05:00 |
|
Mark Peters
|
85569b7c11
|
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
Change-Id: I129b1f21a1f79b891c5e07eed7bfe3fe52b3162e
Former-commit-id: 0cffb9ad15 [formerly cd7a497567] [formerly 0cffb9ad15 [formerly cd7a497567] [formerly 87cc635b90 [formerly b50ab6a6235559165b9b8ff15af0a8cb4b44be36]]]
Former-commit-id: 87cc635b90
Former-commit-id: 610e7d0d44 [formerly e414a740d4]
Former-commit-id: f9895d7013
|
2014-09-16 16:37:45 -05:00 |
|
Mark Peters
|
1eb5f9d8bc
|
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
Change-Id: I6693580dfea3f3ba0181e560e42aa224f30d3058
Former-commit-id: cb72912515 [formerly 0f5623bfeb] [formerly cb72912515 [formerly 0f5623bfeb] [formerly 0a80edf171 [formerly d2916cd882afc4c3f8aaf7f6eb1e645ca9514235]]]
Former-commit-id: 0a80edf171
Former-commit-id: 43c1c33c50 [formerly bf0051e79e]
Former-commit-id: a4c48319de
|
2014-09-16 16:23:01 -05:00 |
|
Nate Jensen
|
1f5d08157e
|
Merge "Omaha #3356 fix ingestGrib level factory initialization order" into omaha_14.4.1
Former-commit-id: a86ed5386d [formerly 1716c4e3dc] [formerly a86ed5386d [formerly 1716c4e3dc] [formerly d6b05aa608 [formerly 5470de5efc2969ef47b177716bc3b2b72662b27c]]]
Former-commit-id: d6b05aa608
Former-commit-id: eedd77f22d [formerly 5b6b58ef83]
Former-commit-id: dc03b86539
|
2014-09-16 14:07:49 -05:00 |
|
Nate Jensen
|
89ea61abb0
|
Omaha #3356 fix ingestGrib level factory initialization order
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985
Former-commit-id: 877aab446c [formerly b516c4b8c8] [formerly 877aab446c [formerly b516c4b8c8] [formerly b89781c419 [formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]]]
Former-commit-id: b89781c419
Former-commit-id: 5d7897e9bc [formerly 57851af7d6]
Former-commit-id: 1370795313
|
2014-09-16 13:24:46 -05:00 |
|
Mark Peters
|
4287a8dc20
|
Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin
Change-Id: Ia10af38c4dd103b304a6d7b23d072023b2bf05b8
Former-commit-id: 469a54f9fc [formerly 47598b6967] [formerly 469a54f9fc [formerly 47598b6967] [formerly d3620ffea7 [formerly 27ec90f83560909acdb27893528e28e3dd58fd6b]]]
Former-commit-id: d3620ffea7
Former-commit-id: 14c3ec8f97 [formerly 3ac06c97b1]
Former-commit-id: 354f7b86fd
|
2014-09-16 12:13:33 -05:00 |
|
Richard Peter
|
d284429d0b
|
Merge "Omaha #3622 Fix site actiavtion completion message to wait until all JVMs are done" into omaha_14.4.1
Former-commit-id: 1368d52348 [formerly 28ac00b003] [formerly 1368d52348 [formerly 28ac00b003] [formerly 01d33b408c [formerly 86993ed870a523bf7b595e6db9ed74e1d0f18d13]]]
Former-commit-id: 01d33b408c
Former-commit-id: 3131f862ad [formerly 8d3c4ae17f]
Former-commit-id: 9d2cd9e516
|
2014-09-16 10:07:14 -05:00 |
|
Ron Anderson
|
8afea02a3b
|
Omaha #3622 Fix site actiavtion completion message to wait until all JVMs are done
Change-Id: I5130a548bc8ed28e507ded8ef555ae9e966ec3e2
Former-commit-id: 69789ef17b [formerly 6a8c82891a] [formerly 69789ef17b [formerly 6a8c82891a] [formerly 073435a715 [formerly 5a4a1a9a377f11b78ce7a477f205d47c3d763edd]]]
Former-commit-id: 073435a715
Former-commit-id: a16699cb7c [formerly 44da6b8f04]
Former-commit-id: 2bc0836f03
|
2014-09-15 12:24:39 -05:00 |
|
Brian Clements
|
b21ad76754
|
Omaha #3583 productsrv no longer uses serialization util for JAXB
Change-Id: Ifad0e3cc6c875e66e695f7f812b038105ec64b18
Former-commit-id: 1d06a876d7 [formerly b984f9e3ed] [formerly 1d06a876d7 [formerly b984f9e3ed] [formerly 8bf3b0372b [formerly e3dbeb01aa3235db1f6e72a41bdbcd456a60f37f]]]
Former-commit-id: 8bf3b0372b
Former-commit-id: 6e8af95e7b [formerly d0a741a083]
Former-commit-id: 86442d1b24
|
2014-09-12 15:22:48 -05:00 |
|
Mark Peters
|
75de69198c
|
Omaha #3580 Replace or remove Text Workstation calls to SerializationUtil's JAXB support
Change-Id: Id12d02ebf40cd7c7a1236d88a3776b6a3ee1df3c
Former-commit-id: 9045bb4df8 [formerly 004bc1692a] [formerly 9045bb4df8 [formerly 004bc1692a] [formerly b8dc6d37d8 [formerly 4d5b0516d227eb7b892850753c6bb94f67f01a2d]]]
Former-commit-id: b8dc6d37d8
Former-commit-id: fa39b6b0e5 [formerly 520b5a9a8f]
Former-commit-id: 7f85e1c94c
|
2014-09-12 13:23:40 -05:00 |
|
Mark Peters
|
eaf4ad4ffc
|
Omaha #3582 Clean up SerializationUtil's JAXB/XML support
Change-Id: Ic334e43ff0ddb2556f79b04e32a3daeed478f431
Former-commit-id: 5abd331ae3 [formerly 63f44c571d] [formerly 5abd331ae3 [formerly 63f44c571d] [formerly b34220fca5 [formerly fcb1a5c9c93ffe19f9a4e3706f68fab12a0649dc]]]
Former-commit-id: b34220fca5
Former-commit-id: 70c41915ae [formerly 3f251f55bf]
Former-commit-id: a9a6b39f29
|
2014-09-12 11:46:40 -05:00 |
|
Nate Jensen
|
c915f2b618
|
Omaha #3356 ensure LevelFactory is initialized on edex before GFE startup
Change-Id: I889b85404fc361dc92ae4323fb20ab44ff12a166
Former-commit-id: 85119e5610 [formerly 0bde7e01fb] [formerly 85119e5610 [formerly 0bde7e01fb] [formerly cbe3d885a2 [formerly 64f5c249ed837f854db743e1b90f2194c01cdbfd]]]
Former-commit-id: cbe3d885a2
Former-commit-id: c377150a59 [formerly 64140e614a]
Former-commit-id: a214a90337
|
2014-09-12 09:14:01 -05:00 |
|
Richard Peter
|
202279442f
|
Merge "Omaha #3615 Register 2D metar fields" into omaha_14.4.1
Former-commit-id: 8f912115ac [formerly dbd3cd85d6] [formerly 8f912115ac [formerly dbd3cd85d6] [formerly dad8f4c869 [formerly bb317434e32d73c2f1caa2bc335a117be17a2d07]]]
Former-commit-id: dad8f4c869
Former-commit-id: c0cc0e6f02 [formerly 01287e329e]
Former-commit-id: ceb8ed381f
|
2014-09-11 11:20:43 -05:00 |
|
Mark Peters
|
09003ad30b
|
Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: I6db18d15b5a35a081de48a885e3d27495b44b5d0
Former-commit-id: cbb5715b34 [formerly d671d1f432] [formerly cbb5715b34 [formerly d671d1f432] [formerly fb33786001 [formerly e9d50c287b6327ea03437a98fb1077b904daeecd]]]
Former-commit-id: fb33786001
Former-commit-id: 53cf3a043b [formerly a18f767151]
Former-commit-id: 8be9ecd84a
|
2014-09-11 10:32:11 -05:00 |
|
Nathan Bowler
|
0f4e9d3945
|
Omaha #3615 Register 2D metar fields
Change-Id: Ic6cfcbfd1fcbab921732366c8803d54ea493845a
Former-commit-id: 7ae1ebfd24 [formerly ede0cbf395] [formerly 7ae1ebfd24 [formerly ede0cbf395] [formerly ab09b948a6 [formerly 3101fdbde5e8023fdc33ff18ad25c9a8c830693a]]]
Former-commit-id: ab09b948a6
Former-commit-id: ccc72c49cb [formerly f8b6324531]
Former-commit-id: 9a1f5ec8d0
|
2014-09-11 11:20:40 -04:00 |
|
Richard Peter
|
e9740b73fe
|
Merge "Omaha #3356 updates for improved level lookup" into omaha_14.4.1
Former-commit-id: bec987b601 [formerly 49949b99c5] [formerly bec987b601 [formerly 49949b99c5] [formerly 0608175d2d [formerly 74f89af8dda533b6b905c86be1afac3e2633923b]]]
Former-commit-id: 0608175d2d
Former-commit-id: 414b255b80 [formerly aed4031560]
Former-commit-id: e0221d1b10
|
2014-09-10 14:32:32 -05:00 |
|
Mark Peters
|
3c730ef05f
|
Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ia69c93c5bab1c730c3c4bad6781823f989bc1641
Former-commit-id: 203e21b807 [formerly 685a9b1960] [formerly 203e21b807 [formerly 685a9b1960] [formerly 735cafee83 [formerly 4d059172e0d822a2fb740d602265da6a91e15ccc]]]
Former-commit-id: 735cafee83
Former-commit-id: 5ca19d6ab8 [formerly 6684a32468]
Former-commit-id: 9ce57d5780
|
2014-09-09 16:09:04 -05:00 |
|
Nate Jensen
|
3cf27fb414
|
Omaha #3356 updates for improved level lookup
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362
Former-commit-id: 1c77f66608 [formerly ae9cffaaea] [formerly 1c77f66608 [formerly ae9cffaaea] [formerly 62b84b2fb3 [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]]
Former-commit-id: 62b84b2fb3
Former-commit-id: d397d4147c [formerly f5ae895143]
Former-commit-id: eec3df9cd5
|
2014-09-09 15:38:53 -05:00 |
|
Nate Jensen
|
a623f53f1d
|
Merge "Omaha #3356 more removal of unnecessary register buddies" into omaha_14.4.1
Former-commit-id: 644c0acbfe [formerly 986a03c7c5] [formerly 644c0acbfe [formerly 986a03c7c5] [formerly 7920053e2f [formerly 90e8451dd089de67278368ca665da0cfc5bb6740]]]
Former-commit-id: 7920053e2f
Former-commit-id: 393c49b691 [formerly bd9b4a9355]
Former-commit-id: 3d70613ca0
|
2014-09-09 09:23:28 -05:00 |
|
Brian Clements
|
d6baeddbb1
|
Omaha #3570 http client API changes
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f
Former-commit-id: 06e4c1e644 [formerly 8489ce1214] [formerly 06e4c1e644 [formerly 8489ce1214] [formerly 21ded3ea69 [formerly d4edd51d41a306010a7fec2a7ed2c0cd6186506a]]]
Former-commit-id: 21ded3ea69
Former-commit-id: 84634e9987 [formerly 1186014784]
Former-commit-id: e9efd4e501
|
2014-09-09 08:47:32 -05:00 |
|
Nate Jensen
|
642f11aec0
|
Omaha #3356 more removal of unnecessary register buddies
Change-Id: Ic91c2d5ab93bb220a69be23c54640edae26302a3
Former-commit-id: 606642b99f [formerly 26e2ff44a4] [formerly 606642b99f [formerly 26e2ff44a4] [formerly b46f23d01b [formerly 39bfb8fd0548c74ed9a4e95b914e90ab2f6ad526]]]
Former-commit-id: b46f23d01b
Former-commit-id: 84b0e0117f [formerly 9dafcc915c]
Former-commit-id: 76a397f500
|
2014-09-08 17:18:22 -05:00 |
|
Nate Jensen
|
1705ca5735
|
Merge "Omaha #2926 switched text subscription to thrift client" into omaha_14.4.1
Former-commit-id: 4398f2d7d8 [formerly da3e7dbf72] [formerly 4398f2d7d8 [formerly da3e7dbf72] [formerly 88e11a4909 [formerly 51c60cf39cc950771597ff652c0e683c73812d91]]]
Former-commit-id: 88e11a4909
Former-commit-id: e212fd841f [formerly 9083d4956b]
Former-commit-id: 800ffc4ef9
|
2014-09-08 13:58:02 -05:00 |
|
Brian Clements
|
cb37ddfd9d
|
Omaha #3518 each JVM gets a unique user prefs folder
Change-Id: I3ea2cf98836bb3a5447b307eda4a5ab235b18619
Former-commit-id: e95a139900 [formerly 2c1cd559b6] [formerly e95a139900 [formerly 2c1cd559b6] [formerly a0d663530b [formerly 856b223352b99e3f96df6dab84aea313885b3c37]]]
Former-commit-id: a0d663530b
Former-commit-id: 7938c547e8 [formerly b3d6dbad76]
Former-commit-id: 7397b4c453
|
2014-09-08 13:16:13 -05:00 |
|
Brian Clements
|
f4fa010292
|
Omaha #2926 switched text subscription to thrift client
Change-Id: I3fafee2252aff2a80657cdf8a8092f63459671c6
Former-commit-id: d8b2da2900 [formerly ac811b666c] [formerly d8b2da2900 [formerly ac811b666c] [formerly 0087580736 [formerly 410ef2954d6cfff11a4718056983ccaecf186fd3]]]
Former-commit-id: 0087580736
Former-commit-id: d7a388cfd9 [formerly 375c3a6f78]
Former-commit-id: 11974d9809
|
2014-09-05 16:52:38 -05:00 |
|
Brian Clements
|
a5e8e94411
|
Omaha #2926 moved TextDBRequest to common
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c
Former-commit-id: c89a74943e [formerly 1b248efb54] [formerly c89a74943e [formerly 1b248efb54] [formerly c77b4f4e8b [formerly 924e512c327c838d866b353ec8da8f7e5534db49]]]
Former-commit-id: c77b4f4e8b
Former-commit-id: 8cc7d1e36d [formerly 3a0da3d8d5]
Former-commit-id: 4640945dc7
|
2014-09-05 12:56:04 -05:00 |
|
Greg Armendariz
|
98c50cb61e
|
Omaha #3545 - Add log and fail message when directories are missing
Former-commit-id: e8a75882ee [formerly 0a988d64e4] [formerly e8a75882ee [formerly 0a988d64e4] [formerly a5359e4547 [formerly 05d45b0c005ce7c8cca51c367754e7e6bca6c085]]]
Former-commit-id: a5359e4547
Former-commit-id: b7535cb9ac [formerly e658278545]
Former-commit-id: 08b5040650
|
2014-09-04 11:52:13 -05:00 |
|
Nate Jensen
|
6140da7ee6
|
Merge "Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way" into omaha_14.4.1
Former-commit-id: d977dbfcb0 [formerly 1fd0ed2de6] [formerly d977dbfcb0 [formerly 1fd0ed2de6] [formerly 3a2558eac8 [formerly fbc9b64a0c0734e46ec9db10e0760aa8f2b27c24]]]
Former-commit-id: 3a2558eac8
Former-commit-id: 2781d227f3 [formerly bb8918e96b]
Former-commit-id: 577e3341f6
|
2014-09-03 17:13:06 -05:00 |
|
Matt Nash
|
667ce84a62
|
Omaha #3170 add data times to ffmp geometries being returned, also aggregate data as it is more useful that way
Former-commit-id: 90b0619656 [formerly 118d811eee] [formerly 90b0619656 [formerly 118d811eee] [formerly 980d7bf5ad [formerly dd691896f03ba16d683a284a26b8ef923e364834]]]
Former-commit-id: 980d7bf5ad
Former-commit-id: 23d1a555a7 [formerly bce9e0595c]
Former-commit-id: a1ea03c29b
|
2014-09-03 14:11:15 -05:00 |
|
Nate Jensen
|
8248f2f5ab
|
Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1
Former-commit-id: a0830d06d5 [formerly 5b80aadbac] [formerly a0830d06d5 [formerly 5b80aadbac] [formerly 80cc58cf25 [formerly e393e1f0455d466edde925608b6f0f1e35351141]]]
Former-commit-id: 80cc58cf25
Former-commit-id: 8e6f1c0b05 [formerly db8517a576]
Former-commit-id: d717f13039
|
2014-09-03 09:21:28 -05:00 |
|
Richard Peter
|
d9acda4485
|
Merge "Omaha #3549 improve error message" into omaha_14.4.1
Former-commit-id: d968b5085d [formerly 3c874e1aa1] [formerly d968b5085d [formerly 3c874e1aa1] [formerly 7dc4327ffa [formerly 6e8ad4c9e2046ac950bbf166a09492a69c88cb7e]]]
Former-commit-id: 7dc4327ffa
Former-commit-id: b9db837e14 [formerly 388c1ca919]
Former-commit-id: 6bee61c16f
|
2014-09-02 14:25:18 -05:00 |
|
Richard Peter
|
bb5b769b96
|
Merge "Omaha #2926 switched textdb to thrift client" into omaha_14.4.1
Former-commit-id: 612990b3ed [formerly 7628a0a56a] [formerly 612990b3ed [formerly 7628a0a56a] [formerly 0f94b663a4 [formerly 80294bbd891edde5b190941175f73d634f1a3e08]]]
Former-commit-id: 0f94b663a4
Former-commit-id: e3e9368411 [formerly 6151d549ce]
Former-commit-id: eca48d7b90
|
2014-09-02 12:45:37 -05:00 |
|
Nate Jensen
|
78b9181a68
|
Omaha #3549 improve error message
Change-Id: I54cdefd3b77fa5ad8eba9aad6ae8c93b7bd0a67d
Former-commit-id: 3cf81ab39e [formerly fa330b698d] [formerly 3cf81ab39e [formerly fa330b698d] [formerly 37501b884a [formerly 369867e18b5209895137f5e4121fa06bfa2858c7]]]
Former-commit-id: 37501b884a
Former-commit-id: 635604b7a9 [formerly 11b4f270e6]
Former-commit-id: 7336cbb500
|
2014-09-02 12:38:04 -05:00 |
|
Mark Peters
|
3a8e2b71fd
|
Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ib0aa88dd3341ae65aef9b2b02ffbd1645510b95e
Former-commit-id: be6dae0cf9 [formerly ad994bc4c6] [formerly be6dae0cf9 [formerly ad994bc4c6] [formerly 53869a4b0b [formerly 07b54b870e36f37b909d9e7da1f1da4d181b06b0]]]
Former-commit-id: 53869a4b0b
Former-commit-id: 6ddbbc366a [formerly 2c02132ec0]
Former-commit-id: ae87858e3d
|
2014-09-02 11:38:06 -05:00 |
|
Nate Jensen
|
0189b9da69
|
Omaha #3549 improve acarssounding error message
Change-Id: I850eb6bbcd825bee26f0e93226b10d077378dacf
Former-commit-id: 6838a4d8cc [formerly 8570cad6c6] [formerly 6838a4d8cc [formerly 8570cad6c6] [formerly 82ef4c1646 [formerly 16e66726bd5a8f20d6de21708c7f3372a046cea8]]]
Former-commit-id: 82ef4c1646
Former-commit-id: c7fdb67228 [formerly eed90eceeb]
Former-commit-id: fddcabac0a
|
2014-09-02 11:21:10 -05:00 |
|
Steve Harris
|
ecf26b3ac5
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: bddf9c0f27 [formerly 793064063b] [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: 66b485c000 [formerly d984dd538f]
Former-commit-id: e681e0a457
|
2014-08-29 10:17:52 -05:00 |
|
Nate Jensen
|
7e2f184332
|
Merge "Omaha #3356 inject spatial query through spring" into omaha_14.4.1
Former-commit-id: 8f0bd2bb84 [formerly 67d5cb52ae] [formerly 8f0bd2bb84 [formerly 67d5cb52ae] [formerly 822f1a20b0 [formerly afd5131062926a78942db59f35a5c2e719a542da]]]
Former-commit-id: 822f1a20b0
Former-commit-id: 975f93d6cf [formerly 0a8312b09d]
Former-commit-id: 1aa74a38d8
|
2014-08-28 14:32:57 -05:00 |
|
Nate Jensen
|
fe0cd768ad
|
Omaha #3356 inject spatial query through spring
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d
Former-commit-id: baece22d79 [formerly 58c85c76ef] [formerly baece22d79 [formerly 58c85c76ef] [formerly 8f226399f7 [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]]]
Former-commit-id: 8f226399f7
Former-commit-id: 244395af69 [formerly 9843865254]
Former-commit-id: 2b829dc66b
|
2014-08-28 11:46:25 -05:00 |
|
Nate Jensen
|
91ae999120
|
Merge "Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily" into omaha_14.4.1
Former-commit-id: 9fe0e6df69 [formerly 625f0db18f] [formerly 9fe0e6df69 [formerly 625f0db18f] [formerly 0ee832fc2f [formerly 0a6287431cbcc43ad6f42898a94d173fe451566e]]]
Former-commit-id: 0ee832fc2f
Former-commit-id: 2a7cd5957d [formerly ce138b3e31]
Former-commit-id: 0e0cf3ba67
|
2014-08-28 11:30:45 -05:00 |
|
Ron Anderson
|
932d9e2783
|
Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34
Former-commit-id: dc185b8dd1 [formerly bb1e80b844] [formerly dc185b8dd1 [formerly bb1e80b844] [formerly 2b88ade974 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]]
Former-commit-id: 2b88ade974
Former-commit-id: 39d00a72ce [formerly 0962c75d18]
Former-commit-id: 56b56ea4f3
|
2014-08-28 10:43:54 -05:00 |
|
Nate Jensen
|
2db6fa9583
|
Merge "Omaha #3503 Composite product generators init after spring beans are loaded" into omaha_14.4.1
Former-commit-id: fb0829fd4d [formerly de69231d3a] [formerly fb0829fd4d [formerly de69231d3a] [formerly afe94aca08 [formerly 1eb554cd30d53daf44de42e0ddd3f35bf8f37bae]]]
Former-commit-id: afe94aca08
Former-commit-id: da6259a198 [formerly 8952d15b12]
Former-commit-id: f3454a7941
|
2014-08-28 10:40:50 -05:00 |
|
Brian.Dyke
|
7e4ab705cc
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: a08db8d73d [formerly e654318431] [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: f90649d7e7 [formerly f7f16ff9eb]
Former-commit-id: c0dc594eda
|
2014-08-27 11:19:19 -04:00 |
|
Nate Jensen
|
728da699ad
|
Omaha #3132 fix compilation issue from merge
Change-Id: I76e189ff871c2ca8f99806e035abb07087626fba
Former-commit-id: 2f0b209e10 [formerly 0160955244] [formerly 2f0b209e10 [formerly 0160955244] [formerly 3f7170f862 [formerly b45249baec6c6d4f77e5aeb23b910689df192c8a]]]
Former-commit-id: 3f7170f862
Former-commit-id: 66c0933713 [formerly 281f360487]
Former-commit-id: 909bc9c412
|
2014-08-26 18:22:26 -05:00 |
|
Brian Clements
|
a08ebbe0c7
|
Omaha #3503 Composite product generators init after spring beans are loaded
Change-Id: I894adbc14e1bfe183a3f7717d95dba85291a2a09
Former-commit-id: 5dc5530120 [formerly 095f84e71f] [formerly 5dc5530120 [formerly 095f84e71f] [formerly b88f012e69 [formerly f6109e74ff5e26547c8fc03d7bb5ecde1046f689]]]
Former-commit-id: b88f012e69
Former-commit-id: f29fb0a656 [formerly e6b2143a6b]
Former-commit-id: 237bdc0e2a
|
2014-08-26 17:12:34 -05:00 |
|
Steve Harris
|
9d263bc542
|
Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
Former-commit-id: 8c5026314c [formerly 99ae9bdc10] [formerly 8c5026314c [formerly 99ae9bdc10] [formerly 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]
Former-commit-id: 038b284066
Former-commit-id: 1da31a86dc [formerly c8ba2b1ae6]
Former-commit-id: 84edac842e
|
2014-08-26 16:25:21 -05:00 |
|
Nate Jensen
|
10980c927d
|
Merge "Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env" into omaha_14.4.1
Former-commit-id: e4df37dd05 [formerly 46fc72804a] [formerly e4df37dd05 [formerly 46fc72804a] [formerly 448887b913 [formerly 59c4919564db8f8ebf61fbac6ce2bdd29095479e]]]
Former-commit-id: 448887b913
Former-commit-id: ac814cc6c9 [formerly 88ac1c057c]
Former-commit-id: 6c93e01bda
|
2014-08-26 13:39:15 -05:00 |
|
Brian.Dyke
|
16dc3b41de
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 489fec4b25 [formerly 86f0ed23c1] [formerly 489fec4b25 [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]
Former-commit-id: b3767167c7
Former-commit-id: 1b9a28cc62 [formerly f2b9203001]
Former-commit-id: 677ce2fb94
|
2014-08-26 13:31:34 -04:00 |
|
Max Schenkelberg
|
0368097265
|
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: dacc10bcbc [formerly 63967fbc78] [formerly dacc10bcbc [formerly 63967fbc78] [formerly 78b87b7a63 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]]]
Former-commit-id: 78b87b7a63
Former-commit-id: 0a7a2fadec [formerly 7cfc26d1d7]
Former-commit-id: 9048064741
|
2014-08-26 11:32:20 -05:00 |
|
Max Schenkelberg
|
2b110b1141
|
Omaha #3541 fixed grid coverage spring
Change-Id: I6c69cbe530daee61127e05d7f94a0e2c92ebe2e7
Former-commit-id: ac67bd42b9 [formerly f7620471da] [formerly ac67bd42b9 [formerly f7620471da] [formerly df50024b63 [formerly f2a76dfda110e231539474bffbde123fbe6313c9]]]
Former-commit-id: df50024b63
Former-commit-id: 87e1c1a257 [formerly 6aff7b7a4c]
Former-commit-id: 47f4520d7c
|
2014-08-26 11:28:42 -05:00 |
|
Richard Peter
|
7964c0697d
|
Omaha #3541 Fix request jvm startup and build
Change-Id: I6141ef1d74430fc43ea11f296c6ab95fc4276d6f
Former-commit-id: 64683e5784 [formerly bf5f1c27a7] [formerly 64683e5784 [formerly bf5f1c27a7] [formerly f478b42e61 [formerly 1c698d67a2c0ed3b11f910b593b1bbbdb2f46a86]]]
Former-commit-id: f478b42e61
Former-commit-id: 832bd8d5e7 [formerly ef45928158]
Former-commit-id: 820fb0085e
|
2014-08-25 21:21:04 -05:00 |
|