Shawn.Hooper
a6a840f3c8
ASM #14246 - Check-in updated transmit_rfc_qpe script
...
Change-Id: I26751d39d2b31a345276da722c7a25a9ff8f9508
Former-commit-id: 3c3b69809d
[formerly 72dd2f411e10e1eb6a934adf05d7df179b570ded]
Former-commit-id: 0ba143cc43
2015-02-11 13:55:20 -05:00
Shawn.Hooper
8351eb7bdf
ASM #16804 - Check in the required library files
...
Change-Id: Ib84d554ef4723072f8272327b7d00a737ba1405a
Former-commit-id: ca8b043aed
[formerly 22fc7ef208aaef87d2ef366f9ae8c0840379139c]
Former-commit-id: 6573bd2672
2015-02-11 12:40:33 -05:00
Shawn.Hooper
9114790e29
ASM #16969 - Update jdk tarball with correct version
...
Change-Id: I1a6a445159f39168dc070783548d443a82225bd3
Former-commit-id: 00d89c9b8d
[formerly 623724f2920280470ef0f60ff4c263754917591e]
Former-commit-id: fa40885eb7
2015-01-29 14:23:23 -05:00
Shawn.Hooper
7839dab5e6
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: a757b55446
[formerly d53c809149da23fcae51138cc45c57aecd641794]
Former-commit-id: 0bc501bd4c
2015-01-22 16:05:41 -05:00
Fay.Liang
6b77894bd0
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: eed6737801
[formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]
Former-commit-id: c6bd5d7675
2015-01-12 13:03:31 -05:00
steve.naples
7f8716267f
ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions.
...
Change-Id: I23a4dae2aef9bdf71848c1e9a3338e1bddc39205
Former-commit-id: bdbdc68b2a
[formerly 28f92f6b49d286f7c470bda6184d12b7882bb768]
Former-commit-id: f53fb9c404
2015-01-06 19:49:03 +00:00
Chip Gobs
34006d87ca
VLab Issue #5615 MPE:Null DAA Radar Product Handling; fixes #5615
...
Former-commit-id: d6619ab0e0
[formerly ef877ed41166503b844c81ac7e3108421ff872ec]
Former-commit-id: 5c76a59cc1
2014-12-12 13:12:48 -05:00
David Lovely
b32d54c7f9
Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
...
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470
Former-commit-id: 1a191cac55
[formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]
Former-commit-id: 625e83c445
2014-11-10 08:27:28 -06:00
Nate Jensen
852fe79de3
Omaha #3676 harden numpy array to java array conversions to work with
...
newer versions of python/numpy and not crash when heap cannot be
allocated
Change-Id: I2a83f6e2720de331188ae5b42dd8c86b14900288
Former-commit-id: b23d42f561
[formerly 67630fce01ecbd64a760211820af5b5eaff4cade]
Former-commit-id: 433e8b6fc1
2014-10-15 09:02:07 -05:00
Steve Harris
9891be174d
Omaha #3300 - Added another compiled nativeLib binary to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Former-commit-id: 6cf62253a8
[formerly 230f4413d69d25ca4e8cafc23ec80b3bb79fea63]
Former-commit-id: e09f3ab040
2014-09-23 15:30:55 -05:00
Steve Harris
f29bef4f34
Omaha #3300 - Added compiled nativeLib binaries to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Former-commit-id: c8bee38fc7
[formerly 785a6cb7ef5856e0bc0beb3fcf5657f74934111b]
Former-commit-id: 26155d4251
2014-09-23 12:02:08 -05:00
Steve Harris
2e2072a963
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: b979960b7b
[formerly 72f387d2802c12eedfe5643616fe5a54420aef66]
Former-commit-id: 7692e3f21d
2014-09-23 11:41:10 -05:00
Brian.Dyke
9d2eaef5e7
VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so
...
Former-commit-id: 05145d2f0d
[formerly 0448deecda7c53ac65bc66bc9751ec0e7f83eee1]
Former-commit-id: 546b43dff6
2014-09-17 15:39:57 -04:00
Chip Gobs
bc743b7bd7
Merge remote-tracking branch 'origin/master_14.3.1' into ohd_14.3.1_v6
...
Former-commit-id: 51f2d9df8e
[formerly 2131a59fecbb9bc01dd395360f7f8dafe6d76b0b]
Former-commit-id: 0278dfb45f
2014-09-03 14:48:29 -04:00
Steve Harris
bddf9c0f27
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: 5d58625abc
[formerly 8793dca41f756ba812206b48391caea6e593a657]
Former-commit-id: 793064063b
2014-08-29 10:17:52 -05:00
Brian.Dyke
a08db8d73d
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: aa83bf804f
[formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: e654318431
2014-08-27 11:19:19 -04:00
Brian.Dyke
2ddc920a4a
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: dd9d7133d9
[formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]
Former-commit-id: 325887e605
2014-08-22 14:16:22 -04:00
Slav Korolev
1c896cedab
Issue #2875 - Implemented HFR Surface Current Velocity.
...
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761
This reverts commit 55a1120bdb
[formerly dd9d117f90
] [formerly e5af41fa86
[formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]].
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: a779c786f1
[formerly aee044437492438381db98cc6fd3a917f6c05659]
Former-commit-id: a9bed4c6fd
2014-08-19 10:12:36 -05:00
Loubna.Bousaidi
afae4700a6
ASM #511 changes to transmit_rfc_bias calls from MPE
...
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: d41e489ced
[formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]
Former-commit-id: 8c15d1f124
2014-08-15 10:54:10 -05:00
Steve Harris
55a1120bdb
Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity."
...
This reverts commit 50e93daab7
[formerly 978349e517
] [formerly 7ae3ca0bfc
[formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]].
Former-commit-id: e5af41fa86
[formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]
Former-commit-id: dd9d117f90
2014-08-12 10:19:12 -05:00
Slav Korolev
50e93daab7
Issue #2875 - Implemented HFR Surface Current Velocity.
...
Former-commit-id: 7ae3ca0bfc
[formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]
Former-commit-id: 978349e517
2014-08-12 09:19:22 -04:00
Richard Peter
01692edc6b
Issue #3458 Increase ldm to edexBridge shared memory queue.
...
Change-Id: I30f0db8b3802c13048587067fbf901c5a7903468
Former-commit-id: 8374869379
[formerly 21a63b7e1218efedab86d6034dd5b92810764cb9]
Former-commit-id: bd2d97dc46
2014-08-06 10:57:31 -05:00
Steve Harris
a92dc418c6
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
Former-commit-id: bf9a0fa5de
[formerly f7d474895366eb23ae5eef242a4568f911435aa3]
Former-commit-id: 0fb743ec44
2014-08-04 22:20:29 -05:00
Brian.Dyke
301f3094be
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 270d2b0ddb
[formerly b209604e1f0d6e790980d0bc8f1760e38f448076]
Former-commit-id: 9abb02ea8a
2014-08-04 13:10:13 -04:00
Ying-Lian.Shi
9dbfbbe0c3
ASM #15649 - these 5 files are rolled back to 14.1.3
...
Change-Id: Ifc52168f1faf3984f2a2d72947273686c5a00fd9
Former-commit-id: 1f6d24a076
[formerly ab5a6807a591605e230d4180f1dcf3c2eaa8657f]
Former-commit-id: 22d46f2658
2014-07-23 12:24:22 +00:00
Benjamin Phillippe
cc9e9b427a
Omaha #3379 Removing DWR
...
Former-commit-id: 4e1d93abf8
[formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]
Former-commit-id: d110e8428b
2014-07-11 11:56:44 -05:00
Greg Armendariz
20f5ccf9f0
Omaha #3299 - Remove project file and change build reference
...
Former-commit-id: 40ad6795df
[formerly c233ad285b9addca8a8be6074b1e2440896d2276]
Former-commit-id: f4063c8162
2014-06-30 14:49:24 -05:00
Chip Gobs
382c7c4edd
VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix.
...
Change-Id: I950192bc25dd1be78cf77e58f18946c86ac38623
Former-commit-id: 83a5ed0e92
[formerly a948c8cc9ffdd19c26cee8c547984aec114e4221]
Former-commit-id: 0e64ccc33a
2014-06-26 06:47:45 -04:00
Steve Harris
97843cf58e
Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Former-commit-id: e1c8ad2611
[formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]
Former-commit-id: 9213369739
2014-06-16 08:19:12 -05:00
Bryan Kowal
1920bf461d
Omaha #3189 - ensure the PostgreSQL libpq libraries are included in the hydroapps native directory
...
Former-commit-id: 8896dc8a75
[formerly 1da5e7cb5f6d8a6b8e915a8ecb238a0825991afe]
Former-commit-id: 03d2a8ab7e
2014-06-09 16:20:01 -05:00
Chip Gobs
a5c4402f34
VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse.
...
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d
Former-commit-id: 036d1c4d31
[formerly 6944361d04e7462f768bb74f00780dc8b8a51225]
Former-commit-id: 83ac596f9e
2014-06-05 13:37:02 -04:00
Steve Harris
647cd97e29
Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
edexOsgi/build.edex/edex/common.properties
edexOsgi/build.edex/esb/conf/modes.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so
Former-commit-id: 455eb8b39d
[formerly 45250149681f057cf168f4d3cb27276279f62c05]
Former-commit-id: 7fec0d039c
2014-06-02 11:21:46 -05:00
Brian.Dyke
a0a879be7d
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 3f1e12effc
[formerly 9d7a819489480e119b65cb5643520818adeb1ebf]
Former-commit-id: a8737e18f0
2014-05-30 10:46:25 -04:00
Steve Harris
718c78d984
Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java
Former-commit-id: dc74953978
[formerly 802843fa475654ffab03545a4970f4e5857590cd]
Former-commit-id: be80bd01f3
2014-05-28 09:01:00 -05:00
Steve Harris
3de24b7b07
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 3b16bbafb1
[formerly 117fa26f537131552bbe51b2c5fe12405a26db32]
Former-commit-id: 99bc6f990c
2014-05-27 14:48:24 -04:00
Bryan Kowal
7341d90341
Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version.
...
Rebased on re-compiled on the latest version of the nativeLib code.
Former-commit-id: c711ab9195
[formerly b96b174d5b4b082dc692e3a14ef1cc7b58f06b5a]
Former-commit-id: f1258ef865
2014-05-27 13:16:37 -05:00
Steve Harris
376482d3b1
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: b6af2db9f5
[formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]
Former-commit-id: 518822ed83
2014-05-22 14:31:06 -05:00
Bryan Kowal
5ca6dfbf90
Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version.
...
amend: remove debug code
Change-Id: I16d16576af71ad02821c8e65c10081bda5d061e3
Former-commit-id: 76cd1c2ac8
[formerly 9ad4422eb9911f8fbf0c5db40103ee8a1d925570]
Former-commit-id: c6518e7378
2014-05-20 11:02:31 -05:00
brian.dyke
9626317825
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: 58683ad040
[formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]
Former-commit-id: 011d121e4b
2014-05-19 09:45:37 -04:00
Mike Duff
0456fd0597
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
...
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 6a67638a94
[formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]
Former-commit-id: 8498235fd8
2014-05-08 14:36:54 -05:00
Richard Peter
2668f09447
Issue #3102 : Fix edexBridge connection leak
...
Change-Id: Ic0938d31d9ff607249e980c443f98f251501b823
Former-commit-id: b091a8827a
[formerly 79c52892667d34abb651a36f7f5bd89f4143ffff]
Former-commit-id: 501980904d
2014-05-06 10:32:31 -05:00
Chip Gobs
4e4d00792d
VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168 ) and PostAnalysis (DR #9784 ) )
...
Change-Id: Id96c25de545144d769309fef608c431d67d1bada
Former-commit-id: e42bef2a33
[formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]
Former-commit-id: 65d2135ac2
2014-05-06 10:48:35 -04:00
Loubna.Bousaidi
1b5bccc451
ASM #511 changes to transmit_rfc_bias calls from MPE
...
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: 6d526cb1ff
[formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]
Former-commit-id: 760ee964d6
2014-04-29 21:09:34 +00:00
Steve Harris
29f4f53d27
Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
...
Former-commit-id: 656ae897c1
[formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]
Former-commit-id: a70710b467
2014-03-26 16:19:26 -05:00
Brian.Dyke
027cca8673
Fixed comment merge conflicts added .gitignore
...
Former-commit-id: a0e7cb624a
[formerly 6093428342170b9fd8deb741a5721375e80bc955]
Former-commit-id: 7cc471a9c9
2014-03-25 15:41:58 -04:00
Steve Harris
5efb16fa8b
Merge branch 'omaha_14.2.1' (14.2.1-13) into development
...
Former-commit-id: 0c2c5ad4bd
[formerly a2318f04eea89a258400dea526daa4fe67b69271]
Former-commit-id: d0aeb854f5
2014-03-17 15:55:41 -05:00
Shawn.Hooper
6a8a1c397b
ASM #377 - Baseline National River Location Database fails
...
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae
Former-commit-id: 85db05e819
[formerly 5dcb5b019f389e64435b0283d95fe477032d88cc]
Former-commit-id: 670da1895b
2014-03-07 13:12:11 -05:00
Brad Gonzales
a24cbcfa77
Issue #2885 Updated all of the PDE builds to Java 1.7.
...
Change-Id: If74c5b163bc0742403fe701378bfae56b91bd49b
Former-commit-id: dea17a19da
[formerly 6d2a542774db6c37cfc2a65f490ebf618f2e7954]
Former-commit-id: 0e3dc17872
2014-03-06 16:29:37 -06:00
David Gillingham
607ce13c19
Issue #2783 : Rewrite run_report_alarm script into EDEX service.
...
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be
Former-commit-id: de12904c7a
[formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]
Former-commit-id: 32719432ff
2014-02-18 13:24:37 -06:00
Brian.Dyke
6b3ebc4fef
Issue #179
...
Former-commit-id: b23c6f59f7
[formerly d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9]
Former-commit-id: a0626cdc00
2014-02-04 16:53:34 -05:00