Steve Harris
66b485c000
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: bddf9c0f27
[formerly 793064063b
] [formerly 5d58625abc
[formerly 8793dca41f756ba812206b48391caea6e593a657]]
Former-commit-id: 5d58625abc
Former-commit-id: d984dd538f
2014-08-29 10:17:52 -05: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
Bryan Kowal
7b2661ba21
Omaha #3049 - entire data directory cannot be removed because it is mounted
...
The script does still verify that the variable reference to the data directory is set. Thus, the root
directory could only be removed as a result of malicious intent. A user could intentionally not
set the data directory and remove the verification check or the user could intentionally set the
data directory to the root location.
Former-commit-id: 429aec5855
[formerly 6a5deba786
] [formerly 604c5a4d10
[formerly efe867dc134027eb7cdf393473476fcc4ec0f6f8]]
Former-commit-id: 604c5a4d10
Former-commit-id: f767ff98e1
2014-08-13 16:59:26 -05:00
Bryan Kowal
c15190b7f6
Omaha #3475 - PostgreSQL Upgrade.
...
amend: vacuum databases after upgrade due to: http://www.postgresql.org/docs/9.3/static/release-9-3-2.html E.4.2 VACUUM tests
amend: update viz xdat to use the newer PostgreSQL jdbc driver
amend: fix formatting
Change-Id: Icda3348eea3e5edd879acb3a897bc530e73fb7f3
Former-commit-id: 3d68ae0c78
[formerly f6bc96829e
] [formerly a2be914331
[formerly 426a8c8863ea6be7d6795ace387c214ce3b36790]]
Former-commit-id: a2be914331
Former-commit-id: 0894026a79
2014-08-12 15:10:39 -05:00
Ron Anderson
5f8529b844
Issue #3498 Provide upgrade scripts for Topo file name in D2D procedures and saved displays
...
Change-Id: I2b4577c972c884af08d59d7815017806928efa69
Former-commit-id: 0654b75fb2
[formerly cd72d75216
] [formerly d3728fc462
[formerly bb204013345db535d7cf9ca103cb033cf2507def]]
Former-commit-id: d3728fc462
Former-commit-id: 0fddd4e268
2014-08-06 14:00:47 -05:00
Roger Ferrel
d751500485
Omaha #3318 split deltascript one for dx1 the other for dx2.
...
Change-Id: If230b4c1bb24b4d2d9b73b357019275534803691
Former-commit-id: 7208fc1f29
[formerly 8ea817f6d0
] [formerly 44029681c8
[formerly abbaca59ff431f420bc700ad11de3cda89f82277]]
Former-commit-id: 44029681c8
Former-commit-id: 37eb414dd0
2014-08-01 14:13:25 -05:00
Brian Clements
af8b704465
Omaha #3410 added data uri reformatting to lon lat precision change delta script
...
Change-Id: I3335e3d0f62b702845f26fe4ed408600debc20d6
Former-commit-id: d5a0586bf4
[formerly aa84d39ec5
] [formerly edb0244e9f
[formerly e3c680ad83d542beed195d3b1f983e122e6f21ec]]
Former-commit-id: edb0244e9f
Former-commit-id: 3b734fe71f
2014-07-31 14:14:17 -05:00
Brian Clements
5977b049c1
Omaha #3410 changed lon/lat fields to floats in sfc and air obs location
...
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af
Former-commit-id: a7d17bd490
[formerly aa991c9223
] [formerly 74a6c3dd20
[formerly cdb0a72fcb2345564f2b944fdecd7869fd498767]]
Former-commit-id: 74a6c3dd20
Former-commit-id: 10ea02b936
2014-07-24 13:45:58 -05:00
Nathan Bowler
0067bc04d3
Omaha #3392 Change Doubles to Float in ACARS and ACARSSoundingLayer
...
Change-Id: I6c07c51a3118d6317418a22be56b7899734e5917
Former-commit-id: 7d352f77a3
[formerly 06b9d253f3
] [formerly 4f3a729894
[formerly 9ac070996c42b004f3683d7ee253feb54f05264c]]
Former-commit-id: 4f3a729894
Former-commit-id: 085fe0e479
2014-07-22 14:05:16 -04:00
Steve Harris
611a8d3f1e
Omaha #3300 moving 15.1.1 deltascript back into 14.4.1
...
Former-commit-id: 17ec38ef34
[formerly b9a02bf34a
] [formerly 74fff3659f
[formerly 33cde5250c39fda59bbb08d7b8075cb5645c028f]]
Former-commit-id: 74fff3659f
Former-commit-id: 672709571d
2014-07-16 14:53:18 -05:00
Steve Harris
6920a273e5
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
Former-commit-id: a893b9b08a
[formerly 05de3fbe54
] [formerly a43ffbe052
[formerly 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3]]
Former-commit-id: a43ffbe052
Former-commit-id: 202c1a0316
2014-07-14 12:08:09 -05:00
Brian Clements
b52e7ef948
Omaha #2587 update script to set reftime as non null in db
...
Change-Id: Ibcfb61b607645fcbb91e793f2088c8fb7432ecf4
Former-commit-id: fbf4111d6c
[formerly 2a5af8ce1f
] [formerly faa29355b0
[formerly dfafe89ab5cb4589d2408564b82a03adc9fc1143]]
Former-commit-id: faa29355b0
Former-commit-id: ade89ff05d
2014-07-14 08:40:37 -05:00
Roger Ferrel
4449133a46
Omaha #3318 Delta script for GEFS h5 file updates
...
Former-commit-id: 577790589f
[formerly d007725e9a
] [formerly 9eaeb01624
[formerly 2e6eeaeac3018a34bf5a471f4ebcae58e608fbca]]
Former-commit-id: 9eaeb01624
Former-commit-id: ee1a95ceb1
2014-07-10 16:30:03 -05:00
Steve Harris
d7cd0ac02c
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: 97843cf58e
[formerly 9213369739
] [formerly e1c8ad2611
[formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]
Former-commit-id: e1c8ad2611
Former-commit-id: 362988b9d7
2014-06-16 08:19:12 -05:00
Ben Steffensmeier
4e3a8e97fe
Omaha #2061 Remove dataURI from acars.
...
Former-commit-id: 0a6e99e9d1
[formerly f66725a515
] [formerly 35ad2f2b8d
[formerly e8b5ea58ca12878922be01c815a354703f5f4387]]
Former-commit-id: 35ad2f2b8d
Former-commit-id: e227d408db
2014-06-12 13:59:45 -05:00
Roger Ferrel
c265741346
Omaha #2715 Script to move stats data to new location.
...
Former-commit-id: 7714c7c3ac
[formerly 29db287a6c
] [formerly b2b00bb763
[formerly 74f1e03a7d4458447fad552051af969d2ea71b5e]]
Former-commit-id: b2b00bb763
Former-commit-id: 9cf153caff
2014-06-11 08:58:12 -05:00
Brian Clements
77b1f85fe1
Omaha #3226 added total lightning decoder
...
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning
Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3
Former-commit-id: 2e445986e2
[formerly c278000764
] [formerly f39896b2d1
[formerly e2583481a77d08249030838ebd52eed6e54b2986]]
Former-commit-id: f39896b2d1
Former-commit-id: b98a3494fe
2014-06-06 14:39:57 -05:00
Chip Gobs
8edb6c28d8
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: a5c4402f34
[formerly 83ac596f9e
] [formerly 036d1c4d31
[formerly 6944361d04e7462f768bb74f00780dc8b8a51225]]
Former-commit-id: 036d1c4d31
Former-commit-id: 6fd88e5422
2014-06-05 13:37:02 -04:00
Steve Harris
373c816e6a
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: 647cd97e29
[formerly 7fec0d039c
] [formerly 455eb8b39d
[formerly 45250149681f057cf168f4d3cb27276279f62c05]]
Former-commit-id: 455eb8b39d
Former-commit-id: ec743199f1
2014-06-02 11:21:46 -05:00
Brian.Dyke
3961c75ecd
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: a0a879be7d
[formerly a8737e18f0
] [formerly 3f1e12effc
[formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]
Former-commit-id: 3f1e12effc
Former-commit-id: 66aacd6578
2014-05-30 10:46:25 -04:00
Nate Jensen
9804b35063
Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1
...
Former-commit-id: a709601e2f
[formerly 5cfbcb7e98
] [formerly c43a2bf217
[formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]
Former-commit-id: c43a2bf217
Former-commit-id: c1d092a55d
2014-05-29 13:51:09 -05:00
Brian Clements
5a52531828
Omaha #2536 merge autobldsrv into text plugins
...
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52
Former-commit-id: 4aade4bf2e
[formerly 5d0eaf02ab
] [formerly 542d36f107
[formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]
Former-commit-id: 542d36f107
Former-commit-id: fcadd3dae9
2014-05-29 08:19:47 -05:00
Steve Harris
0e9d0b2ef5
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: 718c78d984
[formerly be80bd01f3
] [formerly dc74953978
[formerly 802843fa475654ffab03545a4970f4e5857590cd]]
Former-commit-id: dc74953978
Former-commit-id: 713cfeffc7
2014-05-28 09:01:00 -05:00
Steve Harris
bfa4255eea
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: 3de24b7b07
[formerly 99bc6f990c
] [formerly 3b16bbafb1
[formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9b98b41cd4
2014-05-27 14:48:24 -04:00
Richard Peter
c799f78f5d
Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
...
Former-commit-id: 80a5f2fc1b
[formerly 40b7623c87
] [formerly 87da8bd952
[formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]]
Former-commit-id: 87da8bd952
Former-commit-id: 8baf897297
2014-05-19 16:07:51 -05:00
Richard Peter
e2954e54db
Issue #2060 : Consolidate grid indexes.
...
Change-Id: Ibc77133cd1b016ef85bae61e47e373a30e6e4d23
Former-commit-id: 50fb33488c
[formerly 62e215eb89
] [formerly 6143d43329
[formerly 892c0f28a13d53118141efe14762deebe169d7ba]]
Former-commit-id: 6143d43329
Former-commit-id: 32f7bd8735
2014-05-12 16:59:34 -05:00
Roger Ferrel
672875baf9
Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
...
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8
Former-commit-id: 6bfacf85ab
[formerly 039f4826ea
] [formerly c226ef3596
[formerly 909a3f42bdb9d8149013056f9956bf0c38b764c5]]
Former-commit-id: c226ef3596
Former-commit-id: ce1ca8b4e3
2014-05-09 09:34:49 -05:00
David Gillingham
800438edc0
Issue #3142 : Improve error-handling and logging in CleanupGfeHDF5Storage delta script.
...
Change-Id: I5c75cfb44654781a53f4588236f5d5d562432615
Former-commit-id: 720993104c
[formerly 9ebbf783df
] [formerly 29072aa824
[formerly 920999bda9dda329e71359ab46872130f45d298c]]
Former-commit-id: 29072aa824
Former-commit-id: 1769a52111
2014-05-08 16:51:41 -05:00
Mike Duff
f49192936a
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
...
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 0456fd0597
[formerly 8498235fd8
] [formerly 6a67638a94
[formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]
Former-commit-id: 6a67638a94
Former-commit-id: 70c8135fde
2014-05-08 14:36:54 -05:00
Chip Gobs
c075175e8e
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: 4e4d00792d
[formerly 65d2135ac2
] [formerly e42bef2a33
[formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]
Former-commit-id: e42bef2a33
Former-commit-id: 593b36d722
2014-05-06 10:48:35 -04:00
Nate Jensen
037fe502d7
Merge "Issue #2854 : Reorganize deltaScripts" into omaha_14.3.1
...
Former-commit-id: 1d157a16e3
[formerly 7fbdb9ff83
] [formerly bcb82bedc6
[formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]
Former-commit-id: bcb82bedc6
Former-commit-id: e5eb1ab87e
2014-05-01 12:06:13 -05:00
Dave Hladky
bc4067c5d8
Issue #2992 Missed perl script
...
Former-commit-id: 9a43ac36e6
[formerly 23433f628d
] [formerly 904a608495
[formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]
Former-commit-id: 904a608495
Former-commit-id: dbe4f68100
2014-05-01 08:48:38 -05:00
Dave Hladky
ea791b5ca5
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: e2a4bb6755
[formerly c352643c79
] [formerly 3b00ae03cc
[formerly a34955102d1316135c4151210daba0e5807ff6c9]]
Former-commit-id: 3b00ae03cc
Former-commit-id: bf42c8d740
2014-04-30 17:38:28 -05:00
Richard Peter
a526600e3e
Issue #2854 : Reorganize deltaScripts
...
Former-commit-id: 09f41a6b31
[formerly 56745c942e
] [formerly c8e373c098
[formerly 469c2c597b80fd725f474e0d645656e4054fd69a]]
Former-commit-id: c8e373c098
Former-commit-id: e1721cad00
2014-04-30 13:03:44 -05: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
Brian Clements
421461fbd8
Issue #3079 update to lightning name will continue if it encounters invalid xml
...
Former-commit-id: afdae7c2e1
[formerly 3305aee692
] [formerly 98adf15cda
[formerly 07e7a0eaa6973a705d5fff1beb8ebcb553c172d0]]
Former-commit-id: 98adf15cda
Former-commit-id: 5ca56d292a
2014-04-25 11:04:00 -05:00
Brian.Dyke
bf3758efa3
Merge branch 'master_14.2.2' into master_14.3.1
...
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
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
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: f0b8ea5822
[formerly fb1f5aa593
] [formerly 3524838f9f
[formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: 3524838f9f
Former-commit-id: 029f5753ad
2014-04-25 11:06:11 -04:00
Nate Jensen
e99f8ba4b4
Issue #2060 fix delta script to only drop dataURI if the constraint
...
alterations work
Change-Id: I5ad70fd87b72ebb3566aa99d7c603b2b122be5e8
Former-commit-id: d276d5f39b
[formerly 43b44d911a
] [formerly 0b4df56454
[formerly 6f8459f03a5af0816f93b0a20e861aafe5a9a779]]
Former-commit-id: 0b4df56454
Former-commit-id: 16d60c361a
2014-04-23 12:05:20 -05:00
Nate Jensen
3eddbf452d
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 263611f905
[formerly a37a2afe18
] [formerly 5dfb652775
[formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]]
Former-commit-id: 5dfb652775
Former-commit-id: cdb932cc4d
2014-04-21 17:34:39 -05:00
Nate Jensen
4648e4b9b8
Merge "Issue #2725 Adding user/site derivparam migrate script" into development
...
Former-commit-id: a2db252625
[formerly fc4d9a79ce
] [formerly 9ad6b06ac9
[formerly ea7a0b963bf90c657c574fb40e67e54c1f33c203]]
Former-commit-id: 9ad6b06ac9
Former-commit-id: 65fda3c736
2014-04-14 08:59:21 -05:00
Mike Duff
dc2a5b0c6f
Issue #2864 - Change how saved subset files are stored.
...
Change-Id: I57c68196a633a55a6f9c1548eff7ad449fadb88c
Former-commit-id: a58f279b54
[formerly 82cf444d6f
] [formerly 890faf2d73
[formerly 3052e5f92f4150fa82bfd93f512bb1670f926ec1]]
Former-commit-id: 890faf2d73
Former-commit-id: 6d8bead4a7
2014-04-11 08:27:42 -05:00
Everett Kladstrup
8a449daa8d
Issue #2725 Adding user/site derivparam migrate script
...
Former-commit-id: 0f9228c686
[formerly b4e353332b
] [formerly a0edd808b0
[formerly 8c37f0716051384e6364ffa30a6dd0a4649fb96b]]
Former-commit-id: a0edd808b0
Former-commit-id: fcca67d5ee
2014-04-10 17:15:44 -05:00
Dave Hladky
b202d62214
Issue #2949 Updated scripts
...
Change-Id: I36f39d59e8aa1abc8cefd5ed100cbfd70eedaa80
Former-commit-id: 41e43a169b
[formerly 3d6ebf498e
] [formerly ede510dd91
[formerly afcfc72329522c2d731a4afe9353632effb9cb23]]
Former-commit-id: ede510dd91
Former-commit-id: be18d1f63c
2014-04-01 12:33:48 -05:00
Brian Clements
bf67bd0a33
Issue #2667 delta scripts for lightning source name change in xml files
...
handles stored procedures/bundles in localization
Former-commit-id: cc50637346
[formerly 0811b0580f
] [formerly ddcb1011bb
[formerly 8e3e3be372d5db6dfc5897407074bc250fbef294]]
Former-commit-id: ddcb1011bb
Former-commit-id: 0292707f9d
2014-03-03 16:30:45 -06:00
Steve Harris
4a379aa6e5
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml
Former-commit-id: ae2b849157
[formerly 7a156e297a
] [formerly 7b59bd41eb
[formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]
Former-commit-id: 7b59bd41eb
Former-commit-id: aa9b488963
2014-02-03 10:29:16 -06:00
Nate Jensen
af0ac40f47
Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN
...
events while in there
Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619
Former-commit-id: c18e66cc45
[formerly 327c588c9e
] [formerly 906c679b4e
[formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]
Former-commit-id: 906c679b4e
Former-commit-id: 7bd1d802be
2014-01-30 12:02:42 -06:00
Brian Clements
cfe945d76b
Issue #2701 removed local groups from collaboration
...
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group
Former-commit-id: b86ad8ca6f
[formerly f615f2226f
] [formerly 26ac549096
[formerly 06a9db4836fa2753a913e2314a8c003380416eac]]
Former-commit-id: 26ac549096
Former-commit-id: 8944860cbb
2014-01-27 10:14:10 -06:00
Brian Clements
265137fd91
Issue #2667 added bin lightning data access factory
...
renamed lightning record's lightSource field to source
added delta script for db column change
added attribute method comments for IData and DefaultGeometryData
Former-commit-id: 54516275f1
[formerly 402bef9c5b
] [formerly bd9fbc5f38
[formerly b6c50729919ea8a9b29ca963e18f68268c3a0b7f]]
Former-commit-id: bd9fbc5f38
Former-commit-id: 83ed9dc04d
2014-01-23 09:32:18 -06:00
Nate Jensen
d4236a7fc0
Issue #2581 fix local storm report delta script and unique constraint
...
Change-Id: I421aed1572c10c80a592381c849d85eac8d1e809
Former-commit-id: 562e85e45b
[formerly e6feb413f7
] [formerly 059e057cdb
[formerly 88918268a6d72d35dd2f19be09fbb429851fe46b]]
Former-commit-id: 059e057cdb
Former-commit-id: bc2f099cc6
2014-01-15 09:50:35 -06:00
Ben Steffensmeier
9913e51429
Issue #2537 Split modelsounding into common/edex plugins.
...
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8
Former-commit-id: f516a684d4
[formerly f520a26fbd
] [formerly d79f804d4e
[formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]
Former-commit-id: d79f804d4e
Former-commit-id: fac9fd296f
2014-01-06 16:02:59 -06:00