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
|
e89d0a9aad
|
Merge "Omaha #3356 remove unnecessary register buddy to uf.viz.core" into omaha_14.4.1
Former-commit-id: f8d2bbd89a [formerly c17f5039b3] [formerly f8d2bbd89a [formerly c17f5039b3] [formerly 6c89507d2f [formerly ae78c2f59d47eb83d8693676362aaf099dbbe35b]]]
Former-commit-id: 6c89507d2f
Former-commit-id: 667bda47a8 [formerly 8277e2cd1f]
Former-commit-id: 65d06e808e
|
2014-09-04 13:48:39 -05:00 |
|
Nate Jensen
|
8d779e79d3
|
Merge "Omaha #3545 - Add log and fail message when directories are missing" into omaha_14.4.1
Former-commit-id: 755dd0c97e [formerly 7a5eeb427c] [formerly 755dd0c97e [formerly 7a5eeb427c] [formerly 1cd7ec9ac7 [formerly 40448419702642f0e7b85dbe031b091e43e9ee88]]]
Former-commit-id: 1cd7ec9ac7
Former-commit-id: d4359bb64a [formerly 326185ad9c]
Former-commit-id: cdb4604072
|
2014-09-04 13:24:29 -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 |
|
Nathan Bowler
|
6d5bf0a035
|
Omaha #3405 Adding unaltered, original airep and pirep scripts
Change-Id: I9daefa1c0c905b2022d7ad891a9983fb831c5ac3
Former-commit-id: d7d3a3d119 [formerly 0a6cd0db2d] [formerly d7d3a3d119 [formerly 0a6cd0db2d] [formerly b1b0760a8c [formerly 4a47a2053311ebc5ae4a5ad540c985c7a24ea4f3]]]
Former-commit-id: b1b0760a8c
Former-commit-id: 3e7a32b146 [formerly 8684ea7447]
Former-commit-id: 3e0ea8f7ff
|
2014-09-04 12:27:40 -04: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 |
|
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 |
|
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
|
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
|
4d031466de
|
Merge "Omaha #3356 remove OBE register buddies from collaboration" into omaha_14.4.1
Former-commit-id: 8bb8625edf [formerly 2a097da5c2] [formerly 8bb8625edf [formerly 2a097da5c2] [formerly 0de385006d [formerly 91942c044f4c4462a2a76192047c40448754c2ec]]]
Former-commit-id: 0de385006d
Former-commit-id: acb9909b35 [formerly c6a5a6145e]
Former-commit-id: f1d071ad10
|
2014-09-03 10:50:02 -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 |
|
Chris Cody
|
cfc713d6ea
|
Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline
Conflicts:
tests/unit/com/raytheon/uf/common/serialization/comm/RequestRouterTest.java
tests/unit/com/raytheon/uf/edex/requestsrv/request/ServerPrivilegedRequestHandlerTest.java
tests/unit/com/raytheon/uf/edex/requestsrv/router/RemoteServerRequestRouterTest.java
tests/unit/com/raytheon/uf/edex/requestsrv/router/ServerRequestRouterTest.java
Change-Id: Ib1cec696e6c31b4a3292174a3557fe72b86ce4ff
Former-commit-id: 13bc309688 [formerly 005c0c0b10] [formerly 13bc309688 [formerly 005c0c0b10] [formerly 7dfcf245bf [formerly 5161931ed5438b78a936f204a588a742c9768f8a]]]
Former-commit-id: 7dfcf245bf
Former-commit-id: 58b663b788 [formerly 41c12afc1d]
Former-commit-id: 7cb8e16a5e
|
2014-09-03 09:54:46 -05:00 |
|
Chris Cody
|
c2ff252400
|
Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline.
Conflicts:
tests/.classpath
Change-Id: I0014762b034e95b1bb8a6d37a18ef7445873994c
Former-commit-id: 91fde6ab60 [formerly f8faec0526] [formerly 91fde6ab60 [formerly f8faec0526] [formerly 529377618f [formerly 07aa4794d04cb31e7c6020d792d45d0afb951268]]]
Former-commit-id: 529377618f
Former-commit-id: 8e340e4b05 [formerly 3fc1103d07]
Former-commit-id: f025c02ec6
|
2014-09-03 09:50:50 -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 |
|
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 |
|
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 |
|
Richard Peter
|
76be4ae710
|
Merge "Omaha #3549 improve acarssounding error message" into omaha_14.4.1
Former-commit-id: 78550587d8 [formerly 1ebcacee88] [formerly 78550587d8 [formerly 1ebcacee88] [formerly 09a044b9af [formerly 4d0cb95dfed73beeb51e15d753b76c315877d2ea]]]
Former-commit-id: 09a044b9af
Former-commit-id: e9114850ac [formerly 7fa3a9b834]
Former-commit-id: 33b9f58bc3
|
2014-09-02 12:32:39 -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 |
|
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 |
|
Greg Armendariz
|
8566996f06
|
Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1
Former-commit-id: a9f6d3528c [formerly 33b0ac3811] [formerly a9f6d3528c [formerly 33b0ac3811] [formerly b229adbf38 [formerly 2a4e26c1be0118f71e18a2c5bfa8777163a97d30]]]
Former-commit-id: b229adbf38
Former-commit-id: d63a9da4d6 [formerly edb50956c8]
Former-commit-id: a2aa3fa6ff
|
2014-09-02 10:40:13 -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 |
|
Brian Clements
|
54a627e05a
|
Omaha #3573 fixed clean in collaboration dataserver ant script
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a
Former-commit-id: eb84b255b0 [formerly 9fe49043e7] [formerly eb84b255b0 [formerly 9fe49043e7] [formerly 23f1f7b2b6 [formerly d2bfe367c9753fc4a2db181c7966179a20713a02]]]
Former-commit-id: 23f1f7b2b6
Former-commit-id: 8da4a4ccf4 [formerly 7a29eef035]
Former-commit-id: e56c909c26
|
2014-09-02 10:04:39 -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 |
|
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 |
|
Nate Jensen
|
5b03e9fa4a
|
Merge "Omaha #3562 jetty upgrade change for dataserver" into omaha_14.4.1
Former-commit-id: 22f24dbb13 [formerly c8c93dccf1] [formerly 22f24dbb13 [formerly c8c93dccf1] [formerly e0d861461b [formerly 96882cbdc801c37e63ca0bc1ce950cbdffd97122]]]
Former-commit-id: e0d861461b
Former-commit-id: 16ee6e44a2 [formerly 1d3c307bd8]
Former-commit-id: 419437c6bd
|
2014-08-28 11:23:43 -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 |
|
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 Clements
|
0efea299ab
|
Omaha #3562 jetty upgrade change for dataserver
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663
Former-commit-id: ab4eaee171 [formerly 3595bd2728] [formerly ab4eaee171 [formerly 3595bd2728] [formerly 66da9e63b7 [formerly bb90464f68d562105809ef36f88869ff4570095c]]]
Former-commit-id: 66da9e63b7
Former-commit-id: aa4dc98be0 [formerly 3efcaa6a8e]
Former-commit-id: 7a990efc0c
|
2014-08-27 13:18:13 -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 |
|