Chris Cody
|
3600dd6c14
|
Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline.
Conflicts:
tests/.classpath
Change-Id: I0014762b034e95b1bb8a6d37a18ef7445873994c
Former-commit-id: bbf1fd8aa8 [formerly 91fde6ab60] [formerly f8faec0526] [formerly 529377618f [formerly f8faec0526 [formerly 07aa4794d04cb31e7c6020d792d45d0afb951268]]]
Former-commit-id: 529377618f
Former-commit-id: 6cf763b4bcebd242e12b9f707dca3961b380f686 [formerly 3fc1103d07]
Former-commit-id: 8e340e4b05
|
2014-09-03 09:50:50 -05:00 |
|
Nate Jensen
|
aef95b0ef6
|
Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1
Former-commit-id: 48635d9239 [formerly a0830d06d5] [formerly 5b80aadbac] [formerly 80cc58cf25 [formerly 5b80aadbac [formerly e393e1f0455d466edde925608b6f0f1e35351141]]]
Former-commit-id: 80cc58cf25
Former-commit-id: 17298aec038f0c2d03fd69b55853b6df1cfc0a47 [formerly db8517a576]
Former-commit-id: 8e6f1c0b05
|
2014-09-03 09:21:28 -05:00 |
|
Ben Steffensmeier
|
31f58cc68e
|
Omaha #3390 Remove references to deprecated API.
Former-commit-id: 59e6ec282f [formerly 950075dc59] [formerly ae71f2aac36650a2db87e2e2b081b1b72b797f56 [formerly 1d2144e840]] [formerly e32037b42a [formerly 1d2144e840 [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]]
Former-commit-id: e32037b42a
Former-commit-id: 978887cb907a630899b357400937ea888e94a9f4 [formerly b77166c26e]
Former-commit-id: 068653ac95
|
2014-09-02 15:39:45 -05:00 |
|
Richard Peter
|
87ee958c33
|
Merge "Omaha #3549 improve error message" into omaha_14.4.1
Former-commit-id: a9c5622575 [formerly d968b5085d] [formerly 3c874e1aa1] [formerly 7dc4327ffa [formerly 3c874e1aa1 [formerly 6e8ad4c9e2046ac950bbf166a09492a69c88cb7e]]]
Former-commit-id: 7dc4327ffa
Former-commit-id: 432a6dbd7a4b5d78c1acca24871270eef299a2fd [formerly 388c1ca919]
Former-commit-id: b9db837e14
|
2014-09-02 14:25:18 -05:00 |
|
Richard Peter
|
58222f5a6a
|
Merge "Omaha #2926 switched textdb to thrift client" into omaha_14.4.1
Former-commit-id: 8e191c2c60 [formerly 612990b3ed] [formerly 7628a0a56a] [formerly 0f94b663a4 [formerly 7628a0a56a [formerly 80294bbd891edde5b190941175f73d634f1a3e08]]]
Former-commit-id: 0f94b663a4
Former-commit-id: d01294032fb4e66d3e529c0bea83d466743d41aa [formerly 6151d549ce]
Former-commit-id: e3e9368411
|
2014-09-02 12:45:37 -05:00 |
|
Nate Jensen
|
bec31cf645
|
Omaha #3549 improve error message
Change-Id: I54cdefd3b77fa5ad8eba9aad6ae8c93b7bd0a67d
Former-commit-id: 32e40b5903 [formerly 3cf81ab39e] [formerly fa330b698d] [formerly 37501b884a [formerly fa330b698d [formerly 369867e18b5209895137f5e4121fa06bfa2858c7]]]
Former-commit-id: 37501b884a
Former-commit-id: 295230b31262a47d94f4c22e8e5459e6e428d04e [formerly 11b4f270e6]
Former-commit-id: 635604b7a9
|
2014-09-02 12:38:04 -05:00 |
|
Richard Peter
|
b12762b5eb
|
Merge "Omaha #3549 improve acarssounding error message" into omaha_14.4.1
Former-commit-id: 245c304d6c [formerly 78550587d8] [formerly 1ebcacee88] [formerly 09a044b9af [formerly 1ebcacee88 [formerly 4d0cb95dfed73beeb51e15d753b76c315877d2ea]]]
Former-commit-id: 09a044b9af
Former-commit-id: 1d1c404038e0117789669999bd6ba53869c133fd [formerly 7fa3a9b834]
Former-commit-id: e9114850ac
|
2014-09-02 12:32:39 -05:00 |
|
Ron Anderson
|
ac506c4706
|
Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
Former-commit-id: 63ab6bd9a9 [formerly 8d9741bd83] [formerly 6a5d4acf7c] [formerly aa6835147b [formerly 6a5d4acf7c [formerly 31578a50044053da2ecf14697764bfac2ee8ac8d]]]
Former-commit-id: aa6835147b
Former-commit-id: b1cd47a3d83b85b71256a99afa990cb682a5acff [formerly 017378f646]
Former-commit-id: f27986f541
|
2014-09-02 12:08:44 -05:00 |
|
Mark Peters
|
d999c9b971
|
Omaha #3548 PluginDataObjectFilter fails to start in spring
Change-Id: Ib0aa88dd3341ae65aef9b2b02ffbd1645510b95e
Former-commit-id: 5f08576217 [formerly be6dae0cf9] [formerly ad994bc4c6] [formerly 53869a4b0b [formerly ad994bc4c6 [formerly 07b54b870e36f37b909d9e7da1f1da4d181b06b0]]]
Former-commit-id: 53869a4b0b
Former-commit-id: 352eadb0bfcd10c4a3285b275cd239dde33fbc0b [formerly 2c02132ec0]
Former-commit-id: 6ddbbc366a
|
2014-09-02 11:38:06 -05:00 |
|
Nate Jensen
|
6e328368a3
|
Omaha #3549 improve acarssounding error message
Change-Id: I850eb6bbcd825bee26f0e93226b10d077378dacf
Former-commit-id: 85696fe8d4 [formerly 6838a4d8cc] [formerly 65938d34ef7bc5ad50f6d527ea955321eaf1e7d5 [formerly 8570cad6c6]] [formerly 82ef4c1646 [formerly 8570cad6c6 [formerly 16e66726bd5a8f20d6de21708c7f3372a046cea8]]]
Former-commit-id: 82ef4c1646
Former-commit-id: ee661ee4461cd4664ce88dce5e2346ddcda5f2bd [formerly eed90eceeb]
Former-commit-id: c7fdb67228
|
2014-09-02 11:21:10 -05:00 |
|
Greg Armendariz
|
937866d9fc
|
Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1
Former-commit-id: 964ad44a4d [formerly a9f6d3528c] [formerly 33b0ac3811] [formerly b229adbf38 [formerly 33b0ac3811 [formerly 2a4e26c1be0118f71e18a2c5bfa8777163a97d30]]]
Former-commit-id: b229adbf38
Former-commit-id: 3425e01542aa3ace9515c5168fc3318fc6f9f911 [formerly edb50956c8]
Former-commit-id: d63a9da4d6
|
2014-09-02 10:40:13 -05:00 |
|
Nate Jensen
|
9fe09a5a4a
|
Merge "Omaha #3356 fix cave startup" into omaha_14.4.1
Former-commit-id: 8b646ba31d [formerly 3258b9a2b2] [formerly dffc436b8a06ad9b66121f31442f101467555620 [formerly 5247f4833f]] [formerly 653d594382 [formerly 5247f4833f [formerly e3c3d979ba7dcb46d2af716aa73e05c67f0dd2ba]]]
Former-commit-id: 653d594382
Former-commit-id: 16cdf4e9bf10ff7dd7304857d8a8edd3a9887132 [formerly a63f5ee67b]
Former-commit-id: 9067556a0e
|
2014-09-02 10:14:08 -05:00 |
|
Brian Clements
|
efa02bf1b0
|
Omaha #3573 fixed clean in collaboration dataserver ant script
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a
Former-commit-id: 051344f98f [formerly eb84b255b0] [formerly 9fe49043e7] [formerly 23f1f7b2b6 [formerly 9fe49043e7 [formerly d2bfe367c9753fc4a2db181c7966179a20713a02]]]
Former-commit-id: 23f1f7b2b6
Former-commit-id: c7bdc30721b964ac4e5ff63f21d1f375ed5ec691 [formerly 7a29eef035]
Former-commit-id: 8da4a4ccf4
|
2014-09-02 10:04:39 -05:00 |
|
Nate Jensen
|
23e2185306
|
Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: 2d5df2705f [formerly e673ed62bd] [formerly 2c209af1fa] [formerly fe457e89a7 [formerly 2c209af1fa [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]]
Former-commit-id: fe457e89a7
Former-commit-id: d45ff0db4fb7b24b0d0dac7dd89e774e93c37f76 [formerly 5661124038]
Former-commit-id: 675bf92355
|
2014-09-02 09:53:25 -05:00 |
|
Nate Jensen
|
8ce67a74fc
|
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: 9911f52bba [formerly 3efe4cf3b0] [formerly c4333e030c] [formerly 13f1a5a8ab [formerly c4333e030c [formerly 172d733902e6430de4f776eed3ad4cd6a94164a5]]]
Former-commit-id: 13f1a5a8ab
Former-commit-id: d4c7add5b764b550d58d33f2f4196259ef2e45ee [formerly d7a2ff8336]
Former-commit-id: ce408af16d
|
2014-09-02 09:52:38 -05:00 |
|
Nate Jensen
|
52c35a13e4
|
Omaha #3356 fix cave startup
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595
Former-commit-id: c77003fe38 [formerly 9bf9e3a658] [formerly 4395ab6f11] [formerly ef99d43451 [formerly 4395ab6f11 [formerly d326ee1a73a852e5534e76bf2148afd7646adb7e]]]
Former-commit-id: ef99d43451
Former-commit-id: 0df3a1960400546ca8de64d6de8790e6692bf51e [formerly fe789cce26]
Former-commit-id: b2d1d16230
|
2014-09-02 09:50:08 -05:00 |
|
Richard Peter
|
a464a6a8d4
|
Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1
Former-commit-id: 7a17f81e58 [formerly 5db143cd92] [formerly 6f66071eca] [formerly 40917b6118 [formerly 6f66071eca [formerly f7aa38e6092e59e314fedad22829eed9e5c22ad2]]]
Former-commit-id: 40917b6118
Former-commit-id: 0aee5e24eab0cab12c41ad64d2f52c7f99e993be [formerly 59ad20bac3]
Former-commit-id: 0f7e216834
|
2014-09-02 09:23:58 -05:00 |
|
Mark Peters
|
b42885a2af
|
Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473
Former-commit-id: fc72ed828c [formerly 966879b8a1] [formerly e35a7451c6] [formerly 045746ec21 [formerly e35a7451c6 [formerly 8099cbe2359334d6718761046a1475fca687af35]]]
Former-commit-id: 045746ec21
Former-commit-id: 9f5aeecba1c51e5935aa53069c6d888c3c64a904 [formerly cc96e1fb1f]
Former-commit-id: c850f6b6cd
|
2014-08-29 16:17:22 -05:00 |
|
Mark Peters
|
adae10c2d0
|
Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9
Former-commit-id: b906c8054b [formerly 86b9016338] [formerly 4e3c0029ee6b6edecbd7502e4a30120d3063486c [formerly 097ce54969]] [formerly 91f2b365a1 [formerly 097ce54969 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]]
Former-commit-id: 91f2b365a1
Former-commit-id: b7fb901b9427a42706a36a3d4c34c6103d17ca1a [formerly 54f9a37e6c]
Former-commit-id: abd256ab93
|
2014-08-29 15:05:29 -05:00 |
|
Ron Anderson
|
06dbcd69d6
|
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: 0bb6076cdc [formerly f3f2ec8843] [formerly 8583386e5f] [formerly de490ea582 [formerly 8583386e5f [formerly a1896437f432bcb360365d28a0ee7377cec565af]]]
Former-commit-id: de490ea582
Former-commit-id: 39b07ee71f914fcb7284dbe4733a3b9645faf975 [formerly 338672c03f]
Former-commit-id: ae69665e50
|
2014-08-29 12:04:52 -05:00 |
|
Nate Jensen
|
e994012d79
|
Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1
Former-commit-id: 1f087e5f0c [formerly 47261a4ac4] [formerly 16191b10ab] [formerly c60dfb889c [formerly 16191b10ab [formerly 3482282527df3ffd13c93d1a5d63d52ce79f8b2b]]]
Former-commit-id: c60dfb889c
Former-commit-id: d6db0ba4036aa9711953caa0d0cd0c0456216e6e [formerly b61f93a2e4]
Former-commit-id: 6647ce3111
|
2014-08-29 11:16:16 -05:00 |
|
Steve Harris
|
703098364e
|
Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
Former-commit-id: 12cd8db99b [formerly f51ceee718] [formerly aedf89c00b] [formerly c49eabbb45 [formerly aedf89c00b [formerly 94468f09bd626bd2ff26e7312ceede154f427664]]]
Former-commit-id: c49eabbb45
Former-commit-id: a225c040ed3b1662d147a0f61eb11c429834a4a4 [formerly d24b29f7b2]
Former-commit-id: 113bcace66
|
2014-08-29 11:05:34 -05:00 |
|
Ron Anderson
|
d7f3e42548
|
Omaha #3561 Yet another attempt to fix combinations file updating
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f
Former-commit-id: 30ef2a7667 [formerly 89cde78ea6] [formerly bd52b5a924] [formerly 9f37d7914a [formerly bd52b5a924 [formerly b1c067fe33d1fe09f89e981b03ef178bcc3a5f93]]]
Former-commit-id: 9f37d7914a
Former-commit-id: 6362bc55a2ad3ebcea3f99623c5d126d5e3a486e [formerly b489928744]
Former-commit-id: b58479dc0b
|
2014-08-29 10:45:54 -05:00 |
|
Steve Harris
|
10070d2762
|
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: 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: db0dcd3c8aec6653a2b81e49b72319049b73eb54 [formerly d984dd538f]
Former-commit-id: 66b485c000
|
2014-08-29 10:17:52 -05:00 |
|
Nate Jensen
|
5d22759e9d
|
Merge "Omaha #3356 inject spatial query through spring" into omaha_14.4.1
Former-commit-id: dc6e307895 [formerly 8f0bd2bb84] [formerly 67d5cb52ae] [formerly 822f1a20b0 [formerly 67d5cb52ae [formerly afd5131062926a78942db59f35a5c2e719a542da]]]
Former-commit-id: 822f1a20b0
Former-commit-id: 0cf3789fe064185f8bdfb1456506f24980b4e4f4 [formerly 0a8312b09d]
Former-commit-id: 975f93d6cf
|
2014-08-28 14:32:57 -05:00 |
|
Nate Jensen
|
fcc794c395
|
Omaha #3356 inject spatial query through spring
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d
Former-commit-id: c383a50c2c [formerly baece22d79] [formerly 58c85c76ef] [formerly 8f226399f7 [formerly 58c85c76ef [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]]]
Former-commit-id: 8f226399f7
Former-commit-id: 8fb5e2190df56d7947f5fa01937f377db2b2b918 [formerly 9843865254]
Former-commit-id: 244395af69
|
2014-08-28 11:46:25 -05:00 |
|
Nate Jensen
|
37b7936b7c
|
Merge "Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily" into omaha_14.4.1
Former-commit-id: 637dbddd2f [formerly 9fe0e6df69] [formerly 625f0db18f] [formerly 0ee832fc2f [formerly 625f0db18f [formerly 0a6287431cbcc43ad6f42898a94d173fe451566e]]]
Former-commit-id: 0ee832fc2f
Former-commit-id: d2c0d3d4439d68fab0f781b1b347ece53b4e57ad [formerly ce138b3e31]
Former-commit-id: 2a7cd5957d
|
2014-08-28 11:30:45 -05:00 |
|
Nate Jensen
|
4e49b2032e
|
Merge "Omaha #3562 jetty upgrade change for dataserver" into omaha_14.4.1
Former-commit-id: 579881a4fe [formerly 22f24dbb13] [formerly c8c93dccf1] [formerly e0d861461b [formerly c8c93dccf1 [formerly 96882cbdc801c37e63ca0bc1ce950cbdffd97122]]]
Former-commit-id: e0d861461b
Former-commit-id: b2f37db95cc07754df8630ea19a398267bdd4e32 [formerly 1d3c307bd8]
Former-commit-id: 16ee6e44a2
|
2014-08-28 11:23:43 -05:00 |
|
Ron Anderson
|
c6eb33afcc
|
Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34
Former-commit-id: 1e05b981fa [formerly dc185b8dd1] [formerly bb1e80b844] [formerly 2b88ade974 [formerly bb1e80b844 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]]
Former-commit-id: 2b88ade974
Former-commit-id: 36188db03ab5afd51b2833d61639eaa10519a6f7 [formerly 0962c75d18]
Former-commit-id: 39d00a72ce
|
2014-08-28 10:43:54 -05:00 |
|
Nate Jensen
|
fc25b7f583
|
Merge "Omaha #3503 Composite product generators init after spring beans are loaded" into omaha_14.4.1
Former-commit-id: b036c5b851 [formerly fb0829fd4d] [formerly de69231d3a] [formerly afe94aca08 [formerly de69231d3a [formerly 1eb554cd30d53daf44de42e0ddd3f35bf8f37bae]]]
Former-commit-id: afe94aca08
Former-commit-id: e28bfa9a0c5522e752aaeb4c6e11382a37536cf8 [formerly 8952d15b12]
Former-commit-id: da6259a198
|
2014-08-28 10:40:50 -05:00 |
|
Nate Jensen
|
b43a6418c7
|
Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
Former-commit-id: 7221b94904 [formerly 7bf0d7cd2a] [formerly 2710aed225] [formerly 8536f6681a [formerly 2710aed225 [formerly 2bac6ff5e600218f61343a7dc0f540c27f291924]]]
Former-commit-id: 8536f6681a
Former-commit-id: 10bd606cc6bf2a29f554ff34922524754debf4cf [formerly 3ddebb2170]
Former-commit-id: f5810478ef
|
2014-08-27 16:27:40 -05:00 |
|
Roger Ferrel
|
db74982258
|
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: 2944c3770f [formerly 0147449477] [formerly fa42c4069a] [formerly 9154ef60bb [formerly fa42c4069a [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]]
Former-commit-id: 9154ef60bb
Former-commit-id: 9c8c9bee1d8c31a829aaaca5968d61664e6d90fe [formerly 63a1b2890b]
Former-commit-id: 17a8bd795d
|
2014-08-27 15:06:52 -05:00 |
|
Brian Clements
|
c6644cbe46
|
Omaha #3562 jetty upgrade change for dataserver
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663
Former-commit-id: 78e961b8f5 [formerly ab4eaee171] [formerly 3595bd2728] [formerly 66da9e63b7 [formerly 3595bd2728 [formerly bb90464f68d562105809ef36f88869ff4570095c]]]
Former-commit-id: 66da9e63b7
Former-commit-id: dfcfb1b1cb51f20136796b65cef53843ab441829 [formerly 3efcaa6a8e]
Former-commit-id: aa4dc98be0
|
2014-08-27 13:18:13 -05:00 |
|
Brian.Dyke
|
4a56b6f6e1
|
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: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]
Former-commit-id: f90649d7e7
|
2014-08-27 11:19:19 -04:00 |
|
Nate Jensen
|
1f9c98e8c4
|
Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
Former-commit-id: 6a20d84a8a [formerly 697e1c0b79] [formerly 6fca563d21] [formerly 7acf4a04b2 [formerly 6fca563d21 [formerly bdc7d4cb7873651a4b59e0b6af9bb9dae931de77]]]
Former-commit-id: 7acf4a04b2
Former-commit-id: 1343844853810696ccafe2e8795d21ef1b7f8773 [formerly ff03dc5783]
Former-commit-id: 783a805a8a
|
2014-08-27 09:54:49 -05:00 |
|
Nate Jensen
|
b1f76d8b6d
|
Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
Former-commit-id: 1ea041a01e [formerly 0edb5fc46c] [formerly 2d1d18b2ff] [formerly 1ad37de1ef [formerly 2d1d18b2ff [formerly 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05]]]
Former-commit-id: 1ad37de1ef
Former-commit-id: 39d951ec78dac285126b4df9a10e17fcf4d51d7c [formerly 571ae1d09e]
Former-commit-id: dc09d337f2
|
2014-08-27 09:54:24 -05:00 |
|
Nate Jensen
|
c508bb668c
|
Omaha #3132 fix compilation issue from merge
Change-Id: I76e189ff871c2ca8f99806e035abb07087626fba
Former-commit-id: a70df06392 [formerly 2f0b209e10] [formerly 0160955244] [formerly 3f7170f862 [formerly 0160955244 [formerly b45249baec6c6d4f77e5aeb23b910689df192c8a]]]
Former-commit-id: 3f7170f862
Former-commit-id: fc3a206bb36805ff0ce8c40da5b9af5501e60372 [formerly 281f360487]
Former-commit-id: 66c0933713
|
2014-08-26 18:22:26 -05:00 |
|
Brian Clements
|
3061205a6b
|
Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: 9509568efa [formerly a39a997a8d] [formerly a609334abf] [formerly f871058f67 [formerly a609334abf [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]]]
Former-commit-id: f871058f67
Former-commit-id: 28575adbedc1689f7fc46cd5d53fb04c3af8bd28 [formerly e02be806d0]
Former-commit-id: f179d62459
|
2014-08-26 17:22:20 -05:00 |
|
Brian Clements
|
2540fa9a95
|
Omaha #3503 Composite product generators init after spring beans are loaded
Change-Id: I894adbc14e1bfe183a3f7717d95dba85291a2a09
Former-commit-id: 11fa1b962c [formerly 5dc5530120] [formerly 095f84e71f] [formerly b88f012e69 [formerly 095f84e71f [formerly f6109e74ff5e26547c8fc03d7bb5ecde1046f689]]]
Former-commit-id: b88f012e69
Former-commit-id: f52e0674ecdaac7e697e849aef805d1954d0f156 [formerly e6b2143a6b]
Former-commit-id: f29fb0a656
|
2014-08-26 17:12:34 -05:00 |
|
Nate Jensen
|
5690db1e94
|
Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly dbbf012a34 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]
Former-commit-id: fdc4cc60b9
Former-commit-id: ec90e4ec5b78799ff8c90c5659475672966cd75e [formerly 70216d11e4]
Former-commit-id: 85a17ed23f
|
2014-08-26 16:45:00 -05:00 |
|
Steve Harris
|
00b3ad8eb6
|
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: 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 038b284066 [formerly 99ae9bdc10 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]
Former-commit-id: 038b284066
Former-commit-id: c9abc2fce0e20d37683d43d809074ccd92db5423 [formerly c8ba2b1ae6]
Former-commit-id: 1da31a86dc
|
2014-08-26 16:25:21 -05:00 |
|
Nate Jensen
|
8d0581a66d
|
Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1
Former-commit-id: bb4552ee2a [formerly 41e6446b49] [formerly 704ebac10a] [formerly b92d94d19d [formerly 704ebac10a [formerly d5db15de813a41767a1a10b0bfa07eb88c8dff6e]]]
Former-commit-id: b92d94d19d
Former-commit-id: 3efaa74664a741826024a3da6466b18e7749417f [formerly 08a3bcd85e]
Former-commit-id: 0eea7a1105
|
2014-08-26 13:42:13 -05:00 |
|
Nate Jensen
|
ef810f2d9e
|
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: 9060f82413 [formerly e4df37dd05] [formerly 46fc72804a] [formerly 448887b913 [formerly 46fc72804a [formerly 59c4919564db8f8ebf61fbac6ce2bdd29095479e]]]
Former-commit-id: 448887b913
Former-commit-id: 321a097fc9e5a18ceee0ca4fe7a03aed77dead94 [formerly 88ac1c057c]
Former-commit-id: ac814cc6c9
|
2014-08-26 13:39:15 -05:00 |
|
Brian.Dyke
|
ef2afe4f88
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: acc3321457 [formerly 489fec4b25] [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 86f0ed23c1 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]
Former-commit-id: b3767167c7
Former-commit-id: dfa43aa5c4d4a07843b46cd3b23eed8a26739086 [formerly f2b9203001]
Former-commit-id: 1b9a28cc62
|
2014-08-26 13:31:34 -04:00 |
|
Nate Jensen
|
1e4b11b2ee
|
Merge "Omaha #3541 fixed grid coverage spring" into omaha_14.4.1
Former-commit-id: 1b5cb51b4b [formerly d2a653e277] [formerly 169f5729db] [formerly 80ab7b8e53 [formerly 169f5729db [formerly 99211be9635e03e7ae117ff694912f7c58e7ab44]]]
Former-commit-id: 80ab7b8e53
Former-commit-id: b0ca763e35be6d15c9ee8f28defa248af0c3c7a1 [formerly b51a4ffee6]
Former-commit-id: f3d6d3b90c
|
2014-08-26 11:34:38 -05:00 |
|
Max Schenkelberg
|
8b2b1013da
|
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: d9536b7161 [formerly dacc10bcbc] [formerly 63967fbc78] [formerly 78b87b7a63 [formerly 63967fbc78 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]]]
Former-commit-id: 78b87b7a63
Former-commit-id: 69cfa06cf3110cf0b0a3f06464a492b6de6bcd56 [formerly 7cfc26d1d7]
Former-commit-id: 0a7a2fadec
|
2014-08-26 11:32:20 -05:00 |
|
Max Schenkelberg
|
929fe3f461
|
Omaha #3541 fixed grid coverage spring
Change-Id: I6c69cbe530daee61127e05d7f94a0e2c92ebe2e7
Former-commit-id: 4b23f802ba [formerly ac67bd42b9] [formerly f7620471da] [formerly df50024b63 [formerly f7620471da [formerly f2a76dfda110e231539474bffbde123fbe6313c9]]]
Former-commit-id: df50024b63
Former-commit-id: ac6ae681f3cb5b8dfaa6cf752f341c7d25e7a784 [formerly 6aff7b7a4c]
Former-commit-id: 87e1c1a257
|
2014-08-26 11:28:42 -05:00 |
|
Steve Harris
|
9d404d99c5
|
Merge branch 'master_14.3.1' (c4e9d3f = 14.2.4 -> 14.3.1 'ours merge') into omaha_14.4.1
Former-commit-id: 6113923c73 [formerly 93f812cab6] [formerly e8ffa194af] [formerly e3a6f7b58b [formerly e8ffa194af [formerly 6306702a3bb6a58bfc7ef9a399d822950e8e9653]]]
Former-commit-id: e3a6f7b58b
Former-commit-id: 9c97c3a4e87b80dfd88f7b932b704b6d4c10dee7 [formerly a4c38663f8]
Former-commit-id: 727aafe498
|
2014-08-26 10:30:10 -05:00 |
|
Brian.Dyke
|
c2b8aa9023
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: b99d31c7e6 [formerly 8ac44dfbd3] [formerly de56ccebc0] [formerly 59bacf90ac [formerly de56ccebc0 [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]]]
Former-commit-id: 59bacf90ac
Former-commit-id: 1aa12a57a91c266d9cae0f47f1830ad807f2a1d0 [formerly 8c803e81d3]
Former-commit-id: dc14c2e6ce
|
2014-08-26 10:56:45 -04:00 |
|
Richard Peter
|
cc964bbb16
|
Omaha #3541 Fix request jvm startup and build
Change-Id: I6141ef1d74430fc43ea11f296c6ab95fc4276d6f
Former-commit-id: eeb9dd1a0e [formerly 64683e5784] [formerly bf5f1c27a7] [formerly f478b42e61 [formerly bf5f1c27a7 [formerly 1c698d67a2c0ed3b11f910b593b1bbbdb2f46a86]]]
Former-commit-id: f478b42e61
Former-commit-id: 568786a138efec77effe0e633ede4a9ebea149c7 [formerly ef45928158]
Former-commit-id: 832bd8d5e7
|
2014-08-25 21:21:04 -05:00 |
|