Commit graph

880 commits

Author SHA1 Message Date
Steve Harris
302aa05586 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 4688ac304f [formerly d2a398126648eaf391ddf39f99a77c0f40d08618]
Former-commit-id: de9034c96c
2012-07-27 14:50:45 -05:00
Steve Harris
07c40a9c0c Merge branch 'master' (OB12.7.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	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/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]
Former-commit-id: 56249c2611
2012-07-27 14:44:44 -05:00
Max Schenkelberg
7ace2035c5 Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R
Amend: Added WMO header finder since the header property will have additional information in it when file comes from LDM.  Also changed MessageGenerator to use new class for finding the wmo header

Amend: Added try-finally for input stream in DataUnzipper

Change-Id: I4ece2f5f24a429aa41969f51040a58e67e79e1c1

Former-commit-id: b669f57ee4 [formerly 2f17b2f49f65da4b7b7fd531377873cb9eb941dd]
Former-commit-id: 756988cb8b
2012-07-27 14:42:36 -05:00
Nate Jensen
ac8d12ce13 Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413

Former-commit-id: dbe185f3a0 [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]
Former-commit-id: 3d07fc8ebf
2012-07-26 17:43:29 -05:00
Bryan Kowal
991ac89f21 Issue #964 - the awips2-edex-shapfiles rpm version can now be set dynamically.
Change-Id: I318c62ae1cae26600b5d024bca6c72ae8baed269

Former-commit-id: b30c43883d [formerly e47b171ad3863d4066dc2f00e509a8114f9f33f5]
Former-commit-id: 7b44eaafe7
2012-07-26 13:47:25 -05:00
Ben Steffensmeier
78491d6318 Issue #924 fix some concurrency issues for GridResource
Former-commit-id: de742a4b8c [formerly 312361f3bacf9ed935ee7cd69be90192af34b3fd]
Former-commit-id: e18782687c
2012-07-25 17:33:24 -05:00
Bryan Kowal
6b068353e9 Issue #959 - fix for manual command-line executions of the full rpm build.
Change-Id: Ic2ae5a0aea4983b6ed22ddeb4fd774f9b537214d

Former-commit-id: 2011493fda [formerly b66b6fd7498e441290772be4b6906e58ac385511]
Former-commit-id: e31fd00613
2012-07-25 14:13:35 -05:00
Ben Steffensmeier
7514bfd6cd Issue #921 register GFEColorbarResource as a listener when recycling.
Change-Id: I21e990d4225b5bcf44aac6f2a3c4442442ec51b0

Former-commit-id: 044836cd2c [formerly 90ce1b3643af750a19bc29156137f18848e7dc77]
Former-commit-id: e3cfa52237
2012-07-24 11:29:51 -05:00
Bryan Kowal
4071fa2e74 Issue #768 - scripts no longer need to be executable.
Change-Id: I92c1d419c8ed73b954c1c96693d11b2f27313b83

Former-commit-id: 88fdb461ea [formerly 535dfb1c7242763e67baa3130fc3a98477ccbc8b]
Former-commit-id: fe4a515422
2012-07-24 10:12:33 -05:00
Ron Anderson
21431b2693 Issue #851 Fixed issues with DatabaseID.dateFormat
Change-Id: Ia5d99932059cec78074096e9ef08fa7b90b13e72

Former-commit-id: b52f1400ef [formerly 1816e3f6c96b1064d52a2cbdf75ae02fb27e3693]
Former-commit-id: 1f2e581534
2012-07-23 16:49:21 -05:00
Ben Steffensmeier
286274aed0 Issue #924 fix concurrency issues for Grid products
Former-commit-id: 9abd645758 [formerly 767173dc95dc811bc94081415a214803403985f5]
Former-commit-id: 0b951d425d
2012-07-19 17:37:15 -05:00
Ben Steffensmeier
41860a891e Issue #910 fix Memory Leak in GLDelegate Images, add Graphics memory logging.
Change-Id: I07635279472c5f4a605f00cbdde81e961eb9e757

