Commit graph

2457 commits

Author SHA1 Message Date
Dustin Johnson
c5685dbe9f Issue #1827 Create registry/datadelivery client features
Amend: Add event plugins and their dependencies to client features

Change-Id: Ib80522161740857d4332b84bbedad10e19683602

Former-commit-id: 52c27ec57f [formerly 52c27ec57f [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]
Former-commit-id: 1684507bdb
Former-commit-id: f27ebfbc1b
2013-03-27 15:38:36 -05:00
Roger Ferrel
d504643687 Issue #1790 Fix dialog in current phase.
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b

Former-commit-id: d69674d595 [formerly d69674d595 [formerly 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54]]
Former-commit-id: 1093c020e6
Former-commit-id: 68ba7cab75
2013-03-27 14:11:36 -05:00
Ben Steffensmeier
b621850bc6 Issue #1821 Speed up GridInfoCache.
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40

Former-commit-id: 2a13abd32c [formerly 2a13abd32c [formerly fde9f936e53a998f8cde174935d00287e6aaf70c]]
Former-commit-id: 6f525a81b4
Former-commit-id: 72724108b7
2013-03-27 13:21:33 -05:00
Nate Jensen
9c7466b8e9 Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
Former-commit-id: faf937d3b0 [formerly faf937d3b0 [formerly 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac]]
Former-commit-id: f8e5534417
Former-commit-id: a7548df695
2013-03-27 11:32:19 -05:00
Ron Anderson
3fbeeadef3 Merge "Issue #1833: Add performance log file to ingest and ingestGrib" into omaha_13.3.1
Former-commit-id: 841a69ed59 [formerly 841a69ed59 [formerly 9b35437ccfecaf70470a9a96fbc3acacd7cf1405]]
Former-commit-id: 33d78bc7ee
Former-commit-id: 6a393ee4f9
2013-03-27 11:22:48 -05:00
Nate Jensen
329a106ef3 Merge "Issue #1832 fix getNumPy() error handling" into omaha_13.3.1
Former-commit-id: dd3601a873 [formerly dd3601a873 [formerly f1cabae64e37120f27235ec44b4bd7a1921fe621]]
Former-commit-id: aaf2d7bc2a
Former-commit-id: da024a1044
2013-03-27 11:16:56 -05:00
Mike Duff
16f03eb52c Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa

Former-commit-id: 1958700112 [formerly 1958700112 [formerly 5304de6fff49f3db7a3b46427077c7d2d9c0b3f9]]
Former-commit-id: 302dbf2cfb
Former-commit-id: 3d1c1b146c
2013-03-27 10:38:59 -05:00
Richard Peter
33c602b13e Issue #1833: Add performance log file to ingest and ingestGrib
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d

Former-commit-id: 5287a3296b [formerly 5287a3296b [formerly 53cb92842c43349968b70bb5fec5beb100773b63]]
Former-commit-id: b75ceeeeb3
Former-commit-id: f99242f539
2013-03-26 20:55:42 -05:00
Nate Jensen
d1d647a778 Issue #1832 fix getNumPy() error handling
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405

Former-commit-id: e4cdfe0ca9 [formerly e4cdfe0ca9 [formerly ce7e89b8300580a57a5c133a78e8c84e2cb7449e]]
Former-commit-id: 74b21dc1b4
Former-commit-id: 494a673c37
2013-03-26 18:30:19 -05:00
Nate Jensen
9353bd7d8b Merge "Issue #1735 Performance improvments for LLWSData." into development
Former-commit-id: ff7631d847 [formerly ff7631d847 [formerly 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa]]
Former-commit-id: b44db0bc2c
Former-commit-id: 314c5dcb2e
2013-03-26 16:28:38 -05:00
Nate Jensen
79fddbcbf5 Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
Former-commit-id: f3fd91c311 [formerly f3fd91c311 [formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]
Former-commit-id: c895ee60fa
Former-commit-id: 5701030750
2013-03-26 16:15:27 -05:00
Richard Peter
047c3d0e37 Merge "Issue #1828 Fix intlsigmets and text pattern." into omaha_13.3.1
Former-commit-id: fa7fb4765f [formerly fa7fb4765f [formerly e9a9cbc4b3c20dce7dc39837c9aab4ae5ef6e01a]]
Former-commit-id: cbf915093f
Former-commit-id: f941b97c06
2013-03-26 15:33:33 -05:00
Lee Venable
f0ed70f9fb Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
Former-commit-id: 1a59204892 [formerly 1a59204892 [formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]
Former-commit-id: 049e955db9
Former-commit-id: f8d2fdacea
2013-03-26 15:01:51 -05:00
Roger Ferrel
8cdcee0ec5 Issue #1828 Fix intlsigmets and text pattern.
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0

Former-commit-id: 19074d3053 [formerly 19074d3053 [formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]
Former-commit-id: 74389834de
Former-commit-id: 4c5aa32169
2013-03-26 14:47:48 -05:00
Ben Steffensmeier
b76bdc602d Issue #1791 Fix problems in SmartScript when there is no data.
Former-commit-id: 6870045005 [formerly 6870045005 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]
Former-commit-id: 18311b0d18
Former-commit-id: 69879c51df
2013-03-26 14:46:11 -05:00
Lee Venable
ea68209a19 Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
Former-commit-id: c86daf885b [formerly c86daf885b [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]
Former-commit-id: c1adce3a11
Former-commit-id: 393e6d9ca1
2013-03-26 14:33:24 -05:00
Richard Peter
109b578382 Merge "Issue #1783: Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
Former-commit-id: b947a52604 [formerly b947a52604 [formerly b1acf59c03ab308b86843a314d4795f6392de844]]
Former-commit-id: 7ee513dfed
Former-commit-id: 45a2f3f3dd
2013-03-26 12:59:47 -05:00
Steve Harris
fdd07bd72c Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 5fcfaf4360 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]
Former-commit-id: 65df96a419
Former-commit-id: 346b97a39a
2013-03-26 12:47:40 -05:00
Steve Harris
779adedea9 Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: e71c69c383 [formerly e71c69c383 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]
Former-commit-id: 9ff8a94193
Former-commit-id: b926ff60b3
2013-03-26 12:44:24 -05:00
Steve Harris
7aa4f7b265 13.3.1-13 baseline
Former-commit-id: c77a452f5a [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c65f3e68e5
Former-commit-id: 822d05a709
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
cc64195d47 Issue #1819 Added precision fields for point source configuration.
Former-commit-id: 79d87a96e7 [formerly 79d87a96e7 [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]
Former-commit-id: b0f61cf86c
Former-commit-id: eb13af2f50
2013-03-26 12:29:18 -05:00
Steve Harris
74c886b604 Merge "Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
Former-commit-id: 1f28f6b807 [formerly 1f28f6b807 [formerly b59167da8d42b23fadd19eb8f186d992a5c68bdd]]
Former-commit-id: 305994e220
Former-commit-id: b1071636a7
2013-03-26 12:27:54 -05:00
David Gillingham
9dd92e0fd2 Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb

Former-commit-id: c5c7e31983 [formerly c5c7e31983 [formerly 497aa460d6119f13bf6870b78454237252b68752]]
Former-commit-id: 54511a95db
Former-commit-id: 6188c8bd40
2013-03-26 12:14:22 -05:00
Ben Steffensmeier
3dbd9580c5 Issue #1782 fix merge problems related to graphics API.
Former-commit-id: 2b898e58c7 [formerly 2b898e58c7 [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]
Former-commit-id: 6edee13cdd
Former-commit-id: 76a6213807
2013-03-26 12:06:45 -05:00
Ben Steffensmeier
69068bbf3a Issue #1799 Fix pan/zoom when in views.
Former-commit-id: 643c1c77d0 [formerly 643c1c77d0 [formerly 2061956526bdc3da43280e6c829de1deb0a098ba]]
Former-commit-id: 78fdea2ba1
Former-commit-id: 5a1171f111
2013-03-26 11:44:23 -05:00
Richard Peter
2a10b44398 Issue #1783: Update DatabaseArchiver to stream deserialization of previous records
Change-Id: Icb1e2721bcddeb93c7c06983bba117c75b0edd44

Former-commit-id: f3844dd2fb [formerly f3844dd2fb [formerly f4e67b7b1b41af66436cae5e6f7f61bbf02fb534]]
Former-commit-id: 69ffe80046
Former-commit-id: 643ac75965
2013-03-26 11:40:24 -05:00
Ron Anderson
160779e86f Merge "Issue #1823: Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
Former-commit-id: 57c919bc7b [formerly 57c919bc7b [formerly 735c64e77a704ceae7f1a025c9cfc442f48f207e]]
Former-commit-id: f65989454a
Former-commit-id: 510b090090
2013-03-26 11:33:15 -05:00
Richard Peter
323d0f69a6 Merge "Issue #1750 - include the qpidd service script in the rpm installations" into development
Former-commit-id: 0f15b13b86 [formerly 0f15b13b86 [formerly 6c2e1cc597e14997f59c52c344ca7558139f2333]]
Former-commit-id: f062e43f8c
Former-commit-id: 02ecf31edb
2013-03-26 10:53:50 -05:00
Ben Steffensmeier
1ef06166db Issue #1821 Optimize FFG version query.
Former-commit-id: 3049bc94c9 [formerly 3049bc94c9 [formerly 6d75a1b79cfd46de69db2d3cb452711f3ea1254d]]
Former-commit-id: 7bde9f6d32
Former-commit-id: 39259b1b0b
2013-03-26 10:37:40 -05:00
David Gillingham
45bf26aa00 Issue #1823: Trigger SAT smart inits based only on sector id and physical element.
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79

Former-commit-id: 1df8d39919 [formerly 1df8d39919 [formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]
Former-commit-id: bebfc60317
Former-commit-id: 07487a27dc
2013-03-26 10:33:42 -05:00
Steve Harris
e6ab1deba2 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: fd71e44f0f [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]
Former-commit-id: a23cecdb26
Former-commit-id: e96e95b565
2013-03-26 10:12:34 -05:00
Mike Duff
efec4d0365 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.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/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: 5d72795e1b [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 4c3011edce
2013-03-26 09:19:39 -05:00
Ron Anderson
60c1c27225 Merge "Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
Former-commit-id: f4f180face [formerly f4f180face [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]
Former-commit-id: 73678261b6
Former-commit-id: 7e6b601a09
2013-03-25 17:53:46 -05:00
Lee Venable
b329abb111 Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1
Former-commit-id: e467daec0c [formerly e467daec0c [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]
Former-commit-id: 05b4c2f913
Former-commit-id: d73b44fa67
2013-03-25 17:20:25 -05:00
Lee Venable
78c361f7a8 Merge "Issue #1781 - Constrain the tabular TS query by time." into omaha_13.3.1
Former-commit-id: 74188d09ad [formerly 74188d09ad [formerly f0ed09e300f81dcf425df64aefcd33b670b7bdd5]]
Former-commit-id: d10f1c818d
Former-commit-id: a444924a18
2013-03-25 17:02:06 -05:00
Bryan Kowal
01d571a088 Issue #1750 - include the qpidd service script in the rpm installations
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: c3936dd50e [formerly c3936dd50e [formerly c96c45074c220140b8774e1fceeab2b79820f033]]
Former-commit-id: 21fa510eaa
Former-commit-id: db39a45c88
2013-03-25 16:52:33 -05:00
Mike Duff
9a9d8f0503 Issue #1781 - Constrain the tabular TS query by time.
Change-Id: I648913c157585283cdc96793d18d36933589b3e9

Former-commit-id: afd0de8b5b [formerly afd0de8b5b [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]
Former-commit-id: 88e75f4a90
Former-commit-id: b517ce9a9f
2013-03-25 16:03:18 -05:00
Roger Ferrel
7259166afe Issue #1735 Performance improvments for LLWSData.
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f

Former-commit-id: feadd01ad9 [formerly feadd01ad9 [formerly 0c067f6bd45f0474708af1715278d21a2a963868]]
Former-commit-id: 549650c05c
Former-commit-id: daecc7b7f4
2013-03-25 15:41:01 -05:00
Max Schenkelberg
237c742d44 Issue #1638 Made Map scales more generalized for use outside of D2D
Amend: Added generalization to JaxbManager

Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a

Former-commit-id: fd375314cd [formerly fd375314cd [formerly 1e5812d9796a77559d70392be18619a8f7316f2d]]
Former-commit-id: e17d691400
Former-commit-id: 36e80c267e
2013-03-25 15:38:36 -05:00
Richard Peter
bcb5b0b73e Merge "Issue #1802 Refactored DD transaction management" into development
Former-commit-id: c3268aa02c [formerly c3268aa02c [formerly b8516f99386ded052745e766911094edfd57d7ec]]
Former-commit-id: 5c92140024
Former-commit-id: 351f08dba3
2013-03-25 15:37:18 -05:00
Bryan Kowal
e41f926ac2 Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: 9e647beded [formerly 9e647beded [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]
Former-commit-id: 6758a9a50d
Former-commit-id: 4c02dabb3d
2013-03-25 15:23:32 -05:00
Bryan Kowal
99a3e25b3d Issue #1661 - yajsw will now log to both the console and log file indefinitely
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: c55efaadb0 [formerly c55efaadb0 [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]
Former-commit-id: a6cd17feeb
Former-commit-id: c4cec34e47
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
c250bda12b Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: b10b1150be [formerly b10b1150be [formerly 534777d96a45b275abd9cc26818b7df200974595]]
Former-commit-id: af05feb5a7
Former-commit-id: 4d1a8805ab
2013-03-25 15:15:38 -05:00
Ben Steffensmeier
c48c98266d Issue #1821 Reshape grib data arrays in place to improve performance.
Former-commit-id: 4621133ff1 [formerly 4621133ff1 [formerly 30354883c5dff0fdbf196e7f405525451df1e81e]]
Former-commit-id: 75c8d46901
Former-commit-id: 04028b0136
2013-03-25 15:09:23 -05:00
Ben Steffensmeier
35ecc7cbd2 Issue #1821 Make grib2 decoding more multithreaded
Former-commit-id: f824e298b6 [formerly f824e298b6 [formerly 4441b32d3ec153a2cf767b8e109c014f9efc3ed8]]
Former-commit-id: cf7d8378dd
Former-commit-id: f61630599f
2013-03-25 14:48:42 -05:00
Richard Peter
fecf49708c Merge "Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development
Former-commit-id: 7b8931ed16 [formerly 7b8931ed16 [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]]
Former-commit-id: 3239c176fa
Former-commit-id: 911a371329
2013-03-25 14:45:06 -05:00
Jonathan Sanchez
dad851857d Issue #1605 Check if storm location is over an urban bound area.
Former-commit-id: 06cd161d0e [formerly 06cd161d0e [formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]
Former-commit-id: ddcb4f3451
Former-commit-id: c9295e6762
2013-03-25 14:41:55 -05:00
Lee Venable
cc0debe027 Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1
Former-commit-id: 25cf1cacfd [formerly 25cf1cacfd [formerly 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903]]
Former-commit-id: d1c84de620
Former-commit-id: fc41aa82ca
2013-03-25 14:08:39 -05:00
Steve Harris
f1d156779a 13.3.1-12 baseline
Former-commit-id: 0be473728a [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
2013-03-25 13:27:13 -05:00
Steve Harris
b5e3a7dda6 13.3.1-11 baseline
Former-commit-id: 9cdd90e382 [formerly 9cdd90e382 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]
Former-commit-id: 373d13df39
Former-commit-id: d868003067
2013-03-25 13:20:03 -05:00