Roger Ferrel
|
681b93eb57
|
Omaha #3353 Fix null pointer opening GenerateGeoDataSetDialog.
Former-commit-id: e121422e82 [formerly a31f3e670f] [formerly e121422e82 [formerly a31f3e670f] [formerly bab69dc58c [formerly f7fe3c9351d354046ef5038ae561db469421a442]]]
Former-commit-id: bab69dc58c
Former-commit-id: 42882fa28e [formerly 4385e34dd8]
Former-commit-id: e289919fca
|
2014-09-15 13:00:02 -05:00 |
|
Brian Clements
|
dda89f79ec
|
Omaha #3531 added localization perspective link to volume browser menus
Change-Id: I876d3c562a6c7d9d02396519d1d214a97ffa5be9
Former-commit-id: 88826380e5 [formerly ba64a77fe4] [formerly 88826380e5 [formerly ba64a77fe4] [formerly 06a6124b64 [formerly b25d8f970caa04375f27f30d86df07542783e24a]]]
Former-commit-id: 06a6124b64
Former-commit-id: ab9720903b [formerly 0494d42b57]
Former-commit-id: 07ef84c212
|
2014-09-15 09:13:20 -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 |
|
Brian Clements
|
f3d1bf85b4
|
Omaha #3608 improved error handling in lightning frame retriever
Change-Id: I02784a7f2d23bf37d56294e55cb9ec759d1f9080
Former-commit-id: ce24dad434 [formerly b9dd6d798b] [formerly ce24dad434 [formerly b9dd6d798b] [formerly c56645dd01 [formerly 0551b91b995c893fddee52cabdfbdccf83121a31]]]
Former-commit-id: c56645dd01
Former-commit-id: 6a333bde00 [formerly 07b48207a2]
Former-commit-id: b4b45c0152
|
2014-09-11 11:52:23 -05:00 |
|
Max Schenkelberg
|
a2e7d1324f
|
Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb
Former-commit-id: 422ceffbdd [formerly 3ea9b1b4be] [formerly 422ceffbdd [formerly 3ea9b1b4be] [formerly 994605c1ce [formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]]]
Former-commit-id: 994605c1ce
Former-commit-id: 165583b144 [formerly 3b1a3f84fd]
Former-commit-id: 144e042b42
|
2014-09-10 15:43:19 -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 |
|
Chris Cody
|
97d6b67891
|
Omaha #3365 Removing and realigning AWIPS2 Baseline tests
Change-Id: Iba40d0b074df500c52b7302ab59a688680153f48
Former-commit-id: 39887a4b9c [formerly f4445d24cd] [formerly 39887a4b9c [formerly f4445d24cd] [formerly 9e823a47d6 [formerly 97000cc70e8d826b3e8828a1731278673e0ac635]]]
Former-commit-id: 9e823a47d6
Former-commit-id: 62780e001b [formerly 57c689eee6]
Former-commit-id: 0564fa8bf9
|
2014-09-05 10:14:14 -05:00 |
|
Nate Jensen
|
064d75be69
|
Merge "Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times" into omaha_14.4.1
Former-commit-id: 2f0554097a [formerly 51d910af00] [formerly 2f0554097a [formerly 51d910af00] [formerly cf41d7e3a3 [formerly 03fc1d04092135970a6c7089bcbbf11d5c584dd1]]]
Former-commit-id: cf41d7e3a3
Former-commit-id: 3ae925ce87 [formerly 96b3c08bd1]
Former-commit-id: 165b5fd49b
|
2014-09-04 13:49:36 -05:00 |
|
Nate Jensen
|
364295639c
|
Omaha #3356 remove unnecessary register buddy to uf.viz.core
Change-Id: I95915b6f1d458a5bb581eec79d40af8bc94122f4
Former-commit-id: 0967e25c67 [formerly 20251fc3e3] [formerly 0967e25c67 [formerly 20251fc3e3] [formerly b332434b49 [formerly a46d5914ae58ad1c3410cdf8d7e67cf856e4c2bd]]]
Former-commit-id: b332434b49
Former-commit-id: ccb7d4a797 [formerly 6285cc9893]
Former-commit-id: 9e1336de40
|
2014-09-03 16:10:53 -05:00 |
|
Nate Jensen
|
3188cd0af2
|
Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13
Former-commit-id: 2c74d90cc4 [formerly c0dab26b92] [formerly 2c74d90cc4 [formerly c0dab26b92] [formerly 9d462e1dd9 [formerly b535d54c52c3e38bb9fa083ba911ad49c090f214]]]
Former-commit-id: 9d462e1dd9
Former-commit-id: d5e948b7e2 [formerly 05a73b1e4b]
Former-commit-id: d87cfb8131
|
2014-09-03 11:34:10 -05:00 |
|
Nate Jensen
|
64c23a487d
|
Omaha #3356 remove unnecessary dependency
Change-Id: I59503f01e8c7ec451c7dcb725bf9fecd0209fba2
Former-commit-id: a7984f6dde [formerly 4b5d5ab6cc] [formerly a7984f6dde [formerly 4b5d5ab6cc] [formerly 362fee1984 [formerly c60ca3a16e348216c582f30bc95d8d35ef81e312]]]
Former-commit-id: 362fee1984
Former-commit-id: 9e5c92de45 [formerly de4472f76b]
Former-commit-id: 5a2a700085
|
2014-09-03 10:53:30 -05:00 |
|
Nate Jensen
|
22fa9cc6d9
|
Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f
Former-commit-id: b690c360ac [formerly 8e74892cd6] [formerly b690c360ac [formerly 8e74892cd6] [formerly 40d4abe4cd [formerly 89de611bd1abdd016ae8a96db4c820004c52b406]]]
Former-commit-id: 40d4abe4cd
Former-commit-id: f78e7fe79c [formerly 5b2e410c6c]
Former-commit-id: 54e9b04c3d
|
2014-09-03 10:00:11 -05:00 |
|
Mark Peters
|
72184dbcaf
|
Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times
Change-Id: I68642e05ce970545a516d4fab1492a860c530032
Former-commit-id: 447986eed3 [formerly 06b98bb48a] [formerly 447986eed3 [formerly 06b98bb48a] [formerly ee36d09cb0 [formerly 725354074d54112c8658dc34a8ac564739acbebb]]]
Former-commit-id: ee36d09cb0
Former-commit-id: 8ace5b852c [formerly a3feb0de78]
Former-commit-id: e7e58b4e78
|
2014-09-02 16:31:44 -05:00 |
|
Ben Steffensmeier
|
5b35e526f4
|
Omaha #3390 Remove references to deprecated API.
Former-commit-id: 950075dc59 [formerly 1d2144e840] [formerly 950075dc59 [formerly 1d2144e840] [formerly e32037b42a [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]]
Former-commit-id: e32037b42a
Former-commit-id: 068653ac95 [formerly b77166c26e]
Former-commit-id: 6e1981d6f6
|
2014-09-02 15:39:45 -05:00 |
|
Ron Anderson
|
c13e748b6c
|
Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
Former-commit-id: 8d9741bd83 [formerly 6a5d4acf7c] [formerly 8d9741bd83 [formerly 6a5d4acf7c] [formerly aa6835147b [formerly 31578a50044053da2ecf14697764bfac2ee8ac8d]]]
Former-commit-id: aa6835147b
Former-commit-id: f27986f541 [formerly 017378f646]
Former-commit-id: 8ab30a7e02
|
2014-09-02 12:08:44 -05:00 |
|
Nate Jensen
|
0c55719688
|
Merge "Omaha #3356 fix cave startup" into omaha_14.4.1
Former-commit-id: 3258b9a2b2 [formerly 5247f4833f] [formerly 3258b9a2b2 [formerly 5247f4833f] [formerly 653d594382 [formerly e3c3d979ba7dcb46d2af716aa73e05c67f0dd2ba]]]
Former-commit-id: 653d594382
Former-commit-id: 9067556a0e [formerly a63f5ee67b]
Former-commit-id: 8078915092
|
2014-09-02 10:14:08 -05:00 |
|
Nate Jensen
|
070ef331b9
|
Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: e673ed62bd [formerly 2c209af1fa] [formerly e673ed62bd [formerly 2c209af1fa] [formerly fe457e89a7 [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]]
Former-commit-id: fe457e89a7
Former-commit-id: 675bf92355 [formerly 5661124038]
Former-commit-id: 84a107c8fa
|
2014-09-02 09:53:25 -05:00 |
|
Nate Jensen
|
037859fb38
|
Merge "Omaha #3459 Ensure font is initialized before queryJob runs, Additional refactoring to someday allow ZoneSelectorResource to use more common code." into omaha_14.4.1
Former-commit-id: 3efe4cf3b0 [formerly c4333e030c] [formerly 3efe4cf3b0 [formerly c4333e030c] [formerly 13f1a5a8ab [formerly 172d733902e6430de4f776eed3ad4cd6a94164a5]]]
Former-commit-id: 13f1a5a8ab
Former-commit-id: ce408af16d [formerly d7a2ff8336]
Former-commit-id: f913771eb0
|
2014-09-02 09:52:38 -05:00 |
|
Nate Jensen
|
9f908d764c
|
Omaha #3356 fix cave startup
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595
Former-commit-id: 9bf9e3a658 [formerly 4395ab6f11] [formerly 9bf9e3a658 [formerly 4395ab6f11] [formerly ef99d43451 [formerly d326ee1a73a852e5534e76bf2148afd7646adb7e]]]
Former-commit-id: ef99d43451
Former-commit-id: b2d1d16230 [formerly fe789cce26]
Former-commit-id: 20aa52b2ed
|
2014-09-02 09:50:08 -05:00 |
|
Richard Peter
|
5496419cc9
|
Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1
Former-commit-id: 5db143cd92 [formerly 6f66071eca] [formerly 5db143cd92 [formerly 6f66071eca] [formerly 40917b6118 [formerly f7aa38e6092e59e314fedad22829eed9e5c22ad2]]]
Former-commit-id: 40917b6118
Former-commit-id: 0f7e216834 [formerly 59ad20bac3]
Former-commit-id: c1fcdcfde2
|
2014-09-02 09:23:58 -05:00 |
|
Mark Peters
|
aa58dab103
|
Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473
Former-commit-id: 966879b8a1 [formerly e35a7451c6] [formerly 966879b8a1 [formerly e35a7451c6] [formerly 045746ec21 [formerly 8099cbe2359334d6718761046a1475fca687af35]]]
Former-commit-id: 045746ec21
Former-commit-id: c850f6b6cd [formerly cc96e1fb1f]
Former-commit-id: 264c5afa15
|
2014-08-29 16:17:22 -05:00 |
|
Mark Peters
|
9cab14d5b6
|
Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9
Former-commit-id: 86b9016338 [formerly 097ce54969] [formerly 86b9016338 [formerly 097ce54969] [formerly 91f2b365a1 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]]
Former-commit-id: 91f2b365a1
Former-commit-id: abd256ab93 [formerly 54f9a37e6c]
Former-commit-id: a3c382c0f7
|
2014-08-29 15:05:29 -05:00 |
|
Ron Anderson
|
4a821c89b7
|
Omaha #3459 Ensure font is initialized before queryJob runs,
Additional refactoring to someday allow ZoneSelectorResource to use more common code.
Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062
Former-commit-id: f3f2ec8843 [formerly 8583386e5f] [formerly f3f2ec8843 [formerly 8583386e5f] [formerly de490ea582 [formerly a1896437f432bcb360365d28a0ee7377cec565af]]]
Former-commit-id: de490ea582
Former-commit-id: ae69665e50 [formerly 338672c03f]
Former-commit-id: 3954787487
|
2014-08-29 12:04:52 -05:00 |
|
Nate Jensen
|
5e78fb700b
|
Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1
Former-commit-id: 47261a4ac4 [formerly 16191b10ab] [formerly 47261a4ac4 [formerly 16191b10ab] [formerly c60dfb889c [formerly 3482282527df3ffd13c93d1a5d63d52ce79f8b2b]]]
Former-commit-id: c60dfb889c
Former-commit-id: 6647ce3111 [formerly b61f93a2e4]
Former-commit-id: 08a9210cce
|
2014-08-29 11:16:16 -05:00 |
|
Steve Harris
|
a7e18342d9
|
Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
Former-commit-id: f51ceee718 [formerly aedf89c00b] [formerly f51ceee718 [formerly aedf89c00b] [formerly c49eabbb45 [formerly 94468f09bd626bd2ff26e7312ceede154f427664]]]
Former-commit-id: c49eabbb45
Former-commit-id: 113bcace66 [formerly d24b29f7b2]
Former-commit-id: aed5540042
|
2014-08-29 11:05:34 -05:00 |
|
Ron Anderson
|
acc6079444
|
Omaha #3561 Yet another attempt to fix combinations file updating
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f
Former-commit-id: 89cde78ea6 [formerly bd52b5a924] [formerly 89cde78ea6 [formerly bd52b5a924] [formerly 9f37d7914a [formerly b1c067fe33d1fe09f89e981b03ef178bcc3a5f93]]]
Former-commit-id: 9f37d7914a
Former-commit-id: b58479dc0b [formerly b489928744]
Former-commit-id: 7158207736
|
2014-08-29 10:45:54 -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 |
|
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
|
94cf9816c7
|
Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
Former-commit-id: 7bf0d7cd2a [formerly 2710aed225] [formerly 7bf0d7cd2a [formerly 2710aed225] [formerly 8536f6681a [formerly 2bac6ff5e600218f61343a7dc0f540c27f291924]]]
Former-commit-id: 8536f6681a
Former-commit-id: f5810478ef [formerly 3ddebb2170]
Former-commit-id: 288db1aea0
|
2014-08-27 16:27:40 -05:00 |
|
Roger Ferrel
|
87b0200274
|
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: 0147449477 [formerly fa42c4069a] [formerly 0147449477 [formerly fa42c4069a] [formerly 9154ef60bb [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]]
Former-commit-id: 9154ef60bb
Former-commit-id: 17a8bd795d [formerly 63a1b2890b]
Former-commit-id: 6e695a12d1
|
2014-08-27 15:06:52 -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
|
ba9c46532e
|
Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
Former-commit-id: 697e1c0b79 [formerly 6fca563d21] [formerly 697e1c0b79 [formerly 6fca563d21] [formerly 7acf4a04b2 [formerly bdc7d4cb7873651a4b59e0b6af9bb9dae931de77]]]
Former-commit-id: 7acf4a04b2
Former-commit-id: 783a805a8a [formerly ff03dc5783]
Former-commit-id: 60b0b76d42
|
2014-08-27 09:54:49 -05:00 |
|
Nate Jensen
|
a739387842
|
Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
Former-commit-id: 0edb5fc46c [formerly 2d1d18b2ff] [formerly 0edb5fc46c [formerly 2d1d18b2ff] [formerly 1ad37de1ef [formerly 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05]]]
Former-commit-id: 1ad37de1ef
Former-commit-id: dc09d337f2 [formerly 571ae1d09e]
Former-commit-id: 376670d221
|
2014-08-27 09:54:24 -05:00 |
|
Brian Clements
|
fcb9de6bf4
|
Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: a39a997a8d [formerly a609334abf] [formerly a39a997a8d [formerly a609334abf] [formerly f871058f67 [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]]]
Former-commit-id: f871058f67
Former-commit-id: f179d62459 [formerly e02be806d0]
Former-commit-id: aa0cdd843c
|
2014-08-26 17:22:20 -05:00 |
|
Nate Jensen
|
ac5a4234cb
|
Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: f84e89b694 [formerly dbbf012a34] [formerly f84e89b694 [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]
Former-commit-id: fdc4cc60b9
Former-commit-id: 85a17ed23f [formerly 70216d11e4]
Former-commit-id: cf2e6693ed
|
2014-08-26 16:45:00 -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
|
c107a88f8c
|
Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1
Former-commit-id: 41e6446b49 [formerly 704ebac10a] [formerly 41e6446b49 [formerly 704ebac10a] [formerly b92d94d19d [formerly d5db15de813a41767a1a10b0bfa07eb88c8dff6e]]]
Former-commit-id: b92d94d19d
Former-commit-id: 0eea7a1105 [formerly 08a3bcd85e]
Former-commit-id: 0e17b3331e
|
2014-08-26 13:42:13 -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 |
|
Ron Anderson
|
0d75ae75e3
|
Merge "Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job" into omaha_14.4.1
Former-commit-id: 3ffadac038 [formerly 753b715493] [formerly 3ffadac038 [formerly 753b715493] [formerly 73fec5c36a [formerly 2cfb44f69025ba06e85a44e481bac1f88b851834]]]
Former-commit-id: 73fec5c36a
Former-commit-id: 0ee02920ec [formerly eabf14a6fe]
Former-commit-id: 01dcd5de10
|
2014-08-25 16:18:58 -05:00 |
|
Nate Jensen
|
626417bde9
|
Merge "Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override" into omaha_14.4.1
Former-commit-id: 76ca1815ad [formerly 2516c869d2] [formerly 76ca1815ad [formerly 2516c869d2] [formerly 1a48a8190f [formerly 5a0ccfe4b1effb0946e6d542c492bff45d6a904b]]]
Former-commit-id: 1a48a8190f
Former-commit-id: 2c09a51125 [formerly 85ececab93]
Former-commit-id: 3ece89083f
|
2014-08-25 14:14:47 -05:00 |
|
Mark Peters
|
2d9e8e0553
|
Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e
Former-commit-id: c7486f3952 [formerly 7b37c4d188] [formerly c7486f3952 [formerly 7b37c4d188] [formerly 6634a2df01 [formerly 449f167ce1c30a595b4b673fc4d71658500e844d]]]
Former-commit-id: 6634a2df01
Former-commit-id: 1c0e5a7d35 [formerly f1d31723c7]
Former-commit-id: c069dd338a
|
2014-08-25 13:50:27 -05:00 |
|
Ron Anderson
|
eede0b99c3
|
Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job
Change-Id: Id759e14fcec25a68add1b65e9bf48d836ada14c0
Former-commit-id: 56b553ad0d [formerly 8434195c57] [formerly 56b553ad0d [formerly 8434195c57] [formerly 606e2b210c [formerly 6b6213fe5b0ca48045fa59136b72efdf46f7e3f1]]]
Former-commit-id: 606e2b210c
Former-commit-id: 6c38d4f143 [formerly fda5c981f9]
Former-commit-id: 7799092b08
|
2014-08-25 12:39:58 -05:00 |
|
Roger Ferrel
|
c534338504
|
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: a610e0a34b [formerly ca3a0595d2] [formerly a610e0a34b [formerly ca3a0595d2] [formerly d0779ef059 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]]]
Former-commit-id: d0779ef059
Former-commit-id: be7d387a4b [formerly cfe1212590]
Former-commit-id: a9d8c8f3f5
|
2014-08-25 07:59:26 -05:00 |
|
Brian.Dyke
|
27372f098c
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 2ddc920a4a [formerly 325887e605] [formerly 2ddc920a4a [formerly 325887e605] [formerly dd9d7133d9 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]
Former-commit-id: dd9d7133d9
Former-commit-id: c8e9153884 [formerly 1839b614df]
Former-commit-id: cd1b914f50
|
2014-08-22 14:16:22 -04:00 |
|
Steve Harris
|
4ee93b8fc1
|
Omaha #3368 - removing cave/hydro
Former-commit-id: 8c66e2b895 [formerly 794208a255] [formerly 8c66e2b895 [formerly 794208a255] [formerly 9cda8755c6 [formerly a232972763ef0dcbccd5d83b3841498f1b77b7aa]]]
Former-commit-id: 9cda8755c6
Former-commit-id: 66b0e82582 [formerly d4862be8c6]
Former-commit-id: a9c3fabb8b
|
2014-08-22 13:08:32 -05:00 |
|
Greg Armendariz
|
d8e66d3d07
|
Merge "Omaha #3368 - Move ohd plugin to new repository" into omaha_14.4.1
Former-commit-id: b19a61cd10 [formerly 6370aaba96] [formerly b19a61cd10 [formerly 6370aaba96] [formerly b951f0e4eb [formerly 24376606c4974e3b22f120dac1c81a1752771ab1]]]
Former-commit-id: b951f0e4eb
Former-commit-id: c2bfd6975f [formerly 551e0a6a99]
Former-commit-id: e84a38aeea
|
2014-08-22 08:06:13 -05:00 |
|
Steve Harris
|
1d59bbc93f
|
Omaha #3368 - Move ohd plugin to new repository
Former-commit-id: aec275dc31 [formerly 8c467a9fa5] [formerly aec275dc31 [formerly 8c467a9fa5] [formerly 28e88dfe7e [formerly 56dfed379b0e41c435a3226c3f02b9bc5232b4fd]]]
Former-commit-id: 28e88dfe7e
Former-commit-id: 7542fda9a7 [formerly 675dbe0c21]
Former-commit-id: b5f3fe44ed
|
2014-08-21 11:04:08 -05:00 |
|