Former-commit-id: 98218ec3cd [formerly e4d9419134f7fcfd47dfe84e55764309d3d65257]
Former-commit-id: 5df07dac9f
2012-07-19 17:12:31 -05:00
Steve Harris
11f96dbedd 12.7.1-8 baseline
Former-commit-id: c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: 16bf591a33
2012-07-19 16:20:40 -05:00
Nate Jensen
127feeb545 Merge "Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged" into development
Former-commit-id: 0fd6c7d56c [formerly 3786f2c0a7add2d36b27b92e2a8efd235b65e147]
Former-commit-id: bad816a50e
2012-07-19 15:31:55 -05:00
Nate Jensen
534ced49d0 Merge "Issue #772 synchronize sat getImages with paint and dispose to avoid errors when disposing while mosaicing." into development
Former-commit-id: 8b3819cf44 [formerly 6e91bbe07a17896a59969671ddc414d8f9029a9f]
Former-commit-id: 334ba86ef4
2012-07-19 13:37:51 -05:00
Max Schenkelberg
0cfd8834c2 Issue #626 Moved menu changes required for NPP to be in satellite menu from old repo into common/core. Fixed AbstractDataCubeAdapter to add System date to time request and fixed GLCMTextureData race condition if sampling a texture that has been created but not staged
Change-Id: I845caf8bedb4b27d16874c2a0a633554412d6dd4

Former-commit-id: d8971a72fd [formerly fb323d9e48c7f35f68d188d4f8fbb677971ebbb1]
Former-commit-id: c8909c0fbc
2012-07-19 11:45:01 -05:00
Bryan Kowal
6a6dc780bc Issue #760 - upgraded the lapack library.
Change-Id: I4a6481514b407cd7e1719d94e4086b1051b3090e

Former-commit-id: 95d0565b6d [formerly 47b881f604fec3591827f66481ff820032278aa0]
Former-commit-id: 10cde34ffe
2012-07-19 11:05:13 -05:00
Bryan Kowal
0651a04d0e Issue #913 - fix the correct RadarServer start-config file.
Former-commit-id: 132870666a [formerly 10a2b1626a9388c1bf4244142fedd49d5b1d1d39]
Former-commit-id: 1e13956bce
2012-07-19 09:31:34 -05:00
Ben Steffensmeier
53f915c3e4 Issue #772 synchronize sat getImages with paint and dispose to avoid errors when disposing while mosaicing.
Former-commit-id: eab4b1cd78 [formerly 84055039ccd601f4be4546f97cde99faf33b7818]
Former-commit-id: 144dd7bab9
2012-07-18 17:53:51 -05:00
Bryan Kowal
2670a3d7b3 Issue #913 - fixed the paths for Radar Server.
Change-Id: Ia86e7113ba679bdf4b9b2a83b243e1d3d5e3b208

Former-commit-id: 7524f8ad8d [formerly f43666937b14fdee3dd06d6da42be42b67096b2b]
Former-commit-id: 0ecf2f92c1
2012-07-18 11:12:09 -05:00
Nate Jensen
a4e5a92b93 Merge "Issue #626 Changed GridDownscaler to include full resolution grid in levels so level 0 is full grid to make more standard with how downscaling is done now" into development
Former-commit-id: 5cdf7b27f6 [formerly e7bc3cec2a68d9041719126d484bb8f5c03eed2c]
Former-commit-id: 348eca2c4c
2012-07-16 13:58:03 -05:00
Roger Ferrel
44a3176dd6 Issue #875 Modfications to prevent null pointer exeception when no map displayed.
Change-Id: Ia20c00021c3c2741b30679c72c01b245cdb4c504

Former-commit-id: 3cfd8547b4 [formerly 7eaa2860847149879bb62a637e6677675dd5c7ec]
Former-commit-id: c908de0d82
2012-07-16 11:10:23 -05:00
Max Schenkelberg
39e199147e Issue #626 Changed GridDownscaler to include full resolution grid in levels so level 0 is full grid to make more standard with how downscaling is done now
Change-Id: I8f87118b3e283acc5c19dc97497730b9cabec0f1

