xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4542 commits 31 branches 40 tags 3.8 GiB
Commit graph

2540 commits

Author SHA1 Message Date
Richard Peter
b0e694483f Merge branch 'development_on_RHEL5' (GOES-R) into development 
Conflicts:
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
	nativeLib/edexBridge/edexBridge.cpp
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: f5f75ec629 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]
Former-commit-id: e82e1137f9
Former-commit-id: 94994868fa
 2013-12-03 16:25:31 -06:00
Jonathan Sanchez
e0b5d6f75d Issue #2576 Increased the font size of EMER. 
Change-Id: Ic6994ce60611b2af76bdee153daffe328e556ef1

Former-commit-id: 88f7b75df4 [formerly 88f7b75df4 [formerly 15cdd4c1fdb336416a4cc320731d5ecbbb0db6f6]]
Former-commit-id: eeb3b0173b
Former-commit-id: dc4b8ec40f
 2013-12-03 13:00:47 -06:00
Nate Jensen
57d1764c46 Merge "Issue #2573 safer and faster progressive disclosure" into development 
Former-commit-id: ece38c85c0 [formerly ece38c85c0 [formerly 2be1427cdcd61d47a5463f6e4e85910200fda931]]
Former-commit-id: 2daf0f2691
Former-commit-id: a5cf904e1f
 2013-12-03 09:41:02 -06:00
Nate Jensen
ecd87941e6 Issue #2573 safer and faster progressive disclosure 
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: 622cc1b223 [formerly 622cc1b223 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]
Former-commit-id: 90d6b5bd74
Former-commit-id: e40c71acd1
 2013-12-02 17:28:09 -06:00
Steve Harris
2e47683d4a Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: 65d5f13864 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]
Former-commit-id: b98eb9ffa4
Former-commit-id: 6539b80ded
 2013-12-02 16:17:38 -06:00
Steve Harris
f88a635a58 14.1.1-11 baseline 
Former-commit-id: 70a6f1936e [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]
Former-commit-id: 71ae71c850
Former-commit-id: 5526a8999d
 2013-12-02 17:10:10 -05:00
Slav Korolev
20793f8784 Issue #2387. Added system status refresh. 
Former-commit-id: 1be43bc76c [formerly 1be43bc76c [formerly f3530467b1845a488fa0996ee7100a2dc145394a]]
Former-commit-id: f7f00b77d0
Former-commit-id: 5e225387fd
 2013-12-02 16:14:45 -05:00
