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

85 commits

Author SHA1 Message Date
Dave Hladky
e17f8e0511 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 
Conflicts:
	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
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: a1006667e0
Former-commit-id: 5c65862b8f
 2013-03-12 15:48:34 -05:00
Steve Harris
4eef6862d6 13.3.1-6 baseline 
Former-commit-id: 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 3a4c7931e1
Former-commit-id: 2e110bd151
 2013-03-12 08:35:45 -05:00
Roger Ferrel
0982485efe Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server. 
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: b421c97d86 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]
Former-commit-id: 4deb731bd0
Former-commit-id: 70bd9aafa7
 2013-03-11 13:00:44 -05:00
Richard Peter
e54d4ba855 Issue #1740: Baseline cave monitoring script 
Former-commit-id: 783e9c1a25 [formerly 163fb343de [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]
Former-commit-id: 163fb343de
Former-commit-id: 1632bd2882
 2013-03-01 16:17:25 -06:00
Ron Anderson
547f0d086f Issue #1597 Code cleanup and logging improvement for GFE Performance metrics 
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: f37999b1eb [formerly bfe3c684df [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]
Former-commit-id: bfe3c684df
Former-commit-id: d43afc8c67
 2013-02-26 18:44:51 -06:00
Steve Harris
abdc733151 Merge branch 'development' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: a0573644c4
Former-commit-id: 64744fdb19
 2013-02-21 15:41:39 -06:00
Steve Harris
e0406d3183 13.3.1-1 baseline 
Former-commit-id: d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
 2013-02-20 16:19:40 -06:00
Steve Harris
f1f5359a2f Merge branch 'omaha_13.2.1' (13.2.1-8) into development 
Former-commit-id: d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]
Former-commit-id: ea50a5db77
Former-commit-id: c2327ce33d
 2013-02-19 12:22:00 -06:00
Steve Harris
d176ec1f38 13.2.1-8 baseline 
Former-commit-id: 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: f81b382c04
Former-commit-id: 18da2e93d7
 2013-02-18 09:09:41 -06:00
Mike Duff
5331d05c64 Issue #1584 - FFMP performance stats and performance logger 
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 9c1e0ab639 [formerly 0b044dba9c [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]
Former-commit-id: 0b044dba9c
Former-commit-id: 897262630c
 2013-02-18 08:16:57 -06:00
Roger Ferrel
67ea75b00c Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away. 
Change-Id: I7716af97c3a94f2243be1b219ed9f91c7b67c0d8

Former-commit-id: e26689a487 [formerly 2b509cf7de [formerly 9ac5a199108a1e1d106a79e67cd6209bd46134cb]]
Former-commit-id: 2b509cf7de
Former-commit-id: bfb9f9f156
 2013-02-13 16:45:52 -06:00
Steve Harris
52f48669f6 13.2.1-6 baseline 
Former-commit-id: a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: d0752de66c
Former-commit-id: d66ad2f77b
 2013-02-07 16:00:39 -06:00
Steve Harris
953bec4467 Merge branch '13.2.1_delivery' into development 
Former-commit-id: 5ee47e098d [formerly 4bc8e9ab5c [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]
Former-commit-id: 4bc8e9ab5c
Former-commit-id: da43a7a8ca
 2013-02-06 11:12:01 -06:00
Steve Harris
44a4287812 Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 6c6b53679b [formerly a16ac7819c [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]
Former-commit-id: a16ac7819c
Former-commit-id: 14f23d4227
 2013-02-06 11:08:53 -06:00
Steve Harris
7e1236c17c 13.2.1-5 baseline 
Former-commit-id: 146fcc6da8 [formerly 232734091d [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]
Former-commit-id: 232734091d
Former-commit-id: a6b3cde1ff
 2013-02-06 11:02:32 -06:00
David Gillingham
6899606e1f Issue #1559: Fix port error in SmartScript.getGridCellSwath(). 
Change-Id: If435423a8277f852b3ceb0a7299332ece800696f

Former-commit-id: 49a4e1c39d [formerly 292bd811a0 [formerly 2e2be1d031a93f0fe13c17788eabff34ab428caa]]
Former-commit-id: 292bd811a0
Former-commit-id: 6f6534649a
 2013-01-31 12:00:38 -06:00
Steve Harris
ed224fde88 13.2.1-4 baseline 
Former-commit-id: 0d7f53b6f4 [formerly 8f2e7d4437 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]
Former-commit-id: 8f2e7d4437
Former-commit-id: ae2859d5a2
 2013-01-31 11:40:31 -06:00
Steve Harris
f207d282bc Merge branch '13.2.1_delivery' into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]
Former-commit-id: 658bea377b
Former-commit-id: c218786986
 2013-01-31 10:19:14 -06:00
Steve Harris
e6093b159e Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery 
Former-commit-id: 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]
Former-commit-id: 0505ed0a72
Former-commit-id: e655d297f7
 2013-01-29 15:57:21 -06:00
Steve Harris
b84acc06da 13.2.1-3 baseline 
Former-commit-id: 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]
Former-commit-id: f45120a1f4
Former-commit-id: 283147571f
 2013-01-29 15:52:43 -06:00
Steve Harris
74bfe9595c 13.2.1-2 baseline 
Former-commit-id: c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: 7a7f7c45ca
Former-commit-id: 0006a2b6cb
 2013-01-25 09:07:12 -06:00
Ben Steffensmeier
dec6cf6e9d Issue #1479 fix mod families 
Former-commit-id: a7989d4638 [formerly 13fd813660 [formerly 76b5a4fcf313e2a028662a1e07871fff2e328d48]]
Former-commit-id: 13fd813660
Former-commit-id: 735add55ba
 2013-01-23 15:47:30 -06:00
Steve Harris
7d2e979c51 13.2.1-3 baseline 
Former-commit-id: 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 7435527b25
Former-commit-id: a5a0da5c02
 2013-01-23 11:24:17 -05:00
Steve Harris
a4fa438a41 13.2.1-2 baseline 
Former-commit-id: 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 83e9157df7
Former-commit-id: 33bc5fd816
 2013-01-23 11:18:44 -05:00
Steve Harris
11b05eedeb 13.2.1-1 baseline 
Former-commit-id: c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: 9771dfae6b
Former-commit-id: 48d1aa7732
 2013-01-23 11:13:03 -05:00
Ben Steffensmeier
3802dad955 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates. 
Former-commit-id: ec199ad7d1 [formerly f0af056d97 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]
Former-commit-id: f0af056d97
Former-commit-id: a9654f859a
 2013-01-18 10:59:43 -06:00
Steve Harris
5b617e763b 13.1.2-10 baseline 
Former-commit-id: 86ea0b666e [formerly 68dde17de2 [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]
Former-commit-id: 68dde17de2
Former-commit-id: 683193255d
 2013-01-18 10:37:25 -05:00
Steve Harris
a78d3ab456 13.1.2-9 baseline 
Former-commit-id: ddc6aec013 [formerly 0878a7ea57 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]
Former-commit-id: 0878a7ea57
Former-commit-id: 6fd587d08d
 2013-01-18 10:29:52 -05:00
David Gillingham
de3e72065e Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it. 
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc

Former-commit-id: d16760c73e [formerly c6e64d83a2 [formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]
Former-commit-id: c6e64d83a2
Former-commit-id: 9e3999a427
 2013-01-17 17:42:05 -06:00
Ben Steffensmeier
a68b6beda9 Issue #1479 fix mod families 
Former-commit-id: 65b11cf54c [formerly 244f55e1f9 [formerly 4678cbf7764cae77683d357f0ac1bf6ff95bc63e]]
Former-commit-id: 244f55e1f9
Former-commit-id: da98f8e176
 2013-01-16 10:56:21 -06:00
Lee Venable
1578950906 Merge "Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates." into development 
Former-commit-id: f63da5aba6 [formerly 32692a6def [formerly 517b6e6652b75801928cbb8f2f6899916e8dd988]]
Former-commit-id: 32692a6def
Former-commit-id: a3c5aded12
 2013-01-15 14:47:49 -06:00
Richard Peter
6e42fa32d3 Merge branch 'ss_builds' (13.2.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 3fb7d96ec1
Former-commit-id: a966546e31
 2013-01-14 18:07:17 -06:00
Ben Steffensmeier
1926965b6b Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates. 
Former-commit-id: 2e10a8408b [formerly f49e77f7df [formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]
Former-commit-id: f49e77f7df
Former-commit-id: da79be73a2
 2013-01-14 17:44:46 -06:00
Steve Harris
8dd688c878 13.2.1-1 baseline 
Former-commit-id: 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: e62172c8c7
Former-commit-id: 5dfe4d10f1
 2013-01-14 18:42:21 -05:00
Richard Peter
4e1f66abb3 Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]
Former-commit-id: 1318f53902
Former-commit-id: ae3ea75cbf
 2013-01-14 17:38:38 -06:00
Steve Harris
0b15dff12b 13.1.2-7 baseline 
Former-commit-id: 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 4f86b07eb0
Former-commit-id: a8d90da9c0
 2013-01-11 16:12:09 -05:00
Richard Peter
95f0508c29 Issue #1408: Merge 13.1.2-6 into development 
Former-commit-id: 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 029ebaa63a
Former-commit-id: d0a6ba23e5
 2013-01-09 17:55:05 -06:00
Steve Harris
1d4d25b49b 13.1.2-6 baseline 
Former-commit-id: 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
 2013-01-06 14:55:11 -06:00
Steve Harris
e8f4a2f031 13.1.2-2 baseline 
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
 2013-01-06 14:32:24 -06:00
Steve Harris
d27c5237c3 Merge branch 'ss_builds' (12.12.1-12) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: 43ddfe98c4
Former-commit-id: 4d4771ee3a
 2012-12-11 08:45:53 -06:00
Steve Harris
8b74846a1b 12.12.1-12 baseline 
Former-commit-id: 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: e8e41630e8
Former-commit-id: 89def5cf03
 2012-12-06 09:18:28 -06:00
Steve Harris
8790caf84e 12.12.1-8 baseline 
Former-commit-id: 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 19962f41ba
Former-commit-id: 2d338b4cec
 2012-12-06 09:02:51 -06:00
Max Schenkelberg
a614307c95 Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation 
Amend: Fixed time matcher index error when no data is available in GFE

Change-Id: Ie222ba72cb3890d3dc32699828b45012cd1783e5

Former-commit-id: 1328deac56 [formerly 624cafb066 [formerly 974ef3068d48244ca622edc17045266cc34b6468]]
Former-commit-id: 624cafb066
Former-commit-id: b744ba68e0
 2012-11-30 14:17:50 -06:00
Dustin Johnson
069c8d4788 Merge branch 'ss_builds' (12.12.1-4) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: bff32bbe58
Former-commit-id: d27bce13c2
 2012-11-14 14:41:57 -06:00
Steve Harris
b968ab5135 12.12.1-4 baseline 
Former-commit-id: 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 85130eb611
Former-commit-id: b91b7f0fae
 2012-11-14 14:19:20 -06:00
Steve Harris
1ee8938748 Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 448dd1c35f
Former-commit-id: 8fc896f7d4
 2012-11-13 17:28:50 -06:00
Steve Harris
7192b19284 12.12.1-2 baseline 
Former-commit-id: 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: a8560580f8
Former-commit-id: ed809a02db
 2012-11-13 17:14:24 -06:00
Ben Steffensmeier
626f398224 Merge branch 'ss_builds'(12.12.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: 69fc030bb4
Former-commit-id: ed4f88aa22
 2012-11-13 16:00:19 -06:00
Steve Harris
8278cac143 12.12.1-1 baseline 
Former-commit-id: e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
 2012-11-07 12:41:20 -06:00
Ben Steffensmeier
1a215cb42a merge Unified_Grid with ss_builds to 12.11.1-7 
Former-commit-id: c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: 6a9ff88b33
Former-commit-id: 4f503d3a1e
 2012-10-25 12:22:11 -05:00