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

105 commits

Author SHA1 Message Date
Ben Steffensmeier
109ec1e778 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: ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: e8090e654b
Former-commit-id: 60f78c22e3
 2012-11-13 16:00:19 -06:00
Ben Steffensmeier
5ee5347fc0 Issue #1108 fix the order of arguments for grib 1 parameter mappings 
Former-commit-id: 894998b95f [formerly adf0fec9a2] [formerly c4f99aae63 [formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]]
Former-commit-id: c4f99aae63
Former-commit-id: 87ec259477
 2012-11-09 13:36:49 -06:00
Ben Steffensmeier
7c93db759c Issue #1108 initial implementation of mappings 
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 693090cb36
Former-commit-id: 884c82c4fe
 2012-11-08 14:45:36 -06:00
Richard Peter
fa6141c745 Merge "Issue #189 add more comments to grib decoder." into development 
Former-commit-id: 7f49c5fe04 [formerly db28cc26aa] [formerly 7077a82458 [formerly 1ad439769c601fe61365f015bc56da0442553be5]]
Former-commit-id: 7077a82458
Former-commit-id: e1852956e2
 2012-11-08 14:40:05 -06:00
Ben Steffensmeier
d75b59622a Issue #189 merge ncep changes to unified grid. 
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: f62cf2713d [formerly e6b0751f5c] [formerly fbed67a208 [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]
Former-commit-id: fbed67a208
Former-commit-id: 7c9341a3a6
 2012-11-08 14:34:55 -06:00
Richard Peter
e7151070ee Merge "Issue #189 fix another Unknown Model" into development 
Former-commit-id: 10138f3ae8 [formerly 7d8dfb9c01] [formerly 675b1666fd [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]
Former-commit-id: 675b1666fd
Former-commit-id: ed90d0aa23
 2012-11-08 13:43:37 -06:00
Dustin Johnson
2d1e886cf3 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
 2012-11-08 09:57:16 -06:00
Steve Harris
4f243de928 12.12.1-1 baseline 
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
 2012-11-07 12:41:20 -06:00
Ben Steffensmeier
ac8cd2ef9a Issue #189 fix another Unknown Model 
Former-commit-id: 643212a0ad [formerly eaa7e420df] [formerly 64f59b94e4 [formerly 7dfb29c93784505c0b3aad37c631afe6f5ecf14f]]
Former-commit-id: 64f59b94e4
Former-commit-id: 89efb7cf22
 2012-11-07 10:56:26 -06:00
Ben Steffensmeier
929df097c0 Issue #189 add more comments to grib decoder. 
Former-commit-id: 397ebf02f6 [formerly 67db4ae4e4] [formerly 237a7ea992 [formerly fdc27da79f1da6c2bda0f3061096227d95745c46]]
Former-commit-id: 237a7ea992
Former-commit-id: d57e097e3d
 2012-11-06 18:30:03 -06:00
Ron Anderson
80ef14539e Merge "Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge." into development 
Former-commit-id: 5edafa6c86 [formerly 257213e491] [formerly 52007a3a00 [formerly a13ecc678d2fb7bf0e58922e07e3b5df60a197f4]]
Former-commit-id: 52007a3a00
Former-commit-id: 1855cb195b
 2012-11-05 17:33:06 -06:00
Richard Peter
365cd1ad33 Merge "Issue #189 fix several Unknown Models" into development 
Former-commit-id: 04f3a7ee16 [formerly 9d917020b6] [formerly d2e47212c6 [formerly fce6826da3fc3b1848e890e552c566580b4e6f29]]
Former-commit-id: d2e47212c6
Former-commit-id: 199fbdac90
 2012-11-05 14:03:14 -06:00
David Gillingham
d6bbcbe863 Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge. 
Change-Id: I7953a3405c11656f4723b4840ff6e2d15c0a11d7

Former-commit-id: 4237143dd0 [formerly 11f109976e] [formerly e0c7243c74 [formerly 358867e5631dab8fbfdf3158d07e3875f949205a]]
Former-commit-id: e0c7243c74
Former-commit-id: 73c592ccdc
 2012-11-05 14:00:15 -06:00
Ben Steffensmeier
19caacc7b6 Issue #189 fix several Unknown Models 
Former-commit-id: b04bca36d4 [formerly 579d2e5ba6] [formerly 365a2274dd [formerly 56d97231ac950ad0db6a1063beb5f42483b7d137]]
Former-commit-id: 365a2274dd
Former-commit-id: fa29bdf8c0
 2012-11-02 16:19:46 -05:00
Ben Steffensmeier
11bd701e0a Issue #189 update readme with more install notes, remove common subgrid package that was moved to edex, mark several classes deprecated. 
Former-commit-id: 9b6833e497 [formerly a6ef4957d6] [formerly c1c55fa7aa [formerly 99df0ed1cf531a6b60035b79bd5a2cbdf262328d]]
Former-commit-id: c1c55fa7aa
Former-commit-id: e4b81a6829
 2012-11-02 10:37:42 -05:00
Dustin Johnson
e7a0f96a9a Issue #1302 Merge branch '5-Data_Delivery' into development 
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
 2012-11-01 13:36:06 -05:00
Richard Peter
998278caf7 Issue #1257: Update PurgeRules to not be hard linked to path keys 
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: 5787d6278d [formerly 275398778f] [formerly 886375172b [formerly 73bca27407552c864765d5924e8609a253493f4c]]
Former-commit-id: 886375172b
Former-commit-id: bd1d87363a
 2012-10-31 18:19:44 -05:00
Ben Steffensmeier
1d94435220 merge branch Unifeid_Grid into developement 
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: b6a1563bb2
Former-commit-id: 92fd247ccc
 2012-10-30 12:24:54 -05:00
Ben Steffensmeier
9b8f2bcdbd merge Unified_Grid with ss_builds to 12.11.1-7 
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: c2934ae7a5
Former-commit-id: a77d2097f8
 2012-10-25 12:22:11 -05:00
Steve Harris
8beb6fc0b8 12.11.1-6 baseline 
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 08fc9f6b14
 2012-10-18 15:53:01 -05:00
Steve Harris
85ad066b70 12.11.1-5 baseline 
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
 2012-10-18 15:46:42 -05:00
Richard Peter
cfcef0a7b1 Issue #1257: Revert radar file name changes. Change grib path to just be by master level name. 
Change-Id: If3515614408906a5dc0e54b4c8d261fae5fcaf26

Former-commit-id: 36c53a2cc8 [formerly 85eb3b7598] [formerly 72acca2422 [formerly ca23e50157bb0c381dbcd6bf4d4f08bbd0a35f6f]]
Former-commit-id: 72acca2422
Former-commit-id: 8cb830c1c6
 2012-10-17 13:22:00 -05:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
 2012-10-16 13:27:07 -05:00
Richard Peter
19797b9064 Issue #1257: Update grib path keys to include hdf5 layout. Turn on TcpNoDelay 
Change-Id: I296d0d4b1c204a325c499b3aeb1f9d7f16de0c9b

Former-commit-id: e32d77c87f [formerly 68ac1abca4] [formerly c5e3b54caa [formerly 29b54f75013685f1bcd9ed3129c9ba3ddf629395]]
Former-commit-id: c5e3b54caa
Former-commit-id: a80db469b2
 2012-10-15 20:15:39 -05:00
Richard Peter
46870808e0 Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path. 
Change-Id: I426718d765dfad3aba24e504b2d01ab9b194625f

Former-commit-id: 12bcfbda80 [formerly ca0c9b7502] [formerly bcb0560291 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]
Former-commit-id: bcb0560291
Former-commit-id: ce85c8e1a6
 2012-10-15 09:52:14 -05:00
Ben Steffensmeier
fde1e73d58 Merge branch 'ss_builds' into Unified_Grid 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: de3769129c [formerly 8b7256b1ae] [formerly 266a2f317f [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]
Former-commit-id: 266a2f317f
Former-commit-id: fed5a35af3
 2012-10-12 12:45:50 -05:00
Ben Steffensmeier
4cacd4a7b1 Issue #189 minor fixes to grid for issues discovered during dev tests 
Former-commit-id: fa380d06c1 [formerly 23da6e6494] [formerly 509c09ebb0 [formerly 4ae112f6fcc9c2d0bb8715033a80d265dbdfe8b4]]
Former-commit-id: 509c09ebb0
Former-commit-id: 59754c0f6a
 2012-10-10 16:32:36 -05:00
Ben Steffensmeier
7572fa223e Issue #189 remove some deprecated grib functionality 
Former-commit-id: 589b08c5c2 [formerly 797616c72b] [formerly 6fb6762585 [formerly 25f8bfa8c8739f63e088aee7b3536e28620c6494]]
Former-commit-id: 6fb6762585
Former-commit-id: e4e6b0d037
 2012-10-10 16:32:31 -05:00
David Gillingham
e66c3f0928 Issue #1236: Merge tropical automated testing changes from old git repo to common baseline. 
Change-Id: I820b4e09482b52ecd42252bec7eb95c1db741c95

Former-commit-id: 65057b8ced [formerly e27be9180b] [formerly f17309d5f7 [formerly b64085fb436bb8347c3bff529f1c421c665c6438]]
Former-commit-id: f17309d5f7
Former-commit-id: cb7b660c77
 2012-10-02 14:11:32 -05:00
Ben Steffensmeier
a6561786fa Issue #189 changes from code review comments for gridcoverage. 
Former-commit-id: 516742e64a [formerly 94e4f2adb6] [formerly 7f99750ba5 [formerly cfac5882643a0bde47c6f81623dd80ec41604a82]]
Former-commit-id: 7f99750ba5
Former-commit-id: 57d35bb700
 2012-10-01 12:49:28 -05:00
Steven Harris
f5e63d5f93 12.11.1-1 baseline 
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
 2012-09-27 15:57:45 -05:00
Ben Steffensmeier
9512238d6e Issue #189 convert viz/d2d displays from grib to grid. 
Former-commit-id: 8e5b20236d [formerly 9632663c0a] [formerly f918b6636f [formerly 003825d9634299773ad96843cc82d56ded8a1391]]
Former-commit-id: f918b6636f
Former-commit-id: 6c38e6abb2
 2012-09-24 14:05:22 -05:00
James Korman
ccf06fa64e Issue #1206 - Added logging of load of postProcessedModels.xml 
Change-Id: I141c165a5ffefa7a50793fc9e8092239288dfbb8

Former-commit-id: ebf25e384d [formerly 9d332ba278] [formerly 25da735129 [formerly 5eae43298a59973727c537aed3e9ca499d99b135]]
Former-commit-id: 25da735129
Former-commit-id: 6e1230e5b4
 2012-09-20 15:58:40 -05:00
Ben Steffensmeier
d1c3a0c1eb Issue #189 convert grib decoder to produce both grib and grid records. 
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 5f787b6a6b [formerly 4be2aa88c7] [formerly 0132d35871 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]
Former-commit-id: 0132d35871
Former-commit-id: 174d8ad029
 2012-09-20 12:24:35 -05:00
Ben Steffensmeier
6b058ace34 Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin 
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 4fe2127bfb [formerly bd8eb7fc15] [formerly 05849f634d [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]
Former-commit-id: 05849f634d
Former-commit-id: b547d9dd8f
 2012-09-18 15:19:05 -05:00
David Gillingham
28ade875c5 Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo 
XML files, modify ParameterInfo to provide list of valid levels for each
parameter, create utility script to convert A1 CDL to A2 XML format,
modify WeatherElementBrowser so database lists are always current.

Change-Id: If0513ed8ce8c1134e92c6702c58b2a49f17a6dc5

Former-commit-id: 03a202134a [formerly 21739d1d38] [formerly 99ab0a124b [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]
Former-commit-id: 99ab0a124b
Former-commit-id: 964927b19d
 2012-09-13 15:39:58 -05:00
Steve Harris
ec74f638e5 12.10.1-2 baseline 
Former-commit-id: dde1f4c54d [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]
Former-commit-id: a66f3f4b60
Former-commit-id: 34d2ddee9d
 2012-09-11 15:50:57 -05:00
Steve Harris
7fb0b17bd5 12.9.1-5 baseline 
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
 2012-08-21 15:27:03 -05:00
Steve Harris
d7d60cc623 12.9.1-4 baseline 
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: 33b95fb96d
Former-commit-id: 9990bf909b
 2012-08-15 15:19:10 -05:00
Steve Harris
a535b51eba 12.9.1-3 baseline 
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 84bbf2573e
Former-commit-id: edbbacfa8a
 2012-08-15 14:26:10 -05:00
Steve Harris
aed7a644df 12.9.1-1 baseline 
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
 2012-08-15 13:59:00 -05:00
Steve Harris
f2102bfb24 12.7.1-8 baseline 
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
 2012-07-19 16:20:40 -05:00
Steve Harris
dc50bc8443 12.6.1-9 baseline 
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
 2012-07-10 07:53:49 -05:00
Steve Harris
97c4db937e 12.5.1-15 baseline 
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
 2012-06-08 13:39:48 -05:00
Steve Harris
33a67cdd82 12.4.1-10 baseline 
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
 2012-05-01 18:06:13 -05:00
Steve Harris
a2a6a18fae 12.4.1-4 baseline 
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
 2012-04-18 15:18:16 -05:00
Steve Harris
92b7072b82 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client 
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: 7a10ca9766
Former-commit-id: 3d511fe719
 2012-02-23 10:06:18 -06:00
Steve Harris
b55a488ed8 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
 2012-02-22 11:14:43 -06:00
Steve Harris
dd911bed4d Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client 
Former-commit-id: c268da57bc [formerly 4b76d22f77] [formerly cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: cc66c8be24
Former-commit-id: 54b5b6baef
 2012-02-20 12:43:38 -06:00
Steve Harris
1ac6b36d1f Manual merge of SS OB12.1.2-4 changes into ss_sync 
Former-commit-id: c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
 2012-02-17 10:55:02 -06:00