Former-commit-id: dcdffe345d [formerly 91148d4bfe159c346baaf33a4fb5bac0c174bd37]
Former-commit-id: a9360b7078
2012-07-16 10:00:28 -05:00
Bryan Kowal
a56cc7060b Issue #889 - specified the full path to awips2-ant.
Former-commit-id: 41bb75fa61 [formerly 46c434a450902cfb87fb3b1678bcf841f4d77a95]
Former-commit-id: c32bb9556e
2012-07-14 08:51:00 -05:00
Richard Peter
a06dde8a30 Merge "Issue #798 - Modified Satellite component to persist GOESR data" into development
Former-commit-id: ee6738152d [formerly d3144d913bda351fba681b6fe5e4dd5148cfc49c]
Former-commit-id: 19203d87f3
2012-07-13 09:18:46 -05:00
Nate Jensen
da1e9ae3c3 Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
Former-commit-id: 1b3d6560e4 [formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]
Former-commit-id: c0dad4432c
2012-07-12 17:17:57 -05:00
Nate Jensen
6e18c9d2b3 Merge "Issue #875 - Create com.raytheon.uf.viz.points" into development
Former-commit-id: 73e087494c [formerly 78f6d94e5be35624e63960196ed3a56bd72306a9]
Former-commit-id: 34a3d7b141
2012-07-12 14:58:20 -05:00
Ben Steffensmeier
45a1cc1997 Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
Former-commit-id: 8984b35ff8 [formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]
Former-commit-id: ea0c7046af
2012-07-12 13:35:52 -05:00
Bryan Kowal
b446253674 Issue #802 - the baseline build (enhanced by WA8) will now correctly update the edex banner and cave about dialog. Improved how the edex banner is written.
Former-commit-id: 1e5b71ee7b [formerly d70a752ea80b6e0ded2270da8d54525ae6fbf0da]
Former-commit-id: db6b535eb6
2012-07-12 12:58:40 -05:00
Roger Ferrel
bfcefac909 Issue #875 - Create com.raytheon.uf.viz.points
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: 9071334fe9 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]
Former-commit-id: 0cf7d64cf4
2012-07-12 11:32:03 -05:00
Bryan Kowal
7f6015eba5 Issue #880 - no longer remove the gfesuite files before deployment; just override any existing files.
Former-commit-id: bde6be6e2b [formerly ea1b0920d908481e28477329497204dda324bd3e]
Former-commit-id: 0f31fadffa
2012-07-11 17:31:55 -05:00
Bryan Kowal
6fe6e64f38 Issue #876 - ensure that the edex pde build also searches the current working directory for features and plugins (temporarily).
Former-commit-id: 31f2db8719 [formerly 62f98b83bf1c050700ac8eb4bf339cde5e55226e]
Former-commit-id: 5058c32c34
2012-07-11 16:28:28 -05:00
Bryan Kowal
8fef600e84 Issue #607 - removed references to src directories for plugins that do not have a source directory. The edex build will now build the binlightning plugin when the lightning flag is set to true.
Former-commit-id: 3b7c761f99 [formerly cd948be11933b849836e3c774e668fa3bf6943ad]
Former-commit-id: ab2c53ae0a
2012-07-11 12:44:32 -05:00
Bryan Kowal
0e279845ba Issue #777 - removing the few remaining references to the WORKSPACE_DIR environment variable and the Installer.rpm directory. Ensure that
the build builds awips2-data.gfe.


Former-commit-id: c7a172f97a [formerly 38fd864d20cc5830b0f3913faf9b66cbf0f10048]
Former-commit-id: b79f5a3c2b
2012-07-11 09:42:46 -05:00
Bryan Kowal
226818bda5 Merge branch 'merge_development' into development
Former-commit-id: b27994c9b1 [formerly 1b662d79bad6e259c61ae95a85e2f102fa06c2fa]
Former-commit-id: 051a51b79c
2012-07-10 17:03:21 -05:00
Bryan Kowal
c629f18f24 Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: f92eb59a73 [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]
Former-commit-id: 99d22f395a
2012-07-10 16:57:16 -05:00
Nate Jensen
85350ace5e Merge "Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API. Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998" into development
Former-commit-id: ee43626e2e [formerly 95d4cacc92bbf5531ca54c3a4dda811ea402ac84]
Former-commit-id: 2af538f200
2012-07-10 16:06:28 -05:00
Ben Steffensmeier
5bf019e1bb Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998

