Shawn.Hooper
|
89ab24bc32
|
ASM #14246 - Check-in updated transmit_rfc_qpe script
Change-Id: I26751d39d2b31a345276da722c7a25a9ff8f9508
Former-commit-id: a6a840f3c8 [formerly 0ba143cc43] [formerly a6a840f3c8 [formerly 0ba143cc43] [formerly 3c3b69809d [formerly 72dd2f411e10e1eb6a934adf05d7df179b570ded]]]
Former-commit-id: 3c3b69809d
Former-commit-id: 91cbf5e2da [formerly 41ebbc98d4]
Former-commit-id: 97de46bbb8
|
2015-02-11 13:55:20 -05:00 |
|
Shawn.Hooper
|
0b748e6638
|
ASM #16804 - Check in the required library files
Change-Id: Ib84d554ef4723072f8272327b7d00a737ba1405a
Former-commit-id: 8351eb7bdf [formerly 6573bd2672] [formerly 8351eb7bdf [formerly 6573bd2672] [formerly ca8b043aed [formerly 22fc7ef208aaef87d2ef366f9ae8c0840379139c]]]
Former-commit-id: ca8b043aed
Former-commit-id: 065df6c8d6 [formerly 1dc0ff9b6d]
Former-commit-id: 0b183167df
|
2015-02-11 12:40:33 -05:00 |
|
Steve Harris
|
2139ef4dbf
|
Omaha #4111 - Updated foss licenses and Master_Rights_File.pdf
Former-commit-id: 3f8008fc9f [formerly 62d29fefb4] [formerly 3f8008fc9f [formerly 62d29fefb4] [formerly a5da551a5d [formerly 45e09e8f848d85ae45205b655074bba8342c9156]]]
Former-commit-id: a5da551a5d
Former-commit-id: 5f4b78fd53 [formerly dc372b03d8]
Former-commit-id: 002c2ab43f
|
2015-02-11 10:58:07 -06:00 |
|
Fay.Liang
|
d0084754e7
|
Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 5c320554c0 [formerly a2a4551eae] [formerly 5c320554c0 [formerly a2a4551eae] [formerly 7d18af7172 [formerly 0c3fe94f92b6f43d8ae7d506c5c84915500a803c]]]
Former-commit-id: 7d18af7172
Former-commit-id: e077b8be51 [formerly 1d52c90d4c]
Former-commit-id: 38d28f27fc
|
2015-02-11 10:45:04 -05:00 |
|
David Friedman
|
db8a119ca1
|
ASM #17092 - Add cronOTRs.xml to radar NDM files
Change-Id: I46bf0728607737509ad97f6d2ed1803b3b10eeff
Former-commit-id: 6db744c3cc [formerly c6c9209f84] [formerly 6db744c3cc [formerly c6c9209f84] [formerly 562582f056 [formerly fc9eb096ce16005be0a80eff3b4728f279f75cf5]]]
Former-commit-id: 562582f056
Former-commit-id: 298a9cd43f [formerly 02c1658af2]
Former-commit-id: aa0746f502
|
2015-02-11 15:10:34 +00:00 |
|
Joshua Watson
|
672e2deebe
|
VLab Issue #6421 - Source in GFSLAMPGrid.py smart init changed to GFSLAMPGrid. Visibility calculation streamlined; fixes #6421
Change-Id: Ic63cb16c30aff1705d9753017a43ba9c59b02d51
Former-commit-id: 786721c6e8 [formerly 56627a9012] [formerly 786721c6e8 [formerly 56627a9012] [formerly f612e85eed [formerly c570ea9f982665f3cb560c665cea6357c11841ce]]]
Former-commit-id: f612e85eed
Former-commit-id: 17587be0a5 [formerly 6ea886b4cf]
Former-commit-id: 607003fe11
|
2015-02-11 09:04:44 -05:00 |
|
Juliya Dynina
|
3384329b96
|
Merge "ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer." into asm_14.4.1
Former-commit-id: 43b453b136 [formerly a2da3621ee] [formerly 43b453b136 [formerly a2da3621ee] [formerly 5ae6e8149e [formerly fa16cbd1cf7c92545d22b39c1bca597a0959c98c]]]
Former-commit-id: 5ae6e8149e
Former-commit-id: a7fe54d8e5 [formerly 62d5a51b81]
Former-commit-id: 41059afb7f
|
2015-02-10 15:45:27 -05:00 |
|
Michael Gamazaychikov
|
5fa796f77e
|
ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer.
Change-Id: Ib5c6bb89c57022b61260adbaa08760e5df05ad61
Former-commit-id: 4a58408889 [formerly ea046bedd3] [formerly 4a58408889 [formerly ea046bedd3] [formerly 9ffad49fa0 [formerly 20efa852dcc64c80890abed6b2882a205b37cf43]]]
Former-commit-id: 9ffad49fa0
Former-commit-id: 44fc2719c8 [formerly b490bf66ea]
Former-commit-id: 5d7f55047e
|
2015-02-10 15:21:32 -05:00 |
|
Michael Gamazaychikov
|
bc0fde99b2
|
ASM #17103 - New dx3/4 hardware can drive EDEX OoM.
Change-Id: I0e466f39b50661cc0909158611aab2f7fdda06ba
Former-commit-id: 9836b17e5e [formerly cecc02d5b1] [formerly 9836b17e5e [formerly cecc02d5b1] [formerly 796871f02f [formerly e4444751f61adccf1cb62adf0f6cb1abc4ab6384]]]
Former-commit-id: 796871f02f
Former-commit-id: ef3a3a7cf8 [formerly 2ad0f94f01]
Former-commit-id: c1292536f8
|
2015-02-10 10:35:32 -05:00 |
|
Ana Rivera
|
7585c6e288
|
Merge branch 'omaha_14.4.1' into field_14.4.1
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f
Former-commit-id: 631d700cf9 [formerly bdb0e3aacb] [formerly 631d700cf9 [formerly bdb0e3aacb] [formerly c2f02ff4b2 [formerly c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265]]]
Former-commit-id: c2f02ff4b2
Former-commit-id: e6ea29b193 [formerly 0bab05a20b]
Former-commit-id: 3eb45fd8e1
|
2015-02-10 14:41:19 +00:00 |
|
Fay.Liang
|
31607db1e1
|
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: e3107ce1e4 [formerly 59f3f87190] [formerly e3107ce1e4 [formerly 59f3f87190] [formerly 43c7161dcf [formerly e91a78eec910b84f44350d3aae68a26f4e0dcd72]]]
Former-commit-id: 43c7161dcf
Former-commit-id: 149102ec85 [formerly 0b98fc8be6]
Former-commit-id: 2d5858f8f0
|
2015-02-09 17:19:41 -05:00 |
|
Greg Armendariz
|
e753638fcb
|
Omaha #3299 - Update buid.xml to work with nightly build and development workstation
Former-commit-id: c8d4fb79dd [formerly ca6440c80e] [formerly c8d4fb79dd [formerly ca6440c80e] [formerly 5685c69da3 [formerly ab3ed9118dfd90ea929e450d991d882312f4a520]]]
Former-commit-id: 5685c69da3
Former-commit-id: 3db1e79370 [formerly 2161f229e2]
Former-commit-id: 04bcd53329
|
2015-02-09 14:57:22 -06:00 |
|
Greg Armendariz
|
97cc17408b
|
Merge "Omaha #3299 - Fix collaboration RPM build issue" into omaha_14.4.1
Former-commit-id: a1ee800641 [formerly 40e2f812cc] [formerly a1ee800641 [formerly 40e2f812cc] [formerly 3b596f12d8 [formerly da49b73121818f3022f71deee8a2a57230b2a227]]]
Former-commit-id: 3b596f12d8
Former-commit-id: a2cd0b9879 [formerly 9d07126719]
Former-commit-id: 573b3d77db
|
2015-02-09 10:09:20 -06:00 |
|
Nate Jensen
|
431a1a0ed8
|
Merge "Omaha #3299 - Modify RCM deploy script" into omaha_14.4.1
Former-commit-id: 66c3ef37ca [formerly 35295b401c] [formerly 66c3ef37ca [formerly 35295b401c] [formerly 2bd03ecec0 [formerly 24849a362531a27a789ef3ea512bed87d7159af8]]]
Former-commit-id: 2bd03ecec0
Former-commit-id: a8ae15a20c [formerly 771ff3f4c8]
Former-commit-id: da95c68b42
|
2015-02-09 09:19:45 -06:00 |
|
Joshua Watson
|
fa057c8063
|
VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml, changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init; fixes #6363
Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848
Former-commit-id: cb6420914f [formerly 05c119663f] [formerly cb6420914f [formerly 05c119663f] [formerly f6cf02c893 [formerly 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff]]]
Former-commit-id: f6cf02c893
Former-commit-id: 7235e8444e [formerly 5a136bb86b]
Former-commit-id: 4827934718
|
2015-02-06 16:06:37 -05:00 |
|
Greg Armendariz
|
2f8b5d32eb
|
Omaha #3299 - Fix collaboration RPM build issue
Former-commit-id: 6fed5e21e7 [formerly b88c8da164] [formerly 6fed5e21e7 [formerly b88c8da164] [formerly af72fd3775 [formerly 9132eff524289c5df48c682cd3ff226fe14cdf1b]]]
Former-commit-id: af72fd3775
Former-commit-id: d27e4b416e [formerly 483ed63a57]
Former-commit-id: 3463c00928
|
2015-02-06 11:37:47 -06:00 |
|
Greg Armendariz
|
6a33eca154
|
Omaha #3299 - Modify RCM deploy script
Change-Id: I420acc08705ebc2f52cd52ab7954b4d8c16fef15
Former-commit-id: 61bd37895f [formerly 2a554c5498] [formerly 61bd37895f [formerly 2a554c5498] [formerly d3658d0f28 [formerly 97c6bded155fc58e59beecdb33016e5286e622c1]]]
Former-commit-id: d3658d0f28
Former-commit-id: 13bb984db1 [formerly 7a2ab677d1]
Former-commit-id: 9b7823cf31
|
2015-02-06 11:20:43 -06:00 |
|
Nate Jensen
|
f20fb4afa8
|
Omaha #4089 harden safety of numpy dtypes in gfe arrays
Change-Id: Ic77b459bc4d68930418ad66680ee86069c540c1f
Former-commit-id: ac02fc3a81 [formerly b42dec0e4a] [formerly ac02fc3a81 [formerly b42dec0e4a] [formerly ea273e14bf [formerly ed77ff564520c8f6ad157dd115d37d69cbfab660]]]
Former-commit-id: ea273e14bf
Former-commit-id: eea6f68b54 [formerly 2346be4023]
Former-commit-id: e4edba9ee7
|
2015-02-05 18:03:47 -06:00 |
|
David Friedman
|
dd091f8122
|
ASM #17066 - afoslookup entry for site KEY is missing
Change-Id: I8f2ac59c416a2a9f5f28fb72993c5947fb96c126
Former-commit-id: 7912200761 [formerly de9a5fd3b3] [formerly 7912200761 [formerly de9a5fd3b3] [formerly c1aec126c1 [formerly 49c3a36159f66eb35b70bb76f210b36b2c7140f9]]]
Former-commit-id: c1aec126c1
Former-commit-id: 90f1d96309 [formerly e4d93f33f0]
Former-commit-id: 11e900c200
|
2015-02-05 16:21:48 +00:00 |
|
Richard Peter
|
9646b3f0e6
|
Merge "Omaha #4086 resurrect undead textws scripting code and make it work with TextDBQuery" into omaha_14.4.1
Former-commit-id: e7ee620ccb [formerly d9eb0d8b55] [formerly e7ee620ccb [formerly d9eb0d8b55] [formerly 948dce2527 [formerly 3196b314c2f75424933163112742c3646a0529b4]]]
Former-commit-id: 948dce2527
Former-commit-id: bc0fabc8f4 [formerly e0e70ca408]
Former-commit-id: 0a79ebe10e
|
2015-02-05 09:00:57 -06:00 |
|
Joshua Watson
|
9b66935012
|
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: 5d0dea9253 [formerly aec617b1eb] [formerly 5d0dea9253 [formerly aec617b1eb] [formerly 65a568b79d [formerly 12e0aeea9fa6b2dc7de297aee0ff7d1de3a99111]]]
Former-commit-id: 65a568b79d
Former-commit-id: 12a2f9eff1 [formerly ac46876161]
Former-commit-id: da106869b6
|
2015-02-05 09:26:20 -05:00 |
|
Ana Rivera
|
c789373ed6
|
Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: Iadb5e401012d3f34ebd1332cfa872c91270d2c72
Former-commit-id: e36429dcbd [formerly 2d5a46ab0c] [formerly e36429dcbd [formerly 2d5a46ab0c] [formerly be625ca07e [formerly 2a505d2ebd87b1a2e8f05f6d304debf48be9971c]]]
Former-commit-id: be625ca07e
Former-commit-id: 4f82ba7d74 [formerly 020d5604b4]
Former-commit-id: 6b5e542330
|
2015-02-05 14:17:31 +00:00 |
|
Nate Jensen
|
a9b62ff68d
|
Omaha #4086 resurrect undead textws scripting code and make it work with
TextDBQuery
Change-Id: I33ddf04b2f02ee088f7b8956c5c31e874747ddf8
Former-commit-id: 49440898a8 [formerly b6fe8b843e] [formerly 49440898a8 [formerly b6fe8b843e] [formerly fa547ac3dd [formerly 9cdf82d433bd07289002c1f4df9f5242dce0de7e]]]
Former-commit-id: fa547ac3dd
Former-commit-id: b25d5630fe [formerly 99dc91dd0b]
Former-commit-id: 0a8e498e9f
|
2015-02-04 16:46:21 -06:00 |
|
Fay.Liang
|
80e592746a
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 81ebcaada8 [formerly 551e3dfac0] [formerly 81ebcaada8 [formerly 551e3dfac0] [formerly 649426f4b3 [formerly 999467410f61f1874d5cf1e599fca9ce83ae4f70]]]
Former-commit-id: 649426f4b3
Former-commit-id: ec3fcbafec [formerly 454c8be23a]
Former-commit-id: 16c15a10f4
|
2015-02-04 16:51:19 -05:00 |
|
Shawn.Hooper
|
910f220a38
|
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: f4cd41e2f6 [formerly a98b54a944] [formerly f4cd41e2f6 [formerly a98b54a944] [formerly 915ddd6964 [formerly f1383bbdbadc54f8f2a0384d319c70160464a3ac]]]
Former-commit-id: 915ddd6964
Former-commit-id: b8b4e192fb [formerly ebe39a11ae]
Former-commit-id: e1e9c02dcd
|
2015-02-04 16:47:26 -05:00 |
|
Fay.Liang
|
dce7317009
|
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: af6ee33276 [formerly 46911f1d37] [formerly af6ee33276 [formerly 46911f1d37] [formerly 9971e95e7b [formerly a67e2eb6f8e0a7d3d5ccc6322adf69ca8d81a28c]]]
Former-commit-id: 9971e95e7b
Former-commit-id: 673e878e96 [formerly 0989d899ff]
Former-commit-id: 17503933c9
|
2015-02-04 16:22:50 -05:00 |
|
Fay.Liang
|
f774d94942
|
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 091ebb1da5 [formerly fa2ec69693] [formerly 091ebb1da5 [formerly fa2ec69693] [formerly 98fc313530 [formerly 85751935d73a6c64fd041c791ddb09f081831e20]]]
Former-commit-id: 98fc313530
Former-commit-id: 629506683a [formerly ff0f4b4a13]
Former-commit-id: 8e2e580624
|
2015-02-04 16:20:31 -05:00 |
|
Slav Korolev
|
486bd8eb90
|
Omaha #3841 - Fixed saving problem for distance and time.
Former-commit-id: bfbe322c73 [formerly 15ae209055] [formerly bfbe322c73 [formerly 15ae209055] [formerly b8be69c429 [formerly d6737249fc9d3db54a143345053acdfe889686bf]]]
Former-commit-id: b8be69c429
Former-commit-id: d023dc9dd3 [formerly 8ba4d73cff]
Former-commit-id: a79bc229d5
|
2015-02-04 15:49:49 -05:00 |
|
David Friedman
|
6c7451a37d
|
ASM #17009 - Add Guam to countyTypes.txt file to account for "no counties"
Change-Id: Ic8dc2519b1cfb35bf3a2e0d8d61c007e108429a8
Former-commit-id: 8a31830def [formerly beb5074ddd] [formerly 8a31830def [formerly beb5074ddd] [formerly d1b3f2a5f4 [formerly 61ee73806f184b0d4092b8474f18b3525d92a20b]]]
Former-commit-id: d1b3f2a5f4
Former-commit-id: bf3737595d [formerly d6d2b52b3a]
Former-commit-id: 455ac39e04
|
2015-02-04 19:56:47 +00:00 |
|
Greg Armendariz
|
6a9cabee18
|
Merge "Omaha #3839 - Add script to /awips2/edex/bin/" into omaha_14.4.1
Former-commit-id: c39decf0af [formerly cc49405b55] [formerly c39decf0af [formerly cc49405b55] [formerly 9adbeabfca [formerly ad84dfc315b8a5af393dbcf358622c54830faea0]]]
Former-commit-id: 9adbeabfca
Former-commit-id: 63e1f2bead [formerly 0daeb043e9]
Former-commit-id: ab49a59cf0
|
2015-02-04 12:16:32 -06:00 |
|
Matthew Howard
|
c0cce89287
|
Merge "ASM #17039 - Remove HighlightFramingCodes feature" into asm_14.4.1
Former-commit-id: b482802e1e [formerly 4a46df6ed9] [formerly b482802e1e [formerly 4a46df6ed9] [formerly cfc9629774 [formerly a68b74fd45f4da2dfe73085833432416380219f7]]]
Former-commit-id: cfc9629774
Former-commit-id: 2731ac39dc [formerly 7e18ae7ff6]
Former-commit-id: b43e16d769
|
2015-02-04 11:16:20 -05:00 |
|
Greg Armendariz
|
b0121df3bc
|
Omaha #3839 - Add script to /awips2/edex/bin/
Former-commit-id: efbdfa504b [formerly 25cb96ec19] [formerly efbdfa504b [formerly 25cb96ec19] [formerly bb8a61a996 [formerly c215890342be6fed80d614e0a5853e8ce816a7f2]]]
Former-commit-id: bb8a61a996
Former-commit-id: c3b4d790a3 [formerly d405e4bfe1]
Former-commit-id: 956a8fd092
|
2015-02-04 09:59:06 -06:00 |
|
Rici.Yu
|
520899992d
|
ASM #17039 - Remove HighlightFramingCodes feature
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: 0a489fea9c [formerly 5470139b42] [formerly 0a489fea9c [formerly 5470139b42] [formerly 1188dab0f4 [formerly cb047745b4a5c523bd1ca26692c758d3e72d8ddc]]]
Former-commit-id: 1188dab0f4
Former-commit-id: e1762b3ae9 [formerly f41d5cffef]
Former-commit-id: ff0177a6dd
|
2015-02-04 10:23:30 -05:00 |
|
Steve Harris
|
d09bee3e06
|
Merge tag 'OB_14.4.1-7m' into omaha_14.4.1
14.4.1-7
Former-commit-id: 8f2af8e359 [formerly f428e16ebb] [formerly 8f2af8e359 [formerly f428e16ebb] [formerly 2468be4dd1 [formerly 88b43275725882327d4487733e3135489874de1f]]]
Former-commit-id: 2468be4dd1
Former-commit-id: 520023d6c2 [formerly 8a8e66a3e1]
Former-commit-id: 8513926d87
|
2015-02-03 17:18:57 -06:00 |
|
Joshua Watson
|
fef69b67e3
|
VLab Issue #5238 - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS. Changed serverConfig.Vis to Vis on that same line; fixes #5238
Change-Id: I1724074899bad140a60c7f4da37622178ddba3c0
Former-commit-id: 931a18418d [formerly af60ca1232] [formerly 931a18418d [formerly af60ca1232] [formerly 4c574676d7 [formerly b32bdbe92d1db52997c9e79ece82df19f91357f3]]]
Former-commit-id: 4c574676d7
Former-commit-id: 641f08a259 [formerly 66a1965ce1]
Former-commit-id: 42753b59ab
|
2015-02-03 17:43:17 -05:00 |
|
Shawn.Hooper
|
086eb170e5
|
Merge "ASM #16969 - Update jdk tarball with correct version" into asm_14.4.1
Former-commit-id: 9bfe24f884 [formerly e505183f64] [formerly 9bfe24f884 [formerly e505183f64] [formerly 0abe2e23a0 [formerly 18ebaf6a58644c50d9ed41eda373f3c6d9259c32]]]
Former-commit-id: 0abe2e23a0
Former-commit-id: 14ddda1157 [formerly d5536aaf6c]
Former-commit-id: 9d7318bc83
|
2015-02-03 17:06:28 -05:00 |
|
Fay.Liang
|
267fb768d9
|
Merge branch 'master_14.4.1' into asm_14.4.1
Former-commit-id: 3aa9f17455 [formerly 07c742044d] [formerly 3aa9f17455 [formerly 07c742044d] [formerly de502a310b [formerly 8f839ec64da04492e6cf109fdf47b95f08db5388]]]
Former-commit-id: de502a310b
Former-commit-id: f075116f65 [formerly 7517728c42]
Former-commit-id: a3c39c1a8d
|
2015-02-03 16:04:56 -05:00 |
|
Greg Armendariz
|
e09375ffce
|
Merge "Omaha #4065 - Update EDEX RPM install to modify date stamp" into omaha_14.4.1
Former-commit-id: bdcb5067d4 [formerly e87f8c0c5f] [formerly bdcb5067d4 [formerly e87f8c0c5f] [formerly e004e0881f [formerly ddf9b7d0a97ffda6e79688d7c35c828fb7fc1d91]]]
Former-commit-id: e004e0881f
Former-commit-id: 24d9da8c2c [formerly 48afd5b062]
Former-commit-id: 86a6f08f80
|
2015-02-03 11:35:26 -06:00 |
|
Steve Harris
|
2a1c5cfc23
|
Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
14.4.1-6
Former-commit-id: 80dae4bc15 [formerly db185ed16c] [formerly 80dae4bc15 [formerly db185ed16c] [formerly b684848820 [formerly 6873606777f0c7c18928b0b0814050742c256dc2]]]
Former-commit-id: b684848820
Former-commit-id: b971724d20 [formerly 40f44c9e15]
Former-commit-id: 9ffe8b7084
|
2015-02-03 11:24:39 -06:00 |
|
Fay.Liang
|
7f3a53beaf
|
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 5550322f62 [formerly ae85ade54d] [formerly 5550322f62 [formerly ae85ade54d] [formerly f1c34884a5 [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]]
Former-commit-id: f1c34884a5
Former-commit-id: 7ac4ff3f48 [formerly 82b3637598]
Former-commit-id: 37f830c123
|
2015-02-03 11:24:57 -05:00 |
|
Greg Armendariz
|
e3f22bed4c
|
Omaha #4065 - Update EDEX RPM install to modify date stamp
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0
Former-commit-id: 19d79f71d3 [formerly 8c38289cf7] [formerly 19d79f71d3 [formerly 8c38289cf7] [formerly fbadd1deb1 [formerly 83243af002e8ddfd15f899ff1ab3e511cf5a0af4]]]
Former-commit-id: fbadd1deb1
Former-commit-id: 6a7891d660 [formerly a3d4342498]
Former-commit-id: fdf1408c06
|
2015-02-03 10:12:54 -06:00 |
|
Ron Anderson
|
a3bfe3b090
|
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
Former-commit-id: 8c6c42fe43 [formerly f280c0ab2e] [formerly 8c6c42fe43 [formerly f280c0ab2e] [formerly 933590f36a [formerly 170e3149e6cf9feb7a8ab0e2ac3ed0826b9f7b6c]]]
Former-commit-id: 933590f36a
Former-commit-id: cc882eae28 [formerly 074512f362]
Former-commit-id: fa9890db7a
|
2015-02-02 15:04:51 -06:00 |
|
Bradley Mabe
|
1911c68fb3
|
Merge remote branch 'origin/omaha_pgen' into ncep_14.4.1
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResource.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResourceGhost.java
Change-Id: I8506bb7deb4f57f5989d3513d682561948870593
Former-commit-id: e8dc39ee79 [formerly 847c663329] [formerly e8dc39ee79 [formerly 847c663329] [formerly de986a26ed [formerly a71f38e658319ac1109de6c73dfa29db35535f96]]]
Former-commit-id: de986a26ed
Former-commit-id: 165e747e6e [formerly eebc4f4232]
Former-commit-id: d86ae801fb
|
2015-02-02 15:49:14 -05:00 |
|
Richard Peter
|
4593d63c34
|
Merge "Omaha #4031 Implement preferrred AFOS first letter." into omaha_14.4.1
Former-commit-id: a63c9099c8 [formerly 166bf912bd] [formerly a63c9099c8 [formerly 166bf912bd] [formerly a3a4c9b0b7 [formerly 28d8103fc3287f27edccc6187ca3df5d72726d97]]]
Former-commit-id: a3a4c9b0b7
Former-commit-id: f5b835a71c [formerly 8bd257fa31]
Former-commit-id: 87a5d55d91
|
2015-02-02 12:49:01 -06:00 |
|
Ron Anderson
|
07ac450c18
|
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: 67443be919 [formerly bdc365d9c9] [formerly 67443be919 [formerly bdc365d9c9] [formerly 346ea417ea [formerly 9d2f64b08acbec0567c7f29871480827ff0f6de7]]]
Former-commit-id: 346ea417ea
Former-commit-id: d3bce10b61 [formerly 48c2f0e843]
Former-commit-id: 30824e2e86
|
2015-02-02 11:26:59 -06:00 |
|
Fay.Liang
|
614d6f9c9e
|
Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/doConfig.py
Former-commit-id: 99b1511120 [formerly 4ddd4cec81] [formerly 99b1511120 [formerly 4ddd4cec81] [formerly 15f28c0245 [formerly 307e986b8e9ce89ad1eb7b28f88afe82c2596f30]]]
Former-commit-id: 15f28c0245
Former-commit-id: 4d1427b012 [formerly 5b1b9cff50]
Former-commit-id: 92f0a1bfb1
|
2015-02-02 10:06:58 -05:00 |
|
Matthew Howard
|
5018506b64
|
Merge "ASM #17055 - fix activeTableChange logging" into asm_14.4.1
Former-commit-id: 9c2ab1517f [formerly a1c925be94] [formerly 9c2ab1517f [formerly a1c925be94] [formerly 5bdaf8cd94 [formerly e14672d6e2b075792600c4d4d709044049e21d04]]]
Former-commit-id: 5bdaf8cd94
Former-commit-id: 9937da77dc [formerly c8674ffa38]
Former-commit-id: e1385df42b
|
2015-01-30 14:29:49 -05:00 |
|
Ana Rivera
|
7cea67cfc6
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: ccd0a40621 [formerly ea92049aac] [formerly ccd0a40621 [formerly ea92049aac] [formerly 070f0136ec [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]
Former-commit-id: 070f0136ec
Former-commit-id: e358377ca7 [formerly 1bbb9bad78]
Former-commit-id: 0715e923df
|
2015-01-30 19:29:29 +00:00 |
|
Roger Ferrel
|
101817c3df
|
Omaha #4031 Implement preferrred AFOS first letter.
Change-Id: I1c011beaf078d08c79c02863ac8afd01c7318645
Former-commit-id: fca30b70f5 [formerly 28f435a27f] [formerly fca30b70f5 [formerly 28f435a27f] [formerly 61ab864445 [formerly 776989760fa936913006924efb1e84832ffec31f]]]
Former-commit-id: 61ab864445
Former-commit-id: f94ff0543f [formerly 522b08564d]
Former-commit-id: c88bb9e085
|
2015-01-30 13:01:01 -06:00 |
|
Rici.Yu
|
93c9041e3e
|
ASM #17055 - fix activeTableChange logging
Change-Id: I863a43005685b5b73eb96d80f0ffa46d12ecfcbc
Former-commit-id: 2fd2028490 [formerly 969e5ca72b] [formerly 2fd2028490 [formerly 969e5ca72b] [formerly e9349a6701 [formerly 777729392f9cdbbcfe3bbdd7ac4c19c714dfb31a]]]
Former-commit-id: e9349a6701
Former-commit-id: c23113db5e [formerly 36bdc2befb]
Former-commit-id: 90e6e9656d
|
2015-01-30 13:19:40 -05:00 |
|