Ben Steffensmeier
8c386a2aac Issue #2537 point data code cleanup. 
Former-commit-id: a4e3a4a03b [formerly a4e3a4a03b [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]
Former-commit-id: 7889c14b35
Former-commit-id: 62ca7b1df6
 2013-11-26 15:16:54 -06:00
Ben Steffensmeier
a3f5fcabf6 Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images 
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: 927801985a [formerly 927801985a [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]
Former-commit-id: 3696896b49
Former-commit-id: 70ca78c7b5
 2013-11-25 11:31:57 -06:00
Richard Peter
91fcef9d3f Merge "Issue #2532 Fix grid displays of grids larger than the world." into development 
Former-commit-id: b26e562845 [formerly b26e562845 [formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]
Former-commit-id: be7c2ef08e
Former-commit-id: c51cc4bf17
 2013-11-22 12:38:05 -06:00
Nate Jensen
54c2d1e420 Merge "Issue #2361 fix style manager's jaxb context" into development 
Former-commit-id: 9de7c7f434 [formerly 9de7c7f434 [formerly 0b018d8cd8f9738eb11897f07a83a5e370dcbcac]]
Former-commit-id: 49ce4d4be3
Former-commit-id: 6ab6de4419
 2013-11-22 10:08:13 -06:00
Nate Jensen
b6748206e5 Issue #2361 fix style manager's jaxb context 
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68

Former-commit-id: 16329ab06b [formerly 16329ab06b [formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]]
Former-commit-id: 328991e577
Former-commit-id: ebc3efdf80
 2013-11-22 09:15:24 -06:00
Dave Hladky
54af53ffb4 Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display 
Former-commit-id: 04c7e2cffc [formerly 04c7e2cffc [formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]
Former-commit-id: a9a3973319
Former-commit-id: ebd6d5cbe1
 2013-11-21 14:46:47 -06:00
Nate Jensen
a5469c1d9e Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development 
Former-commit-id: ddb0eaf0ff [formerly ddb0eaf0ff [formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]]
Former-commit-id: d851e6fc97
Former-commit-id: f60948fc36
 2013-11-21 10:12:11 -06:00
Nate Jensen
19b467c208 Issue #2033 fix plots working with multiple plotModels dirs contributed 
by different plugins

Change-Id: I2d1ff75c62395ead5154398002610401faa4388d

Former-commit-id: 9371c63c41 [formerly 9371c63c41 [formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]]
Former-commit-id: 2b6799712d
Former-commit-id: 3e88de72dc
 2013-11-20 17:33:53 -06:00
Ron Anderson
a731f80011 Issue #2488 Change to use DejaVu fonts 
Change-Id: I82f4b93f340bca0e6dfa4f9c14a9890644c9f224

Former-commit-id: d72119409e [formerly d72119409e [formerly 396cd96c02521a33c65fa9e447275307c2d6168c]]
Former-commit-id: 633137d8c0
Former-commit-id: f6b9e69738
 2013-11-20 13:43:25 -06:00
Ben Steffensmeier
1bc4453a8d Issue #2532 Fix grid displays of grids larger than the world. 
Former-commit-id: d3ed1ba356 [formerly d3ed1ba356 [formerly e607da0bb204d61cbc998595f52406605c1953e0]]
Former-commit-id: 41753c40b5
Former-commit-id: 07743c4369
 2013-11-20 11:11:03 -06:00
Brian Clements
2e4dc2000e Issue #2393 removed pypies interpolation 
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code


Former-commit-id: fe58826a1e [formerly fe58826a1e [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]]
Former-commit-id: 0f40ae2b99
Former-commit-id: b762864f88
 2013-11-20 08:40:12 -06:00
Steve Harris
36d788890a 14.1.1-10 baseline 
Former-commit-id: ca0f65bd9a [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]
Former-commit-id: 9248695a1f
Former-commit-id: ef6e0b0304
 2013-11-19 16:40:25 -05:00
Lee Venable
d3b12f6973 Merge "Issue #1531 - Made bandwidth utilization graph resizable." into development 
Former-commit-id: f8f0a0e41e [formerly f8f0a0e41e [formerly 6d5026a25af31f0ae8c29d1036d9358366550f75]]
Former-commit-id: d42c36f365
Former-commit-id: da5cfb3d8e
 2013-11-19 15:12:38 -06:00
Nate Jensen
ac93e07973 Merge "Issue #2361 don't initialize derived parameters on shutdown" into development 
Former-commit-id: c6d6b07e3f [formerly c6d6b07e3f [formerly 4ae0820b630f25bda177572ffe77fbea52b4fd82]]
Former-commit-id: a610825ef9
Former-commit-id: 04de350ae7
 2013-11-19 14:11:01 -06:00
Nate Jensen
cf87d1c335 Issue #2361 don't initialize derived parameters on shutdown 
Change-Id: I0f735d9843d87aaef593cf6df8c9fdad03cd9583

Former-commit-id: c90a7d7b3c [formerly c90a7d7b3c [formerly 13cc948c57d52261c700157f8e86b6e6c75b4fe1]]
Former-commit-id: 5aee685557
Former-commit-id: e9adf706ba
 2013-11-19 12:59:10 -06:00
Mike Duff
fcc96787c3 Issue #1531 - Made bandwidth utilization graph resizable. 
Change-Id: I31752b94cd4a53aa08270e75a6adb8a70199b475

Former-commit-id: ed73a7e55a [formerly ed73a7e55a [formerly d6de10ca2c0609899bdb1f4c5f3de22a62d58998]]
Former-commit-id: 71093a685e
Former-commit-id: 437df90354
 2013-11-19 12:51:06 -06:00
Mike Duff
d254f954c4 Issue #2458 - Fixed product browser for DD so only active subs from local site are displayed 
Change-Id: I271a325fc0720070716d3d51ac606350d952b7e2

Former-commit-id: c908647259 [formerly c908647259 [formerly cacc7a8560c589b24ea98191f152c31479c5631e]]
Former-commit-id: 665d9e7651
Former-commit-id: 5afa90b967
 2013-11-19 08:55:27 -06:00
Nate Jensen
a5abd4dad0 Merge "Issue #2543 fix gl buffer formating problems Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc" into development 
Former-commit-id: edf51dffc9 [formerly edf51dffc9 [formerly b6420738e49d37840789c88089ecc8bab1103284]]
Former-commit-id: 3d51d80170
Former-commit-id: f07f543cd3
 2013-11-18 12:50:38 -06:00
Nate Jensen
b6fe32de06 Merge "Issue #2544 Fix recycling issues with Satellite resources." into development 
Former-commit-id: 0dbe79344a [formerly 0dbe79344a [formerly 3a4eb4f997dd19469e88cff0f873bf7647793b2d]]
Former-commit-id: 827b7f5a93
Former-commit-id: 6900d4e47f
 2013-11-18 12:50:19 -06:00
Ben Steffensmeier
9bd35b793d Issue #2543 fix gl buffer formating problems 
Change-Id: I305dfb7eadcf69b47d56e3f937abd8c2aa0edfdc

Former-commit-id: 105e3e359a [formerly 105e3e359a [formerly fe32d4ed93b583f0363b39edeb5b715bbe465dd8]]
Former-commit-id: e7a068e595
Former-commit-id: e605758e57
 2013-11-18 11:51:51 -06:00
Ben Steffensmeier
55f26e277f Issue #2544 Fix recycling issues with Satellite resources. 
Former-commit-id: e392185d78 [formerly e392185d78 [formerly 166957a22c3447fa2407b13362eece24943675c9]]
Former-commit-id: 9ff1751f4e
Former-commit-id: 1875f56695
 2013-11-18 11:44:56 -06:00
Nate Jensen
951c1ff2f3 Merge "Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE startup" into development 
Former-commit-id: 4f47800cae [formerly 4f47800cae [formerly c27baf85e0eaf7f6dd6f2d36d19243ae37dc0dac]]
Former-commit-id: 0146ae59df
Former-commit-id: a238ba2ba3
 2013-11-18 11:39:12 -06:00
Steve Harris
c26818afe6 Merge branch 'omaha_14.1.1' (14.1.1-9) into development 
Conflicts:
	cots/org.jep.linux32/libjep.so
	cots/org.jep.linux64/libjep.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
      (took all the omaha_14.1.1 versions)

Former-commit-id: 0a36987a01 [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 869b505f80
 2013-11-15 13:15:25 -06:00
Steve Harris
ea382798b5 14.1.1-9 baseline 
Former-commit-id: f8f995b697 [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 8c136f202d
 2013-11-15 12:47:49 -05:00
Nate Jensen
f2c777ff48 Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE 
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: dd99aa3f47 [formerly dd99aa3f47 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]]
Former-commit-id: 78b01f61c4
Former-commit-id: d96cdbe761
 2013-11-14 17:41:24 -06:00
Mike Duff
0f2626f79f Issue #2548 - fix malformed comment 
Change-Id: I365f5311fe28e0cbbf0dd94dcc88fd723f4f4034

Former-commit-id: 414cb1cf68 [formerly 414cb1cf68 [formerly 52462f299735aacee3db09faa6db9f28ba91f552]]
Former-commit-id: 95fda38cc5
Former-commit-id: 7be43c4a52
 2013-11-14 17:30:55 -06:00
Richard Peter
38d2c6564a Merge "Issue #2548 - Add a subscription type slot for uniqueness." into development 
Former-commit-id: 14b1e924a1 [formerly 14b1e924a1 [formerly dba301df2f593baa951c14b684e7ce4794e32019]]
Former-commit-id: 0bb5e2a61e
Former-commit-id: 1a7dd7723b
 2013-11-14 17:21:48 -06:00
Brian Clements
e7c355df52 Issue #2361 fixed ncwf hibernate pickup 
the new way of finding hibernate classes requires project names to match package names
fixed ncwf to have matching package and project names


Former-commit-id: cacdf313c5 [formerly cacdf313c5 [formerly 4924917e28275d9bb8bb21feceb6016ce2c91c40]]
Former-commit-id: 00490c2db2
Former-commit-id: ab24330f23
 2013-11-14 17:12:02 -06:00
Mike Duff
5fdf101af6 Issue #2548 - Add a subscription type slot for uniqueness. 
Change-Id: I5cf04bde4a345606af72bf2091e423dd6aa555aa

Former-commit-id: 47011a70db [formerly 47011a70db [formerly 1ad7f83443c33f8b73d2ad8a9b2f574fd37db9e2]]
Former-commit-id: 47a0477587
Former-commit-id: b929b7aa02
 2013-11-14 17:07:54 -06:00
Nate Jensen
7ec18ba0b1 Merge "Issue #2361 remove StyleManager's use of SerializationUtil and ISerializableObject" into development 
Former-commit-id: b4bcd14a85 [formerly b4bcd14a85 [formerly f4d52a5312ba3352c99eb6a51f9ebf71d4ff0356]]
Former-commit-id: c2aacfc437
Former-commit-id: a8a1e396fe
 2013-11-14 16:34:28 -06:00
Richard Peter
e7d8e5e560 Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 8fb79e7b73 [formerly 8fb79e7b73 [formerly 13d284277bed2f0f731547ec443a262556df997c]]
Former-commit-id: c42f931118
Former-commit-id: 2b95bcfb31
 2013-11-14 14:56:59 -06:00
Mike Duff
cf077ed7f9 Issue #2538 - Check for existing adhoc queries in registry. 
Peer review comments

Change-Id: I95ca889847b230bf5bb93302dfe956593846f1b0

Former-commit-id: 87a4b1bec4 [formerly 87a4b1bec4 [formerly 5fe100c7b1397373c91ac02bf7a6c7c1778fd19a]]
Former-commit-id: a80964bc7c
Former-commit-id: 4557a06f42
 2013-11-14 14:40:33 -06:00
Richard Peter
e2a16fd876 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6 
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 79bdd34f4f [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]
Former-commit-id: 0074b774f0
Former-commit-id: 96b4944b41
 2013-11-14 14:40:23 -06:00
Nate Jensen
e83a828209 Issue #2361 remove StyleManager's use of SerializationUtil and 
ISerializableObject

Change-Id: I08bb431fe2e622bb6836796c22c1e0ebdfb5175a

Former-commit-id: 9acda0b9f2 [formerly 9acda0b9f2 [formerly d390d3f8dab55dea038ebe516bfd0b6fd9e7d28d]]
Former-commit-id: c5cf68cc45
Former-commit-id: a6be904c69
 2013-11-14 13:29:30 -06:00
Bryan Kowal
1a905e8a3c Merge branch 'development' into development_on_RHEL6 
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 86dd200844 [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]
Former-commit-id: 0544b66f4e
Former-commit-id: 01735ca0c4
 2013-11-13 13:16:55 -06:00
Steve Harris
42ece4fb6a 14.1.1-8 baseline 
Former-commit-id: aa6c977e7b [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 0123596fd9
 2013-11-13 12:32:17 -05:00
Nate Jensen
983afa0eea Merge "Issue #2361 better logging of viz spring initialization of bundles" into development 
Former-commit-id: 8cf1b752e0 [formerly 8cf1b752e0 [formerly e8be5c7f9887dde13b97053363e4a9d41f596a24]]
Former-commit-id: b1d376e238
Former-commit-id: 645e816d5d
 2013-11-12 16:48:32 -06:00
Nate Jensen
5c7be238a0 Issue #2361 better logging of viz spring initialization of bundles 
Change-Id: I9e8e9ec570b47e5b7052928206443eb2835e809b

Former-commit-id: 692ea76d75 [formerly 692ea76d75 [formerly 99500a22ff9b2f115b5bb6e35034f47adf3d0853]]
Former-commit-id: a4ece1d116
Former-commit-id: 2e86520b53
 2013-11-12 13:02:49 -06:00
Brad Gonzales
bad9b3242a Issue #2506 BandwidthManagers now sends notifications for Subscription/BandwidthSubscription creates and deletes. 
Amend: Separate update from create notifications in LifecycleManagerImpl.
       Refactored notification sending in EdexBandwidthManager.
       Fixed error in LifecycleManagerImpl refactor.
       Added comment to isRecurringSubscription.

Change-Id: Idc9e8544b156fed40d6aed41511c07138f302f77

Former-commit-id: 8f70fb1d0c [formerly 8f70fb1d0c [formerly 7684f7bd51770a41e68700f1d4408a6aad5cd877]]
Former-commit-id: aea0e847aa
Former-commit-id: 866a11a9f0
 2013-11-12 12:42:16 -06:00
Richard Peter
c8ef435295 Merge branch 'development' into development_on_RHEL6 
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.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
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 306bd6fae1 [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 59671c1e7d
 2013-11-12 11:11:36 -06:00
Nate Jensen
80c38e1433 Issue #2361 remove using SerializationUtil for processing XML colormaps 
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: b52bdb1cec [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]
Former-commit-id: 7a73c65430
Former-commit-id: 5427e68fd2
 2013-11-12 10:37:54 -06:00
Steve Harris
92cf79a7cc Merge branch 'omaha_13.5.3' into development 
Former-commit-id: 9dabbc7b8e [formerly 9dabbc7b8e [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]
Former-commit-id: 66f99f3974
Former-commit-id: 9f1d93a2cf
 2013-11-11 15:40:45 -06:00
Steve Harris
0c54c50443 13.5.3-7 baseline 
Former-commit-id: 21bed95fa4 [formerly 21bed95fa4 [formerly a9ada72dc63cd460499052171c61323b438bb10d]]
Former-commit-id: 47102ee47b
Former-commit-id: 3599d7f09b
 2013-11-11 16:33:51 -05:00