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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Nate Jensen
|
411825af28
|
Merge "Omaha #3541 fixed grid coverage spring" into omaha_14.4.1
Former-commit-id: d2a653e277 [formerly 169f5729db] [formerly d2a653e277 [formerly 169f5729db] [formerly 80ab7b8e53 [formerly 99211be9635e03e7ae117ff694912f7c58e7ab44]]]
Former-commit-id: 80ab7b8e53
Former-commit-id: f3d6d3b90c [formerly b51a4ffee6]
Former-commit-id: a2784d994f
|
2014-08-26 11:34:38 -05: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 |
|
Steve Harris
|
868067baa1
|
Merge branch 'master_14.3.1' (c4e9d3f = 14.2.4 -> 14.3.1 'ours merge') into omaha_14.4.1
Former-commit-id: 93f812cab6 [formerly e8ffa194af] [formerly 93f812cab6 [formerly e8ffa194af] [formerly e3a6f7b58b [formerly 6306702a3bb6a58bfc7ef9a399d822950e8e9653]]]
Former-commit-id: e3a6f7b58b
Former-commit-id: 727aafe498 [formerly a4c38663f8]
Former-commit-id: 4e6bb7670e
|
2014-08-26 10:30:10 -05:00 |
|
Brian.Dyke
|
6c1e526daf
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 8ac44dfbd3 [formerly de56ccebc0] [formerly 8ac44dfbd3 [formerly de56ccebc0] [formerly 59bacf90ac [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]]]
Former-commit-id: 59bacf90ac
Former-commit-id: dc14c2e6ce [formerly 8c803e81d3]
Former-commit-id: c08a724cf0
|
2014-08-26 10:56:45 -04: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 |
|
Richard Peter
|
147856f43d
|
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
Former-commit-id: 64848acf9d [formerly 5cce505b7f] [formerly 64848acf9d [formerly 5cce505b7f] [formerly 651a10715a [formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]]]
Former-commit-id: 651a10715a
Former-commit-id: 0992358153 [formerly eafe010aa1]
Former-commit-id: ac192a5d86
|
2014-08-25 20:43:28 -05:00 |
|
Nate Jensen
|
f42edfddbd
|
Merge "Omaha #3368 fix deploy-install for developers without ohd repo" into omaha_14.4.1
Former-commit-id: bd8e79390b [formerly 0017deea02] [formerly bd8e79390b [formerly 0017deea02] [formerly e174537a36 [formerly c9da6960b2aad034570cfa866432c9a143de47f0]]]
Former-commit-id: e174537a36
Former-commit-id: 0cf41c2936 [formerly fb52eb1083]
Former-commit-id: aeda9ad52d
|
2014-08-25 16:20:41 -05: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
|
cbd7d00d1f
|
Omaha #3368 fix deploy-install for developers without ohd repo
Change-Id: Ib1738ed5e11022f5fd154ea85b29019e7c290f65
Former-commit-id: db84f25bfd [formerly 86f64337ff] [formerly db84f25bfd [formerly 86f64337ff] [formerly d43f0589f7 [formerly e9d7e258c60d39ab0d043f1e1cdc0ebcaf998ccc]]]
Former-commit-id: d43f0589f7
Former-commit-id: d4f3d09f11 [formerly aed159a1e2]
Former-commit-id: abec6e86d9
|
2014-08-25 16:16:34 -05:00 |
|