mjames-upc
|
3170e14759
|
service manager not gets IP addy from hostname rather than ifconfig
Former-commit-id: 8fdd97e7b4
|
2015-02-17 13:38:37 -07:00 |
|
mjames-upc
|
e22486eaae
|
now build postgres with openssl support
Former-commit-id: 2b40e7e8ab
|
2015-02-17 13:18:21 -07:00 |
|
Fay.Liang
|
24d3691f25
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 7d8c10a609 [formerly 4be7ba08fb] [formerly 058bd4ae9c] [formerly 058bd4ae9c [formerly a534707534]] [formerly 7d8c10a609 [formerly 4be7ba08fb] [formerly 058bd4ae9c] [formerly 058bd4ae9c [formerly a534707534]] [formerly 31dcfdc402 [formerly 058bd4ae9c [formerly a534707534] [formerly 31dcfdc402 [formerly ef870235658ea88d676ca65611bcfbdd56d206b1]]]]]
Former-commit-id: 31dcfdc402
Former-commit-id: 2c1baee806 [formerly e8661914e2] [formerly 06750bbcde] [formerly 541e552fe04d7dcaa3e37e369371076eeb251416 [formerly 18c236088dc90fd7520ec043c4c7a40fc9c592e5] [formerly 06750bbcde [formerly b55148442d]]]
Former-commit-id: 851f9ebcdf1d30b952c86f20bf2e3ae904bc5f81 [formerly b13d81293916e5acb59bf966e653712fc00da82b] [formerly d84ada842d [formerly e24545fbcc]]
Former-commit-id: d84ada842d
Former-commit-id: cb7a43e8c3
|
2015-02-17 14:07:11 -05:00 |
|
Sean.Webb
|
9bde5a48ad
|
ASM #17142 - Fixed nwps dir permissions
Change-id: Ibd843098cea02d3f1ea6b75d3e715d804c5c1e37
Former-commit-id: 8849cf1c44 [formerly 289d7078aa] [formerly 62e125667f] [formerly 62e125667f [formerly 9d46bf24dc]] [formerly 8849cf1c44 [formerly 289d7078aa] [formerly 62e125667f] [formerly 62e125667f [formerly 9d46bf24dc]] [formerly edae59425b [formerly 62e125667f [formerly 9d46bf24dc] [formerly edae59425b [formerly fc7258495581cd1d241f55aba2a8e60053575571]]]]]
Former-commit-id: edae59425b
Former-commit-id: 0280c4f603 [formerly e0d21f3fca] [formerly 9e1b6846d3] [formerly 1c235a070414551544efcf26c8143127e0661f5f [formerly 35af8fb21c3587bbdcfa3f587fd78f2514715159] [formerly 9e1b6846d3 [formerly c530e44a15]]]
Former-commit-id: 39e979917685d5a06ef0342e44819f5716b079c9 [formerly 4ddec7dc48de42c20affe014c17af84375f505c5] [formerly 8ea8be130a [formerly c8445f320e]]
Former-commit-id: 8ea8be130a
Former-commit-id: c318c9f021
|
2015-02-17 12:29:55 -05:00 |
|
mjames-upc
|
d83d8a3c4c
|
change PreReq for edex-upc RPM to from awips2-common-base to awips2-tools to avoid cave RPM dependency.
Former-commit-id: c571fb806c
|
2015-02-14 12:30:47 -07:00 |
|
Fay.Liang
|
9bb7bf7345
|
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Former-commit-id: 23d9de1fc1 [formerly 7c53d1fccc] [formerly c95baa3c40] [formerly c95baa3c40 [formerly 8cdd180b0a]] [formerly 23d9de1fc1 [formerly 7c53d1fccc] [formerly c95baa3c40] [formerly c95baa3c40 [formerly 8cdd180b0a]] [formerly af8b95bb97 [formerly c95baa3c40 [formerly 8cdd180b0a] [formerly af8b95bb97 [formerly fd4e0b9ada38ab93586088948809279e39a0374c]]]]]
Former-commit-id: af8b95bb97
Former-commit-id: 6558429a50 [formerly c1715cac7e] [formerly f18381db69] [formerly f8748216df41b391e1f7f2fc981f16f81875b54b [formerly ac10a3e861970875d87c499e6a2398f3d551fd4f] [formerly f18381db69 [formerly 8d5a9c2045]]]
Former-commit-id: b2e7cf74ffd108cf2fb546ac2919224b7e995670 [formerly 127f2236362d5f991e36f6c4c323c20811ec4b74] [formerly 2546eeb607 [formerly 984091af0c]]
Former-commit-id: 2546eeb607
Former-commit-id: d85cd3aaab
|
2015-02-13 09:34:24 -05:00 |
|
Fay.Liang
|
b516b6d29f
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 74d7aaada3 [formerly 209b1f9e7c] [formerly 84dff9abc0] [formerly 84dff9abc0 [formerly 32c91172b4]] [formerly 74d7aaada3 [formerly 209b1f9e7c] [formerly 84dff9abc0] [formerly 84dff9abc0 [formerly 32c91172b4]] [formerly eefa05ada3 [formerly 84dff9abc0 [formerly 32c91172b4] [formerly eefa05ada3 [formerly 480b6597331ebd2ce7d7835de6e21050abf18722]]]]]
Former-commit-id: eefa05ada3
Former-commit-id: fa37ac8d21 [formerly 1d04cbde57] [formerly f4106951e2] [formerly 977ceaf81275936c0a3813c1de0ffe5d8d8a2878 [formerly fd8f5f456a4b12eae3d16683880d413105e09ff4] [formerly f4106951e2 [formerly 2b261f9ef2]]]
Former-commit-id: 7f4fd7b2c2cd3b7a8c5fd25402d1859b84593790 [formerly 2221a324ff2b21942c4ddee4c8c8cdc4e7d435e0] [formerly cf869f38ce [formerly 444b080629]]
Former-commit-id: cf869f38ce
Former-commit-id: b8da0f41f6
|
2015-02-13 09:32:40 -05:00 |
|
mjames-upc
|
f3760d1f1c
|
clean up dependencies for the pgadmin3 build. edits to EDEX deploy/build.
Former-commit-id: d17c079178
|
2015-02-12 21:58:37 -07:00 |
|
mjames-upc
|
6d0fbd2765
|
workaround to get viz RPMs to biuld, but this will still fail on install.
Former-commit-id: 533819c7b8
|
2015-02-12 21:57:39 -07:00 |
|
mjames-upc
|
31dbd2022e
|
updates to ldm and upc rpm builds
Former-commit-id: e81048353c
|
2015-02-12 21:56:06 -07:00 |
|
mjames-upc
|
38cf8403cb
|
a lot of build updates for 14.4.1. removed desktop autostart stuff, edits to get wes2bridge to build, and reoganization of UPC build programs.
Former-commit-id: 1a280b79d6
|
2015-02-12 21:55:36 -07:00 |
|
Shawn.Hooper
|
281667c3f4
|
ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28
Former-commit-id: 417ec3573a [formerly 77344aeb28] [formerly 0d9e4dd69e] [formerly 0d9e4dd69e [formerly 060a169904]] [formerly 417ec3573a [formerly 77344aeb28] [formerly 0d9e4dd69e] [formerly 0d9e4dd69e [formerly 060a169904]] [formerly 9c637bda0b [formerly 0d9e4dd69e [formerly 060a169904] [formerly 9c637bda0b [formerly 2c62f45654b0531349fef5e7523c67c94236ce1a]]]]]
Former-commit-id: 9c637bda0b
Former-commit-id: 315ece7a7c [formerly ea6d93e483] [formerly 89d1309974] [formerly 51c5169e179f96c9d64e9a28ff9ed318eb83f0ae [formerly f55b21a9fdea3ba2e3dba375325c811c5e063e31] [formerly 89d1309974 [formerly 5ff97ae188]]]
Former-commit-id: b51cc954b25b2ea1652a821acc257f4207fb10e7 [formerly 155d896c67c9e8820e1531b42b396d247d8e942d] [formerly 19cdb600ed [formerly b29bfba24b]]
Former-commit-id: 19cdb600ed
Former-commit-id: 517bb0a96a
|
2015-02-12 17:32:05 -05:00 |
|
Ana Rivera
|
eb276e6fa0
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209
Former-commit-id: ab619b7a3e [formerly 46215020b2] [formerly 461db8a395] [formerly 461db8a395 [formerly 420132b396]] [formerly ab619b7a3e [formerly 46215020b2] [formerly 461db8a395] [formerly 461db8a395 [formerly 420132b396]] [formerly 6191c93a9c [formerly 461db8a395 [formerly 420132b396] [formerly 6191c93a9c [formerly f6b3765fc1670db2b9ceef75be7422a07b2badcf]]]]]
Former-commit-id: 6191c93a9c
Former-commit-id: 85eec5c125 [formerly 163822ed83] [formerly 726045354b] [formerly 58284ef589c3297a9aec90150e783567ec92fc2c [formerly 828f01ac20d6f6b8cfe06c00f5261d19e5ae4286] [formerly 726045354b [formerly d8b54a59cf]]]
Former-commit-id: c949f12efeddeab90d0cc17009929f1aca3b0df5 [formerly 10f7d308dfa2905bfc05ed43017ea87858618d14] [formerly cb4300775b [formerly 85de48c8bf]]
Former-commit-id: cb4300775b
Former-commit-id: f94b97d128
|
2015-02-11 22:00:40 +00:00 |
|
Steve Harris
|
9440f8f584
|
Merge tag 'OB_14.4.1-10m' into omaha_14.4.1
14.4.1-10
Former-commit-id: c0afbae473 [formerly a2d87f74f7] [formerly e76330fac0] [formerly e76330fac0 [formerly 3fe3d35339]] [formerly c0afbae473 [formerly a2d87f74f7] [formerly e76330fac0] [formerly e76330fac0 [formerly 3fe3d35339]] [formerly 9311e6f440 [formerly e76330fac0 [formerly 3fe3d35339] [formerly 9311e6f440 [formerly 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2]]]]]
Former-commit-id: 9311e6f440
Former-commit-id: 8711ed280b [formerly f59cef1b7a] [formerly 300e3e50fe] [formerly cbf9f55c4e59cc5798a167b90d3f1418dfc870bd [formerly 9b94ac3d16cf083d4502b712efe3cac0bbc0889c] [formerly 300e3e50fe [formerly 6a2d5ec16d]]]
Former-commit-id: 0d71d4b865ca71f2864a593baff2a96eda233489 [formerly 28adc946fa3fbd5f3f87e0fa9e9c02ac79c68d1b] [formerly f2f6d56366 [formerly 07475d998f]]
Former-commit-id: f2f6d56366
Former-commit-id: 7718c17e3d
|
2015-02-11 15:53:38 -06:00 |
|
Steve Harris
|
837271c28c
|
Omaha #4111 - Updated foss licenses and Master_Rights_File.pdf
Former-commit-id: c437ec08df [formerly 162f4871bf] [formerly 3f8008fc9f] [formerly 3f8008fc9f [formerly 62d29fefb4]] [formerly c437ec08df [formerly 162f4871bf] [formerly 3f8008fc9f] [formerly 3f8008fc9f [formerly 62d29fefb4]] [formerly a5da551a5d [formerly 3f8008fc9f [formerly 62d29fefb4] [formerly a5da551a5d [formerly 45e09e8f848d85ae45205b655074bba8342c9156]]]]]
Former-commit-id: a5da551a5d
Former-commit-id: bd3107ed26 [formerly 00cb95d51c] [formerly 5f4b78fd53] [formerly d6c74424da0c67229d966e75c85672597cb079c0 [formerly 29b0f1ccf454a14cb2d69120b366840d95677bf3] [formerly 5f4b78fd53 [formerly dc372b03d8]]]
Former-commit-id: 99d43d86da28188cae59c4293a11e0b945af8f4d [formerly c15c14b11b7177b7338436b44cb2327a2d7f743c] [formerly 2139ef4dbf [formerly 002c2ab43f]]
Former-commit-id: 2139ef4dbf
Former-commit-id: 44a97b4a97
|
2015-02-11 10:58:07 -06:00 |
|
Ana Rivera
|
26c990ecae
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f
Former-commit-id: 95d8c5fd0e [formerly c2975ce69f] [formerly 631d700cf9] [formerly 631d700cf9 [formerly bdb0e3aacb]] [formerly 95d8c5fd0e [formerly c2975ce69f] [formerly 631d700cf9] [formerly 631d700cf9 [formerly bdb0e3aacb]] [formerly c2f02ff4b2 [formerly 631d700cf9 [formerly bdb0e3aacb] [formerly c2f02ff4b2 [formerly c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265]]]]]
Former-commit-id: c2f02ff4b2
Former-commit-id: c5d99cfcf0 [formerly c1af0b6eff] [formerly e6ea29b193] [formerly 5b76b7a7fa2e610065af32e550930ada4a9ea69a [formerly 7b786ee51c59815f6326886edd8cc2e8dd6f322a] [formerly e6ea29b193 [formerly 0bab05a20b]]]
Former-commit-id: d0da70cadbaa0c547ccb171b0eea2057bc6ba244 [formerly 6c5baed68bc69c3da51b219494643cba2531b474] [formerly 7585c6e288 [formerly 3eb45fd8e1]]
Former-commit-id: 7585c6e288
Former-commit-id: 16cb817e04
|
2015-02-10 14:41:19 +00:00 |
|
Fay.Liang
|
99fa038404
|
Merge branch 'master_14.3.2' into master_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: 3b67540902 [formerly 4bcae42022] [formerly e3107ce1e4] [formerly e3107ce1e4 [formerly 59f3f87190]] [formerly 3b67540902 [formerly 4bcae42022] [formerly e3107ce1e4] [formerly e3107ce1e4 [formerly 59f3f87190]] [formerly 43c7161dcf [formerly e3107ce1e4 [formerly 59f3f87190] [formerly 43c7161dcf [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]]]]
Former-commit-id: 43c7161dcf
Former-commit-id: bd48ef892c [formerly ee6acc8fdd] [formerly 149102ec85] [formerly 583b51e7de21ae85d3bb60f293ea526038265229 [formerly 8b80e6a5ae948ea73931e17354298170ec9d226f] [formerly 149102ec85 [formerly 0b98fc8be6]]]
Former-commit-id: 1ebc4c5e9d2abcfe752452321aa4e29a59294579 [formerly 257ec8e3caf9807783d7f6b047aaa84560966ae3] [formerly 31607db1e1 [formerly 2d5858f8f0]]
Former-commit-id: e971de0fa7c7c16c8490a2e51f3ac9955601eff0 [formerly 31607db1e1]
Former-commit-id: 0b0f41fa37
|
2015-02-09 17:19:41 -05:00 |
|
Greg Armendariz
|
7db73d7d73
|
Omaha #3299 - Fix collaboration RPM build issue
Former-commit-id: 79ee776aff [formerly d237c346e8] [formerly 6fed5e21e7] [formerly 6fed5e21e7 [formerly b88c8da164]] [formerly 79ee776aff [formerly d237c346e8] [formerly 6fed5e21e7] [formerly 6fed5e21e7 [formerly b88c8da164]] [formerly af72fd3775 [formerly 6fed5e21e7 [formerly b88c8da164] [formerly af72fd3775 [formerly 9132eff524289c5df48c682cd3ff226fe14cdf1b]]]]]
Former-commit-id: af72fd3775
Former-commit-id: 1b6d86f91c [formerly 2569f921ef] [formerly d27e4b416e] [formerly fe6bf566078b7303a776f60647517f7f87674768 [formerly 63f866aa8ca54a568af639578ac0d35936abe337] [formerly d27e4b416e [formerly 483ed63a57]]]
Former-commit-id: 3040a8c5d4b266021959cfbeb98f081bfe1230a9 [formerly b19bd39f67e51dfc93fc9bc3ee5e0807b059f4de] [formerly 2f8b5d32eb [formerly 3463c00928]]
Former-commit-id: 2f8b5d32eb
Former-commit-id: 49575f9b1a
|
2015-02-06 11:37:47 -06:00 |
|
Joshua Watson
|
4d618c3e6e
|
VLab Issue #5238 - serverConfig.py - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS, changed serverConfig.Vis to Vis on that same line. pqact.conf.template - fixed typo on line 223 FLE to FILE, line 286 missing a period in pattern; fixes #5238
Change-Id: Ia83e3576613683fa58a7631150d2d3132937a7b4
Former-commit-id: d22c711b14 [formerly 6488aceeae] [formerly 5d0dea9253] [formerly 5d0dea9253 [formerly aec617b1eb]] [formerly d22c711b14 [formerly 6488aceeae] [formerly 5d0dea9253] [formerly 5d0dea9253 [formerly aec617b1eb]] [formerly 65a568b79d [formerly 5d0dea9253 [formerly aec617b1eb] [formerly 65a568b79d [formerly 12e0aeea9fa6b2dc7de297aee0ff7d1de3a99111]]]]]
Former-commit-id: 65a568b79d
Former-commit-id: c023982106 [formerly 2639dc0d0b] [formerly 12a2f9eff1] [formerly 9b1e860cbda825bff095b77313d17ec190b47248 [formerly 86ad217dfd2c06f5f8ea823e4753bba4b31e8d0a] [formerly 12a2f9eff1 [formerly ac46876161]]]
Former-commit-id: 771219259e8e27e72f840239bee250861f7720fc [formerly b905c42849fd8cf9a80851652f9319c8a62ee267] [formerly 9b66935012 [formerly da106869b6]]
Former-commit-id: 9b66935012
Former-commit-id: 22edf12074
|
2015-02-05 09:26:20 -05:00 |
|
Shawn.Hooper
|
5f9f597ff4
|
ASM #15311 - Update pgadmin spec file to allow for postgresql version greater than or equal to 8.4.13-1 and customTargets.xml for EDEX to allow for flexible feature files.
Change-Id: I9cf47aff9c6fa874ffe3d2e8bbbba2871abacec2
Former-commit-id: 2ecd35a10b [formerly 227b629a0b] [formerly f4cd41e2f6] [formerly f4cd41e2f6 [formerly a98b54a944]] [formerly 2ecd35a10b [formerly 227b629a0b] [formerly f4cd41e2f6] [formerly f4cd41e2f6 [formerly a98b54a944]] [formerly 915ddd6964 [formerly f4cd41e2f6 [formerly a98b54a944] [formerly 915ddd6964 [formerly f1383bbdbadc54f8f2a0384d319c70160464a3ac]]]]]
Former-commit-id: 915ddd6964
Former-commit-id: c826fb28bb [formerly 76730a5aaf] [formerly b8b4e192fb] [formerly 1ca186df1c681824197ca474f1444b02d7f7e650 [formerly d38321f53fb9ffcbe232f9efbf2b9ddc646befec] [formerly b8b4e192fb [formerly ebe39a11ae]]]
Former-commit-id: b05fc89a9d071e21e585cf0322ac4b36bac1ff12 [formerly b716b127375acd0fe45a9c1508dda9308be2a38b] [formerly 910f220a38 [formerly e1e9c02dcd]]
Former-commit-id: b4ced5d33e96923abef1284e3eb3f42c4337305c [formerly 910f220a38]
Former-commit-id: f76034796e
|
2015-02-04 16:47:26 -05:00 |
|
Greg Armendariz
|
9d7476eb67
|
Omaha #3839 - Add script to /awips2/edex/bin/
Former-commit-id: 86c78dec1a [formerly d8eca1c90a] [formerly efbdfa504b] [formerly efbdfa504b [formerly 25cb96ec19]] [formerly 86c78dec1a [formerly d8eca1c90a] [formerly efbdfa504b] [formerly efbdfa504b [formerly 25cb96ec19]] [formerly bb8a61a996 [formerly efbdfa504b [formerly 25cb96ec19] [formerly bb8a61a996 [formerly c215890342be6fed80d614e0a5853e8ce816a7f2]]]]]
Former-commit-id: bb8a61a996
Former-commit-id: d04b701019 [formerly d8a5867989] [formerly c3b4d790a3] [formerly 731f162414c5d0954be66ee83e800f52e6cad604 [formerly 203e5232bfa641993a7e1096caa4b0ef2e4b3c3c] [formerly c3b4d790a3 [formerly d405e4bfe1]]]
Former-commit-id: 2f6f2a4a182f4d42fb4cb7b0da2d3ab81e44f4df [formerly a15a1e71e88b253a90d12a782b1761b2e7c40409] [formerly b0121df3bc [formerly 956a8fd092]]
Former-commit-id: b0121df3bc
Former-commit-id: 76bbe51da6
|
2015-02-04 09:59:06 -06:00 |
|
Greg Armendariz
|
a1e91286f6
|
Merge "Omaha #4065 - Update EDEX RPM install to modify date stamp" into omaha_14.4.1
Former-commit-id: 2e1c03f1b1 [formerly 7eda7b5786] [formerly bdcb5067d4] [formerly bdcb5067d4 [formerly e87f8c0c5f]] [formerly 2e1c03f1b1 [formerly 7eda7b5786] [formerly bdcb5067d4] [formerly bdcb5067d4 [formerly e87f8c0c5f]] [formerly e004e0881f [formerly bdcb5067d4 [formerly e87f8c0c5f] [formerly e004e0881f [formerly ddf9b7d0a97ffda6e79688d7c35c828fb7fc1d91]]]]]
Former-commit-id: e004e0881f
Former-commit-id: 5767eed53d [formerly 129860e79e] [formerly 24d9da8c2c] [formerly 52d6840ae54b857eb016fd96e4e2ce2fb3d3e389 [formerly 86897597623c877c359f50bded3e73aa21997fef] [formerly 24d9da8c2c [formerly 48afd5b062]]]
Former-commit-id: 39c4e7fdc08a7406d0474b1542fa57313c21833b [formerly 70b22005e259a1671675360f8b64a8293497db69] [formerly e09375ffce [formerly 86a6f08f80]]
Former-commit-id: e09375ffce
Former-commit-id: aff1854649
|
2015-02-03 11:35:26 -06:00 |
|
Greg Armendariz
|
57209b63d4
|
Omaha #4065 - Update EDEX RPM install to modify date stamp
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0
Former-commit-id: 6bb1b2cb5c [formerly 290192e2d6] [formerly 19d79f71d3] [formerly 19d79f71d3 [formerly 8c38289cf7]] [formerly 6bb1b2cb5c [formerly 290192e2d6] [formerly 19d79f71d3] [formerly 19d79f71d3 [formerly 8c38289cf7]] [formerly fbadd1deb1 [formerly 19d79f71d3 [formerly 8c38289cf7] [formerly fbadd1deb1 [formerly 83243af002e8ddfd15f899ff1ab3e511cf5a0af4]]]]]
Former-commit-id: fbadd1deb1
Former-commit-id: 2df575cfc0 [formerly 5538a3bd3c] [formerly 6a7891d660] [formerly 842e6a857de52e9e60d12a2dee07ca7d3c828000 [formerly 8aa9d6f342be9278c2766e73453e125107be66ea] [formerly 6a7891d660 [formerly a3d4342498]]]
Former-commit-id: 66497698f58fba1ddc144f8744f9170f328b0f11 [formerly cb6466c713f8797796f1c8ba79116d461def4aff] [formerly e3f22bed4c [formerly fdf1408c06]]
Former-commit-id: e3f22bed4c
Former-commit-id: 05647adcaf
|
2015-02-03 10:12:54 -06:00 |
|
Ana Rivera
|
e09469329c
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 2a3bb0c580 [formerly ed61c52ee3] [formerly 4071b58b85] [formerly 4071b58b85 [formerly 8bfa7c4087]] [formerly 2a3bb0c580 [formerly ed61c52ee3] [formerly 4071b58b85] [formerly 4071b58b85 [formerly 8bfa7c4087]] [formerly 20ad0a65f3 [formerly 4071b58b85 [formerly 8bfa7c4087] [formerly 20ad0a65f3 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]]]]
Former-commit-id: 20ad0a65f3
Former-commit-id: 73d87cd10c [formerly f92cfb0f40] [formerly de74e8a90d] [formerly 0a0794d6b3c530af5449324d3859918947ea7383 [formerly 442a60d056ccadc0eef6f172e33926ab71037b10] [formerly de74e8a90d [formerly 3696a3a1d1]]]
Former-commit-id: 84ddbe99226441197030d245401b77586d1f87cb [formerly dbb1d85007537eb63770397a06174c0f4b1b1206] [formerly cf29758096 [formerly 0af5d55eb6]]
Former-commit-id: cf29758096
Former-commit-id: 8ab81cc28a
|
2015-01-27 22:05:59 +00:00 |
|
Ana Rivera
|
a1548c4e95
|
Merge branch 'master_14.4.1' into field_14.4.1
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: 6b58d62fe3 [formerly dd232580d0] [formerly 62094315d2] [formerly 62094315d2 [formerly 7c5fc26537]] [formerly 6b58d62fe3 [formerly dd232580d0] [formerly 62094315d2] [formerly 62094315d2 [formerly 7c5fc26537]] [formerly 327945af8b [formerly 62094315d2 [formerly 7c5fc26537] [formerly 327945af8b [formerly 889608360567b829f81ed6392c64c669798f34a9]]]]]
Former-commit-id: 327945af8b
Former-commit-id: 5fa992e7c1 [formerly 11426c1e60] [formerly a84f43a8c6] [formerly 9e3eee876054f8d0a3e5fe0f7f75e4e99ab850d3 [formerly e41d85a493744309b4e1cd1f506bbd5cb6613c13] [formerly a84f43a8c6 [formerly 5e97e24201]]]
Former-commit-id: 42467b8e00f121c5cd5cf5dd6bb82c8d31037429 [formerly 89cb464614c3ae953a939f0b777e03f7ef4daf11] [formerly d4e36fe496 [formerly ef4ca10b8a]]
Former-commit-id: d4e36fe496
Former-commit-id: d87f6071d6
|
2015-01-27 16:28:42 +00:00 |
|
mjames-upc
|
5879f6a27c
|
build updates: core / foss repo name defintion updates. ldm spec file updated for 14.4.1
Former-commit-id: c15891e46d
|
2015-01-26 16:09:03 -07:00 |
|
mjames-upc
|
8617546c0d
|
build updates: removed date-defined directories from various spec files. we now organize static files without version defintions. also increment UPC build to 14.4.1
Former-commit-id: d7731b8dd0
|
2015-01-26 12:20:06 -07:00 |
|
mjames-upc
|
37f9e0cffb
|
topo RPM spec file updated to use existing topographic files. new topo files are not being proivided by NWS in the source code repos.
Former-commit-id: 9f0e4437e3
|
2015-01-26 12:04:24 -07:00 |
|
Steve Harris
|
b66535fd58
|
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: 6adf956253 [formerly ea3465f55a] [formerly 8cd9e2e92f] [formerly 8cd9e2e92f [formerly 158fa16376]] [formerly 6adf956253 [formerly ea3465f55a] [formerly 8cd9e2e92f] [formerly 8cd9e2e92f [formerly 158fa16376]] [formerly 0f05c53a53 [formerly 8cd9e2e92f [formerly 158fa16376] [formerly 0f05c53a53 [formerly 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79]]]]]
Former-commit-id: 0f05c53a53
Former-commit-id: 2985940c51 [formerly c6bb3f9f17] [formerly 5fda208a17] [formerly cbcc4f2bf5695b5328d7e88371cda11ba2030aba [formerly fd646e3ab88985355fb86128bc69473ecf242072] [formerly 5fda208a17 [formerly 033d0fc742]]]
Former-commit-id: e7feafe0b273a057fec77884ac799ffc07f18aad [formerly 10bac022834ddaeda42626dd3c8c191014cda5e8] [formerly fcdd2faaf1 [formerly c3d3d5f424]]
Former-commit-id: fcdd2faaf1
Former-commit-id: 936834331d
|
2015-01-23 09:08:06 -06:00 |
|
David Lovely
|
5a0a23ef66
|
Omaha #3957 Removed trailing slash in Spec for QPID.
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5
Former-commit-id: 0bcc8fe8c0 [formerly ffbd986a80] [formerly 1f59c0cd21] [formerly 1f59c0cd21 [formerly 1cfc27241f]] [formerly 0bcc8fe8c0 [formerly ffbd986a80] [formerly 1f59c0cd21] [formerly 1f59c0cd21 [formerly 1cfc27241f]] [formerly cf4077e8cd [formerly 1f59c0cd21 [formerly 1cfc27241f] [formerly cf4077e8cd [formerly 5fe598aef48f91e57d8f233872ccd0bab395164e]]]]]
Former-commit-id: cf4077e8cd
Former-commit-id: 583c6001b8 [formerly d1897052f4] [formerly af5df71b4c] [formerly a92932a1633c023c21bb1f873c37bd4f7842c6a7 [formerly 7149ce1ab0dab5dc5ff07ad554d8fb7c73497b9a] [formerly af5df71b4c [formerly f7565da27d]]]
Former-commit-id: 00fc6125dbaaf92e898147710bb337dc6408e59d [formerly 01b165a2474f9317de4614ec574298ddd54381b9] [formerly 62425dfbb3 [formerly 3babe6269f]]
Former-commit-id: 62425dfbb3
Former-commit-id: dddc0c9e67
|
2015-01-15 08:16:18 -06:00 |
|
David Lovely
|
09b0d14348
|
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac
Former-commit-id: 7ec1b803ec [formerly 46093ce896] [formerly 2771afe7f4] [formerly 2771afe7f4 [formerly 63c3631559]] [formerly 7ec1b803ec [formerly 46093ce896] [formerly 2771afe7f4] [formerly 2771afe7f4 [formerly 63c3631559]] [formerly 0b7ee2dc08 [formerly 2771afe7f4 [formerly 63c3631559] [formerly 0b7ee2dc08 [formerly 8107830bf2fa384c3bbe9472801c89a2a43990a3]]]]]
Former-commit-id: 0b7ee2dc08
Former-commit-id: 6201304910 [formerly cb81f4322d] [formerly 0fa33b0e84] [formerly 24e6e2587787ffa646324bb87f1f5dd0ede757f7 [formerly 3887066e9acf5bcc504692fb690047a9c7d85c77] [formerly 0fa33b0e84 [formerly f75e17f79e]]]
Former-commit-id: 2828634cb6f9d4eec28bcdd74c7d8a2ea7e90983 [formerly 2cbd5b7fba4be5ea1be867bdd5680394153dd6a0] [formerly 55fbb2ad86 [formerly 49e435ede3]]
Former-commit-id: 55fbb2ad86
Former-commit-id: ffe9e6a027
|
2015-01-14 14:40:36 -06:00 |
|
David Lovely
|
729f580e87
|
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9
Former-commit-id: c00d4764bc [formerly df92459c77] [formerly e4dbe403b3] [formerly cc50c7a0452ba647d5b6073d1d42a91e4225e2d1 [formerly e4dbe403b3 [formerly 9b9d569062]]] [formerly c00d4764bc [formerly df92459c77] [formerly e4dbe403b3] [formerly cc50c7a0452ba647d5b6073d1d42a91e4225e2d1 [formerly e4dbe403b3 [formerly 9b9d569062]]] [formerly f75230366c [formerly e4dbe403b3 [formerly 9b9d569062] [formerly f75230366c [formerly 34faf643b5de3c01713e0129209efb4ccc2c2aa0]]]]]
Former-commit-id: f75230366c
Former-commit-id: 51c2b77ded [formerly aafad06d27] [formerly e8150e977c] [formerly 8e900f20c3c2617e7c4e0ed1aca9a3b018785bf6 [formerly 1d6b91d11911a6b3ab28c054698c6b1b384a7605] [formerly e8150e977c [formerly 5bbea995ae]]]
Former-commit-id: 4c77f1d21874700c5e7b2cba30e2c1b7e37c37c9 [formerly c967e5feace797303c2cf127e0ad4741c5a04934] [formerly 4467128c35 [formerly 9316cbc4a4]]
Former-commit-id: 4467128c35
Former-commit-id: cc021bb799
|
2015-01-14 11:28:56 -06:00 |
|
mjames-upc
|
f5c4e36686
|
modified code BUILD - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 2ce37e10db
|
2015-01-12 14:12:30 -07:00 |
|
mjames-upc
|
886cd5940f
|
Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
|
2015-01-12 14:02:58 -07:00 |
|
Fay.Liang
|
660e749630
|
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 1e3dff2da2 [formerly 19a29da5de] [formerly 6b77894bd0] [formerly 6b77894bd0 [formerly c6bd5d7675]] [formerly 1e3dff2da2 [formerly 19a29da5de] [formerly 6b77894bd0] [formerly 6b77894bd0 [formerly c6bd5d7675]] [formerly eed6737801 [formerly 6b77894bd0 [formerly c6bd5d7675] [formerly eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]]]
Former-commit-id: eed6737801
Former-commit-id: ce29afab3c [formerly 23ba9f4154] [formerly f3ecae8573] [formerly 3e0b1b79e56696bcec54e0a049ea397445611958 [formerly 69382d354f0cba941ad1b60d73cca2d121eb949e] [formerly f3ecae8573 [formerly 5cc8e5b4af]]]
Former-commit-id: 3408395492fc2cd332f0231e3972dedb14c881df [formerly cd3c370873d18a2ca3801fd2f83aa4f8b35fe06e] [formerly 1e9024ede9 [formerly 06ac6b396e]]
Former-commit-id: 1e9024ede9
Former-commit-id: bccf70f0bd
|
2015-01-12 13:03:31 -05:00 |
|
mjames-upc
|
1327508f9f
|
build 14.2.1-19n2
Former-commit-id: 943fb05022
|
2015-01-10 10:58:48 -07:00 |
|
mjames-upc
|
6055fb6c50
|
ldm pqact update and fix for setting hostname post-install
Former-commit-id: b343262a85
|
2015-01-10 09:57:04 -07:00 |
|
mjames-upc
|
e29a717f80
|
moved awips2-edex-shapefiles RPM build to separate script, reduce time to run buildEDEX by 20 minutes
Former-commit-id: 38b0e2e9dd
|
2015-01-08 17:08:33 -07:00 |
|
David Lovely
|
22d8f18edc
|
Omaha #3957 Moved QPID to build repository directory structure.
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084
Former-commit-id: 881308422f [formerly d25fcc9155] [formerly 208dd5de01] [formerly 208dd5de01 [formerly 240927c241]] [formerly 881308422f [formerly d25fcc9155] [formerly 208dd5de01] [formerly 208dd5de01 [formerly 240927c241]] [formerly e56002debf [formerly 208dd5de01 [formerly 240927c241] [formerly e56002debf [formerly f27b0c6b92b4c744493e44b510defe3d650ca1f6]]]]]
Former-commit-id: e56002debf
Former-commit-id: 2ca219a746 [formerly cc40ff8301] [formerly 9f09af1c8a] [formerly 68128982c32dd1c776b9c9f7429194273e2fe5d3 [formerly b42af842cf64f96a786847d263d90f2eab6ef2ca] [formerly 9f09af1c8a [formerly d860af2218]]]
Former-commit-id: 499e2564d5d61740e2bebfcfe724c666d98881bb [formerly ba931f8d29a5e299b40d1de07af37d22f7100e4b] [formerly 9c401ce4ea [formerly b67b97803c]]
Former-commit-id: 9c401ce4ea
Former-commit-id: 0dba443423
|
2015-01-07 12:03:10 -06:00 |
|
mjames-upc
|
6e59ce3a8f
|
remove chkconfig from edex service manager
Former-commit-id: 4072c212a7
|
2015-01-05 15:22:13 -07:00 |
|
mjames-upc
|
10ffa5cf2c
|
NCP updates: new ncuair levels attribute files, UNIWISC SOUNDER composites grouped w ARCTIC/ANTARCTIC composites, FAROP and NCODA renaming, FAROP aerosol optical depth attribute file added, pqact.conf restore UNIWISC composites
Former-commit-id: fa945602a6
|
2015-01-03 14:03:01 -07:00 |
|
mjames-upc
|
af37bea025
|
LDM RPM build post install file edits. build version and CAVE IDE max memory increase
Former-commit-id: e260556e9b
|
2015-01-03 13:51:19 -07:00 |
|
mjames-upc
|
48790f42b7
|
CMC NCP resource definition + HRRR disabled in pqact.conf + fix for hostname defnition in awips2-ldm RPM post install
Former-commit-id: 11f3354e0a
|
2014-12-30 15:58:46 -07:00 |
|
mjames-upc
|
b50e95b077
|
CMC, FNMOC, NAM-5km, NAM-32km, NAM243 grid support added/updated
Former-commit-id: 042a601d8a
|
2014-12-29 15:32:20 -07:00 |
|
Fay.Liang
|
09d2a54eae
|
Merge branch 'master_14.3.1' into master_14.3.2
Former-commit-id: 73690f8b82 [formerly f550c8a8cd] [formerly 795b472fff] [formerly 795b472fff [formerly 06061eee19]] [formerly 73690f8b82 [formerly f550c8a8cd] [formerly 795b472fff] [formerly 795b472fff [formerly 06061eee19]] [formerly 77863309a9 [formerly 795b472fff [formerly 06061eee19] [formerly 77863309a9 [formerly 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d]]]]]
Former-commit-id: 77863309a9
Former-commit-id: 8b8ac08759 [formerly fc78eefa8b] [formerly b4051b9fe8] [formerly 12d062cb19c983a58a1c5b69bc8f6b444140c8c1 [formerly fb1b91e6a33c12d0935211fb3d5bc6d4e6993ab8] [formerly b4051b9fe8 [formerly 22fc1baada]]]
Former-commit-id: 6a1898fe2506e114b01550652689f330df07293b [formerly 3adba1094bd386fd5894e9d1f26ac4b048343b28] [formerly 155d0783d2 [formerly 7839f80035]]
Former-commit-id: 155d0783d2
Former-commit-id: 187e198d21
|
2014-12-22 14:43:32 -05:00 |
|
Qinglu.Lin
|
31cf1857b7
|
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: 53adc93083 [formerly 0eb9f8c722] [formerly 2d4a045e3c] [formerly 2d4a045e3c [formerly 3b3780fd13]] [formerly 53adc93083 [formerly 0eb9f8c722] [formerly 2d4a045e3c] [formerly 2d4a045e3c [formerly 3b3780fd13]] [formerly baa96590f1 [formerly 2d4a045e3c [formerly 3b3780fd13] [formerly baa96590f1 [formerly 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864]]]]]
Former-commit-id: baa96590f1
Former-commit-id: 8ec7874d47 [formerly 7cb4e6f236] [formerly f4d78ec480] [formerly 29ff624aeac59c58b7539ce789d85265227c07c7 [formerly e082c3f2b32d5b0433ad38471f77919246f7c6de] [formerly f4d78ec480 [formerly cae57983d8]]]
Former-commit-id: 10b4cff4a1811b095c023eb15530df82182324e9 [formerly 4fbfef3fc4d60690cb1aef306d0edd2b56c0a916] [formerly 4caef3c695 [formerly 484799b7f5]]
Former-commit-id: 4caef3c695
Former-commit-id: 25a8e87b9a
|
2014-12-17 16:53:31 -05:00 |
|
Brian Clements
|
c37cd1ea3e
|
Issue #3935 prevent warning when using init.d script to stop edex
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03
Former-commit-id: 56b60318c6 [formerly 80c720eac0] [formerly 06d82c9f4e] [formerly 06d82c9f4e [formerly d2774cffc2]] [formerly 56b60318c6 [formerly 80c720eac0] [formerly 06d82c9f4e] [formerly 06d82c9f4e [formerly d2774cffc2]] [formerly 6ae64007a2 [formerly 06d82c9f4e [formerly d2774cffc2] [formerly 6ae64007a2 [formerly b1034aa16b3393e6584038ebb80faf2a4e1a831f]]]]]
Former-commit-id: 6ae64007a2
Former-commit-id: 6ad057f49c [formerly 4aa9120753] [formerly 14a6f678ca] [formerly fa9cddd4fbbb60e6ee01385e5280cb2dc7684cb1 [formerly 6e21ec9f0b987e4baff0d440cd2b78bd4c23bf29] [formerly 14a6f678ca [formerly 53f28e0b75]]]
Former-commit-id: 2d5f0b5b962a8edd4846ffd7514b7c0aee9df09d [formerly ec5ee06886fb47fbf4cb2864824b6adf3499a07f] [formerly 6794196b7c [formerly db5e0013a8]]
Former-commit-id: 6794196b7c
Former-commit-id: f2481c2d2f
|
2014-12-17 14:35:16 -06:00 |
|
Joshua Watson
|
8058051e2e
|
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: d86ee989aa [formerly cf1882cc44] [formerly 0c375981e7] [formerly 0c375981e7 [formerly 3f2f7f2f3a]] [formerly d86ee989aa [formerly cf1882cc44] [formerly 0c375981e7] [formerly 0c375981e7 [formerly 3f2f7f2f3a]] [formerly 5aa4748569 [formerly 0c375981e7 [formerly 3f2f7f2f3a] [formerly 5aa4748569 [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]]]]
Former-commit-id: 5aa4748569
Former-commit-id: 673866a139 [formerly e419cebdea] [formerly 1040be8594] [formerly a6b40dbc1ec10756fa3ff415c2fba56ad9f864b7 [formerly acf20dd93b57335f5216ef543b921227c78af2eb] [formerly 1040be8594 [formerly 094e8048e9]]]
Former-commit-id: 366e3e206465f6674a4e4bffb8dd8fef12f47135 [formerly 7dccfd850e0304ac1124ea5b96ef03ed520b2f03] [formerly 8dd62191ae [formerly eb68dac32d]]
Former-commit-id: 8dd62191ae
Former-commit-id: ef7dbe8735
|
2014-12-17 08:38:27 -05:00 |
|
Ana Rivera
|
ec63f5a069
|
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 0923ddca17 [formerly 1f5dd0c92b] [formerly 214be0a93b] [formerly 214be0a93b [formerly 043bc3a8b7]] [formerly 0923ddca17 [formerly 1f5dd0c92b] [formerly 214be0a93b] [formerly 214be0a93b [formerly 043bc3a8b7]] [formerly 1823ed3596 [formerly 214be0a93b [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]]]
Former-commit-id: 1823ed3596
Former-commit-id: 2a4a15b531 [formerly 90efb445f0] [formerly ef35771bfa] [formerly 9d95fa5faf986b4dfa99c70eab33e6d8563207bc [formerly df1f34b8c00ffdaeec21c1d4b59bdc4ae9648cb2] [formerly ef35771bfa [formerly d2d8127363]]]
Former-commit-id: b6e3f11a2089444882a8489c36fb2e248348287e [formerly d7532e0824a0a0330656fbdab24737f609c2a10f] [formerly 40df82b005 [formerly f7c0319ee4]]
Former-commit-id: ba1fc0174dfbaa6dd9cd56dcd7b8ed148a2537c3 [formerly 40df82b005]
Former-commit-id: 769df60be8
|
2014-12-16 23:39:02 +00:00 |
|
Richard Peter
|
f142af6b63
|
Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java
Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5
Former-commit-id: 6579b4ab6d [formerly 20fa07c6d3] [formerly 23eafaba3d] [formerly 23eafaba3d [formerly 2457d0e6f7]] [formerly 6579b4ab6d [formerly 20fa07c6d3] [formerly 23eafaba3d] [formerly 23eafaba3d [formerly 2457d0e6f7]] [formerly 8de1ebcb65 [formerly 23eafaba3d [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: cfd95d7f7d [formerly 9c162858f4] [formerly 746bbb0885] [formerly 35ae219076c882470fee5ecb5216bf052ac2f076 [formerly 2a8f875c3a3a12752593d61bb77d88a0341b5368] [formerly 746bbb0885 [formerly f7d8755ba9]]]
Former-commit-id: 9d1e586f67c297d6129739fc71fcefb0e585af8e [formerly 0fc5096e00ed840082ba093d3d160ad0e811a828] [formerly 59e9fe78f2 [formerly bf3ddbb62b]]
Former-commit-id: 59e9fe78f2
Former-commit-id: 7434f3c20e
|
2014-12-12 10:36:04 -06:00 |
|