Former-commit-id: 79ab850efa [formerly 009e769a180898cb62e9df4a604b40e139cf2886]
Former-commit-id: 74a69d1fb9
2012-07-10 16:04:56 -05:00
Greg Armendariz
e119a69089 Issue #868
Change-Id: I806937722052e3671510f4003445092e4a665eb5

Former-commit-id: 2fcdef36f3 [formerly 7620d51d0df21ef6fb888fe44a23b316dfc26b00]
Former-commit-id: 84e8babca1
2012-07-10 10:15:33 -05:00
Steve Harris
8fff0d7e53 Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10
These files have existing camel-cased equivalents and may not be needed.


Former-commit-id: 9454393d13 [formerly b8e0e8d751a961c5ef25ab346be4b443aadf1291]
Former-commit-id: 479ccdbed2
2012-07-10 09:29:33 -05:00
Steve Harris
7c064b6868 12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 2c0ff851ca
2012-07-10 07:53:49 -05:00
James Korman
cbfb024ac1 Issue #798 - Modified Satellite component to persist GOESR data
Former-commit-id: 917202386b [formerly 3210c78cbc0c3af3e576c99644231416020d2838]
Former-commit-id: fde4a09b69
2012-07-09 10:08:11 -05:00
Bryan Kowal
adcd49b090 Issue #862 - fix java error.
Former-commit-id: 748c121036 [formerly 9e5b18d03a18d7af849efb9b1cf3f1c25a9252a8]
Former-commit-id: 2ec61df191
2012-07-09 09:40:40 -05:00
Max Schenkelberg
5d4d4d9c22 Issue #626 wrote grid downscaler to help NPP/GOES-R downscale data in a common method. Uses new interpolation/reprojection APIs
Change-Id: I4ab39a6d0bcd1f54337c77b9086f15afdc3e9ea4

Former-commit-id: cbd753c86d [formerly f28d4ba149fe16471a4e10e50f15b684c0d82b9c]
Former-commit-id: a0d645fedf
2012-07-06 16:04:12 -05:00
Max Schenkelberg
7d13c7d339 Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 98c2ec7dc5 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]
Former-commit-id: 9bbb68a547
2012-07-06 16:01:47 -05:00
Ron Anderson
d68ece4d55 Issue #851 Cleaned up unnecessary Java imports in baselined tools/procedures.
Change-Id: I49ad2815c2b524a63c115c1b2424b41831247d97

Former-commit-id: e71059c2b9 [formerly ff032c53a059f25558aabdc5b483c4cc59ad3f6e]
Former-commit-id: d3e0cd5af8
2012-07-05 16:32:44 -05:00
Ron Anderson
51a8028105 Issue #859 Fixed staticTopo generation
Change-Id: Iba2d2e95c4101e5edac3e9743c02a4aaa4967dd7

Former-commit-id: 593a09daee [formerly 8e81e22084031ed702ba294ec94a6bd59926d88c]
Former-commit-id: 1f871be887
2012-07-05 15:50:07 -05:00
Ron Anderson
936b2cabca Issue #851 Cleaned up dead code and unused dependencies in GFE.
Amend: Issue #851 resubmitting after accepting ticket

Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e

Former-commit-id: 59a3ebe8ba [formerly af1332170e28aed53ff91997ce089b20423203d5]
Former-commit-id: ff5c7b7498
2012-07-05 15:39:05 -05:00
Nate Jensen
f1a37857b6 Issue #666 fix for ncep metars to share correctly in collaboration session
Change-Id: I829eea313b5870d3df551f9b5224d178528412ae

Former-commit-id: 0b6b48222c [formerly b4de13af62ea179577e9dc799c3174d4ce7bd21b]
Former-commit-id: ad2c9b5d3b
2012-07-03 13:38:31 -05:00
Bryan Kowal
d918ed1a48 Merge "Issue #716 remove dead plugin from features" into development
Former-commit-id: 5af862f03f [formerly 479a1c1309a657baa50afaf2e6640e840059a121]
Former-commit-id: 5211449202
2012-07-02 09:50:55 -05:00