Steve Harris
|
f3017b859e
|
Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 4fde31539e [formerly aff75d954b] [formerly f2fdf98d2f [formerly 4be51191bc64978e3c455702bede3456666fbffe]]
Former-commit-id: f2fdf98d2f
Former-commit-id: da238d6478
|
2014-10-15 08:42:02 -05:00 |
|
Brian Clements
|
d2042e3485
|
Omaha #3675 startup shutdown log name includes child pid
fixed capture
Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7
Former-commit-id: 78c2aa3650 [formerly 3a12ab9bdf] [formerly 6d6d3d26e6 [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]]
Former-commit-id: 6d6d3d26e6
Former-commit-id: 470a695a1a
|
2014-10-13 16:32:41 -05:00 |
|
Kevin.Johnson
|
617128a462
|
ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae
Former-commit-id: dcecf025a2 [formerly 355274e7ac] [formerly 5cf5cac9f7 [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]]
Former-commit-id: 5cf5cac9f7
Former-commit-id: b0e68c1ed1
|
2014-10-07 14:55:41 -04:00 |
|
Steve Harris
|
bcf1265a16
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 06a27b2d3c [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 2db03d95b3
Former-commit-id: 3542caf090
|
2014-10-06 13:57:59 -05:00 |
|
Steve Harris
|
842abaad49
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 3598e9b5b6 [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 6330a62e85
|
2014-09-29 12:58:56 -05:00 |
|
Ben Steffensmeier
|
0724aa4e71
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 6090625040 [formerly f92d021e96] [formerly 5b10ac2f36 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]
Former-commit-id: 5b10ac2f36
Former-commit-id: 107ccbf332
|
2014-09-29 10:49:14 -05:00 |
|
Kevin.Johnson
|
d719e57462
|
ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7
Former-commit-id: 7d677d0023 [formerly 5a38528711] [formerly 4d8efeeb9a [formerly c36b732cc8057cf7b830de647998f679725760da]]
Former-commit-id: 4d8efeeb9a
Former-commit-id: 498374fbac
|
2014-09-25 10:50:07 -04:00 |
|
Brian.Dyke
|
41bffe239e
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a1dd6b20ab [formerly 5d0347f589] [formerly 7996916e36 [formerly 414a695e6423fa291936d15a999113f4a518b097]]
Former-commit-id: 7996916e36
Former-commit-id: 3f4c66160f
|
2014-09-22 16:51:47 -04:00 |
|
Brian.Dyke
|
12bf31b5ba
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 75f3bb31d5 [formerly 4db67c581c] [formerly 8d665b93b5 [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]
Former-commit-id: 8d665b93b5
Former-commit-id: b83e12da28
|
2014-09-19 16:56:50 -04:00 |
|
Stephen Gilbert
|
3251e256c6
|
Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
cave/build/cave/customTargets.xml
edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties
Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6
Former-commit-id: 2406f0786f [formerly 561b751e58] [formerly 662436c2d5 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]
Former-commit-id: 662436c2d5
Former-commit-id: a631e61fe5
|
2014-09-11 11:14:33 -04:00 |
|
Matthew Howard
|
d67d2d9f04
|
Merge "ASM #539 Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: 8e65a175fc [formerly 8ebfa3edce] [formerly fdfe97c659 [formerly 764e268bcccec4a805509a11fbd9c9f4e1860842]]
Former-commit-id: fdfe97c659
Former-commit-id: f70ccec42e
|
2014-09-08 08:23:57 -05:00 |
|
Brian Clements
|
d7a388cfd9
|
Omaha #2926 switched text subscription to thrift client
Change-Id: I3fafee2252aff2a80657cdf8a8092f63459671c6
Former-commit-id: d8b2da2900 [formerly ac811b666c] [formerly 0087580736 [formerly 410ef2954d6cfff11a4718056983ccaecf186fd3]]
Former-commit-id: 0087580736
Former-commit-id: 375c3a6f78
|
2014-09-05 16:52:38 -05:00 |
|
Brian Clements
|
8cc7d1e36d
|
Omaha #2926 moved TextDBRequest to common
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c
Former-commit-id: c89a74943e [formerly 1b248efb54] [formerly c77b4f4e8b [formerly 924e512c327c838d866b353ec8da8f7e5534db49]]
Former-commit-id: c77b4f4e8b
Former-commit-id: 3a0da3d8d5
|
2014-09-05 12:56:04 -05:00 |
|
Kiran.Shrestha
|
07018d4558
|
ASM #539 Multiple flag functionality for textdb is not working properly
Change-Id: Iaae81cace051d97db464e6610d6fa94f86086fb8
Former-commit-id: e38e3af172 [formerly f11699eddd] [formerly 571f6fb8ea [formerly 0220801fc1747c7659e3db7cf734538fdda270ef]]
Former-commit-id: 571f6fb8ea
Former-commit-id: 27f157349e
|
2014-08-28 10:05:41 -04:00 |
|
Brian.Dyke
|
f90649d7e7
|
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 aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: aa83bf804f
Former-commit-id: f7f16ff9eb
|
2014-08-27 11:19:19 -04:00 |
|
Brian Clements
|
65d5085dcf
|
Omaha #2926 switched textdb to thrift client
Change-Id: I80a55506fa1e6d8780c0d3dbfb4b3c82b1aac9f1
Former-commit-id: 344ba01102 [formerly 1bbf5d7346] [formerly c05e535cc8 [formerly 856ef48bab005bdb7de9dd4145fafc7fe12084f5]]
Former-commit-id: c05e535cc8
Former-commit-id: 09d7136915
|
2014-08-25 10:28:48 -05:00 |
|
Brian Clements
|
0f61cfd95c
|
Omaha #2926 fixed sub operation check in TextDB script
Change-Id: Icd2971efeff3ffb29df3bd56bf318ad57cae0a6b
Former-commit-id: a75af54f30 [formerly 507deef29c] [formerly 72335f48c6 [formerly f77509e176afbdf7bfc75da107bf76fc841653d4]]
Former-commit-id: 72335f48c6
Former-commit-id: 8d03015b6a
|
2014-08-15 13:46:07 -05:00 |
|
Richard Peter
|
bc7d8bfe6d
|
Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: fc6aae3c3c [formerly 477119b739] [formerly 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]]
Former-commit-id: 96a1821753
Former-commit-id: f7e0a6cf11
|
2014-08-07 14:01:54 -05:00 |
|
Brian Clements
|
10a01f3556
|
Omaha #3364 added jmap -heap to capture script
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153
Former-commit-id: 146318e49e [formerly 82cf017cbe] [formerly d5506736df [formerly 65c88529acfb31c408777337f456da5dce879146]]
Former-commit-id: d5506736df
Former-commit-id: 2c4fb16c12
|
2014-07-11 10:20:48 -05:00 |
|
Stephen Gilbert
|
18587e4449
|
VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n
Fixes for Vors, Ncuair, and pressure change
Change-Id: I11d77f5b359e3f73317a46ecf9addf81079c1616
Former-commit-id: e518f4b2bf [formerly 5da2ae3fa7] [formerly 11d21bbe95 [formerly a05e1a8190d28f3d09e373b8d8c5f46829bbc9e8]]
Former-commit-id: 11d21bbe95
Former-commit-id: ff091abccd
|
2014-07-08 09:51:57 -04:00 |
|
Brian Clements
|
deb7669844
|
Omaha #3319 switched capture to only dump live objects
work around for java 1.7 G1 garbage collector jmap problem
Change-Id: I5dd8db5d2d98baacaa03a3b60d1d9c5cb350fc2d
Former-commit-id: 312f74a200 [formerly 92a510fcb8] [formerly fe6b3ff4b3 [formerly 54157c12af81c4e217d3ade436bc0b3723964cac]]
Former-commit-id: fe6b3ff4b3
Former-commit-id: 6353125f62
|
2014-06-27 12:47:17 -05:00 |
|
Brian Clements
|
91d1378c31
|
Omaha #3245 altered utility scripts to account for cave subprocess
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: 27a0d3fb28 [formerly 0f25ac3b5b] [formerly 3b71bedd14 [formerly aceeff1e02c896ff27794755eb10fc275718a68c]]
Former-commit-id: 3b71bedd14
Former-commit-id: be3d47e5e9
|
2014-06-24 11:15:45 -05:00 |
|
Nate Jensen
|
5129fee3e6
|
Omaha #3245 fix GFE starting without a cave data
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 2ce0e5aee5 [formerly 19aa9dc96e] [formerly 8ab7d86a8f [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]
Former-commit-id: 8ab7d86a8f
Former-commit-id: 451b265ce6
|
2014-06-17 16:31:20 -05:00 |
|
Greg Armendariz
|
8296281614
|
Omaha #3227 - Add memory check to capture script
Change-Id: Icce56d22be3c785ccfe41903b01eabdbe49c5475
Former-commit-id: 59f25a8790 [formerly 5b1f81551c] [formerly fc88788547 [formerly 2d72889bf873c08cef82b2dd01f91e14d04ddc62]]
Former-commit-id: fc88788547
Former-commit-id: 87c4971f59
|
2014-06-04 10:00:59 -05:00 |
|
Stephen Gilbert
|
71730ae2ec
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 651f6a2e9c [formerly 8a3ab16e46] [formerly e73836f3b5 [formerly d2d54ee2bfbbe6fef44df58d2edc3b5858ffbe22]]
Former-commit-id: e73836f3b5
Former-commit-id: 571cc69cf3
|
2014-05-22 13:31:12 -04:00 |
|
Stephen Gilbert
|
86953e803e
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0
Former-commit-id: 14258764bd [formerly 91d469eb90] [formerly 7992a6b15b [formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]]
Former-commit-id: 7992a6b15b
Former-commit-id: 7aaf3f44bc
|
2014-05-22 12:39:09 -04:00 |
|
brian.dyke
|
2e105c1d5d
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]
Former-commit-id: 58683ad040
Former-commit-id: bc4649765a
|
2014-05-19 09:45:37 -04:00 |
|
Stephen Gilbert
|
da02372ba6
|
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins
Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68
Former-commit-id: 4602f86f47 [formerly bd2dad11b5] [formerly ca9b7c8dfc [formerly 3c904361e7176592cc873a3414c18ad5107aea54]]
Former-commit-id: ca9b7c8dfc
Former-commit-id: 4e5968d7b6
|
2014-05-15 17:20:52 -04:00 |
|
Stephen Gilbert
|
26843256a6
|
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins
Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68
Former-commit-id: 7acac4244f [formerly ff4da2f31e] [formerly 67b526b9ff [formerly ff3f1d5997b1a87d3dddc7ca3b3893602eba510e]]
Former-commit-id: 67b526b9ff
Former-commit-id: 952cabb05b
|
2014-05-15 14:50:35 -04:00 |
|
Juliya Dynina
|
f62a15f8e7
|
Merge "ASM #539 - Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: 161d2039f7 [formerly a203a14e52] [formerly 2578e13ee8 [formerly 3fcd47133ac461046524837f085359b5eb1c7ba7]]
Former-commit-id: 2578e13ee8
Former-commit-id: 212d220bf7
|
2014-05-12 14:52:50 -05:00 |
|
Kiran.Shrestha
|
d0ed79310a
|
ASM #539 - Multiple flag functionality for textdb is not working properly
Change-Id: I6f48e877a356fa576e1311da769c90735e61877f
Former-commit-id: d4970b6f2f [formerly e615e1efc5] [formerly c162868850 [formerly 2e2de40d75c0ebc0af1b2d70806e834c7d5089f8]]
Former-commit-id: c162868850
Former-commit-id: 943efbc9d0
|
2014-05-12 15:16:14 -04:00 |
|
Michael Gamazaychikov
|
34c44b6b8f
|
ASM #510 - textdb -pil -a command fails to add scripts with option
arguments.
Change-Id: I3f6c1c334db1100af0cb137f2f0a1a856564aaf4
Former-commit-id: 6497950f3d [formerly 97ec336416] [formerly c9df02db64 [formerly 77b054caca0aa54d51fa947a4a8aa041ef0cdcab]]
Former-commit-id: c9df02db64
Former-commit-id: f253b0ca13
|
2014-05-09 14:45:27 +01:00 |
|
Richard Peter
|
6966b79246
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 32957285fc
Former-commit-id: 80d4153878
|
2014-04-28 16:27:40 -05:00 |
|
Richard Peter
|
3f66895529
|
Issue #2629: Update capture to grab Xorg log files.
Change-Id: Ic6d4806bee75894805fb7fa5882d3b454418c26d
Former-commit-id: 5fb2aef966 [formerly de249decab] [formerly 1cc7977b99 [formerly 38ad09697f3e618b6c9edb6592913b2d50014d14]]
Former-commit-id: 1cc7977b99
Former-commit-id: 7e3d3f3093
|
2014-04-25 14:42:53 -05:00 |
|
Brian.Dyke
|
4efe23ee2c
|
ASM #465 - Update capture script to prevent hanging when running psql
Change-Id: I74c9fe349509850522a8bee37f34664559435d3c
Former-commit-id: af5cbe3321 [formerly 192a5513df] [formerly deff8ed340 [formerly 17ab69323dd1b420662db25e09b05e3408d3f2ab]]
Former-commit-id: deff8ed340
Former-commit-id: 97687e7217
|
2014-04-11 11:18:06 -04:00 |
|
David Friedman
|
91b22ff9bb
|
ASM #349 - Workaround for QPID-5569
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce
Former-commit-id: 103fece7b7 [formerly 2c1a3442d6] [formerly a58f3cb7df [formerly 18d692c17ea11537d0eb832fbe63a04b59b0040c]]
Former-commit-id: a58f3cb7df
Former-commit-id: 2a4a92c223
|
2014-03-07 14:58:09 +00:00 |
|
David Gillingham
|
3e0ef451a1
|
Issue #2657: Update convertCDL2XML for unified grid.
Former-commit-id: 476fcb7980 [formerly ed22a86d9f] [formerly d6397522c4 [formerly 247536f4d83c7f7de449707916d2950ae74be551]]
Former-commit-id: d6397522c4
Former-commit-id: 777c1fba86
|
2014-01-08 11:02:30 -06:00 |
|
Steve Harris
|
4c6790f10f
|
13.5.2-4 baseline
Former-commit-id: 595e7bc0d9 [formerly e3c935d48b] [formerly 58c6821427 [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]
Former-commit-id: 58c6821427
Former-commit-id: abed443b59
|
2013-09-12 11:13:59 -04:00 |
|
Steve Harris
|
43af1b227a
|
13.5.2-1 baseline
Former-commit-id: 894d2425b2 [formerly 73dd0f166c] [formerly 542b2c3d18 [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]
Former-commit-id: 542b2c3d18
Former-commit-id: 4ecb349ed8
|
2013-08-28 09:43:48 -04:00 |
|
Steve Harris
|
deebdb874a
|
13.5.1-3 baseline
Former-commit-id: d8176d4a4c [formerly 63803c1424] [formerly 72d22a30c9 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 72d22a30c9
Former-commit-id: 810388f00a
|
2013-06-24 09:29:43 -04:00 |
|
Steve Harris
|
ccd66c0724
|
13.5.1-2 baseline
Former-commit-id: bc60b22f00 [formerly adb779323d] [formerly 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: 3386330894
Former-commit-id: 3926dc20f7
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
0aab285b8a
|
13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
cebc1ddb63
|
13.4.1-14 baseline
Former-commit-id: be236eb722 [formerly c749e122eb] [formerly 18b90226a2 [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]
Former-commit-id: 18b90226a2
Former-commit-id: dee685e3c7
|
2013-06-06 15:15:27 -04:00 |
|
Steve Harris
|
67a95d07d2
|
13.4.1-9 baseline
Former-commit-id: 88eee9cbfa [formerly bcf7f15c90] [formerly aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]
Former-commit-id: aff41713f9
Former-commit-id: 0766ae20dd
|
2013-05-16 11:12:07 -04:00 |
|
Steve Harris
|
0e950655f1
|
13.4.1-1 baseline
Former-commit-id: f95e0ad10b [formerly 2f517b7713] [formerly 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 00332e6305
Former-commit-id: 4accbb80db
|
2013-04-24 17:15:55 -05:00 |
|
Steve Harris
|
05eb25f124
|
13.3.1-3 baseline
Former-commit-id: a55f438dd8 [formerly 6572452887] [formerly 8a64f142e5 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 8a64f142e5
Former-commit-id: 8d741715e3
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
06f4b4ad5a
|
13.2.1-4 baseline
Former-commit-id: f2b28cfa56 [formerly 1beb655fa0] [formerly 1e77a6f0bd [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]
Former-commit-id: 1e77a6f0bd
Former-commit-id: e6e4de6247
|
2013-01-31 12:05:59 -05:00 |
|
Steve Harris
|
cd4185ef5c
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
4f243de928
|
12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
efba080b9c
|
12.11.1-7 baseline
Former-commit-id: 40a5bc1683 [formerly d8ca6b9005] [formerly 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: 79a5638de9
Former-commit-id: cfd228f0d7
|
2012-10-23 16:40:50 -05:00 |
|