Ben Steffensmeier
|
b57a30d18d
|
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: 626f398224 [formerly ed4f88aa22 ] [formerly 69fc030bb4 ] [formerly 626f398224 [formerly ed4f88aa22 ] [formerly 69fc030bb4 ] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]]
Former-commit-id: e8090e654b
Former-commit-id: fa599c93a8 [formerly 109ec1e778 ] [formerly 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3 ]]
Former-commit-id: 1922ebb0208920ac3ef27814907ade54d1a0244a [formerly 7761060a12 ]
Former-commit-id: 9f2f2591ee
|
2012-11-13 16:00:19 -06:00 |
|
Ben Steffensmeier
|
b94d28d028
|
Issue #1108 fix the order of arguments for grib 1 parameter mappings
Former-commit-id: f0add08709 [formerly 894998b95f ] [formerly adf0fec9a2 ] [formerly f0add08709 [formerly 894998b95f ] [formerly adf0fec9a2 ] [formerly c4f99aae63 [formerly adf0fec9a2 [formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]]]]
Former-commit-id: c4f99aae63
Former-commit-id: 3789a954e4 [formerly 5ee5347fc0 ] [formerly dffdc11f9cdd9bfde1d32282b4a7f3429e11fcd4 [formerly 87ec259477 ]]
Former-commit-id: 67cd5bcc093a0594bf1f5fe675ad20437cc9653c [formerly e2b7486803 ]
Former-commit-id: 923731a717
|
2012-11-09 13:36:49 -06:00 |
|
Ben Steffensmeier
|
062505e855
|
Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: a0f6c320cb [formerly 20e618eb4f ] [formerly 535c73051d ] [formerly a0f6c320cb [formerly 20e618eb4f ] [formerly 535c73051d ] [formerly 693090cb36 [formerly 535c73051d [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]]
Former-commit-id: 693090cb36
Former-commit-id: 0f58b01a58 [formerly 7c93db759c ] [formerly 0198876d17ad6ff76ff77ca6660a268c711628d2 [formerly 884c82c4fe ]]
Former-commit-id: da5f64af6d14ef1d9c652871f9f0529b022242a9 [formerly 74d1381180 ]
Former-commit-id: 2223e6ff64
|
2012-11-08 14:45:36 -06:00 |
|
Richard Peter
|
1e69b1df57
|
Merge "Issue #189 add more comments to grib decoder." into development
Former-commit-id: cd8c43078b [formerly 7f49c5fe04 ] [formerly db28cc26aa ] [formerly cd8c43078b [formerly 7f49c5fe04 ] [formerly db28cc26aa ] [formerly 7077a82458 [formerly db28cc26aa [formerly 1ad439769c601fe61365f015bc56da0442553be5]]]]
Former-commit-id: 7077a82458
Former-commit-id: 9e1e81e840 [formerly fa6141c745 ] [formerly 6c3e03fe9fc18f974ee8a5be0a2bda96c5aff4f6 [formerly e1852956e2 ]]
Former-commit-id: acce3fbfc6b39ab02f986035802c76e0077fd4f6 [formerly 80862cd12e ]
Former-commit-id: 19a98b3fad
|
2012-11-08 14:40:05 -06:00 |
|
Ben Steffensmeier
|
8399158199
|
Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: c17b92afc5 [formerly f62cf2713d ] [formerly e6b0751f5c ] [formerly c17b92afc5 [formerly f62cf2713d ] [formerly e6b0751f5c ] [formerly fbed67a208 [formerly e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]]]
Former-commit-id: fbed67a208
Former-commit-id: b664a9e649 [formerly d75b59622a ] [formerly b5eb27fb49abd5ab7570ad430a356c40d5ae9848 [formerly 7c9341a3a6 ]]
Former-commit-id: fe88c86a07e948a680250c58c72bfa9ef94a60ca [formerly 40a07f8998 ]
Former-commit-id: 35b855635f
|
2012-11-08 14:34:55 -06:00 |
|
Richard Peter
|
8f2f705e20
|
Merge "Issue #189 fix another Unknown Model" into development
Former-commit-id: 50ddeed8e6 [formerly 10138f3ae8 ] [formerly 7d8dfb9c01 ] [formerly 50ddeed8e6 [formerly 10138f3ae8 ] [formerly 7d8dfb9c01 ] [formerly 675b1666fd [formerly 7d8dfb9c01 [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]]]
Former-commit-id: 675b1666fd
Former-commit-id: e4aad5fcad [formerly e7151070ee ] [formerly be2444c1dd881e3611f5733295f49ae808e5d940 [formerly ed90d0aa23 ]]
Former-commit-id: 34593cc1e1167309e983c82d0d71f4f54c60ec8b [formerly 1ce242e9f0 ]
Former-commit-id: decf129e94
|
2012-11-08 13:43:37 -06:00 |
|
Dustin Johnson
|
eb82c7672b
|
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: acd4cf94d8 [formerly efd3d3735a ] [formerly 064ef82d1e ] [formerly acd4cf94d8 [formerly efd3d3735a ] [formerly 064ef82d1e ] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: cd5faf58bf [formerly 2d1e886cf3 ] [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09 ]]
Former-commit-id: 58274565203c021076e001f24f089a98cd2216f6 [formerly 6613c51d3b ]
Former-commit-id: b4a13190ad
|
2012-11-08 09:57:16 -06:00 |
|
Steve Harris
|
94cd5a1388
|
12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d ] [formerly e4bd20a515 ] [formerly 8278cac143 [formerly c2839cc86d ] [formerly e4bd20a515 ] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928 ] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63 ]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de ]
Former-commit-id: af59663a99
|
2012-11-07 12:41:20 -06:00 |
|
Ben Steffensmeier
|
0326af03cd
|
Issue #189 fix another Unknown Model
Former-commit-id: 690297bb4d [formerly 643212a0ad ] [formerly eaa7e420df ] [formerly 690297bb4d [formerly 643212a0ad ] [formerly eaa7e420df ] [formerly 64f59b94e4 [formerly eaa7e420df [formerly 7dfb29c93784505c0b3aad37c631afe6f5ecf14f]]]]
Former-commit-id: 64f59b94e4
Former-commit-id: f83085470d [formerly ac8cd2ef9a ] [formerly 37ac8c0d9c2858369d80285a1cb913ef431ee252 [formerly 89efb7cf22 ]]
Former-commit-id: a32b5970a9a36c0800ea8bc2aebc4915ad9d051a [formerly babdbc9b38 ]
Former-commit-id: 69f07fd7f0
|
2012-11-07 10:56:26 -06:00 |
|
Ben Steffensmeier
|
fab50579f4
|
Issue #189 add more comments to grib decoder.
Former-commit-id: f5dede12c7 [formerly 397ebf02f6 ] [formerly 67db4ae4e4 ] [formerly f5dede12c7 [formerly 397ebf02f6 ] [formerly 67db4ae4e4 ] [formerly 237a7ea992 [formerly 67db4ae4e4 [formerly fdc27da79f1da6c2bda0f3061096227d95745c46]]]]
Former-commit-id: 237a7ea992
Former-commit-id: a807ad25e5 [formerly 929df097c0 ] [formerly 5dbb3fd5e45c0a277ff5a82bac79779a4bec375d [formerly d57e097e3d ]]
Former-commit-id: 7cab1d83bfff996eef00a1b20a8586bb75e4fa80 [formerly bc633552fe ]
Former-commit-id: 34be09b488
|
2012-11-06 18:30:03 -06:00 |
|
Ron Anderson
|
4f1b150de1
|
Merge "Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge." into development
Former-commit-id: ddc1ac018c [formerly 5edafa6c86 ] [formerly 257213e491 ] [formerly ddc1ac018c [formerly 5edafa6c86 ] [formerly 257213e491 ] [formerly 52007a3a00 [formerly 257213e491 [formerly a13ecc678d2fb7bf0e58922e07e3b5df60a197f4]]]]
Former-commit-id: 52007a3a00
Former-commit-id: 03849b76b2 [formerly 80ef14539e ] [formerly b18e2a8d7a9e4b4f08cfbf5f9499924acabf1aaa [formerly 1855cb195b ]]
Former-commit-id: 7dbe66d0ca5a66327d71b36ae796b8c2f511212b [formerly 9614307971 ]
Former-commit-id: 3bf08b29e5
|
2012-11-05 17:33:06 -06:00 |
|
Richard Peter
|
cd82d26370
|
Merge "Issue #189 fix several Unknown Models" into development
Former-commit-id: 80023b6c2e [formerly 04f3a7ee16 ] [formerly 9d917020b6 ] [formerly 80023b6c2e [formerly 04f3a7ee16 ] [formerly 9d917020b6 ] [formerly d2e47212c6 [formerly 9d917020b6 [formerly fce6826da3fc3b1848e890e552c566580b4e6f29]]]]
Former-commit-id: d2e47212c6
Former-commit-id: cb2deddbde [formerly 365cd1ad33 ] [formerly 294dda4a2dc90205c94be5617c195eae2d27e3b5 [formerly 199fbdac90 ]]
Former-commit-id: 61254ba454153f9845ee8d0a3fafbdcf435955d0 [formerly 092f0b47e5 ]
Former-commit-id: 5d008d4078
|
2012-11-05 14:03:14 -06:00 |
|
David Gillingham
|
83de696749
|
Issue #1310: Tie D2DParmIdCache rebuilds to grid purge, not grib purge.
Change-Id: I7953a3405c11656f4723b4840ff6e2d15c0a11d7
Former-commit-id: 6cd39983d5 [formerly 4237143dd0 ] [formerly 11f109976e ] [formerly 6cd39983d5 [formerly 4237143dd0 ] [formerly 11f109976e ] [formerly e0c7243c74 [formerly 11f109976e [formerly 358867e5631dab8fbfdf3158d07e3875f949205a]]]]
Former-commit-id: e0c7243c74
Former-commit-id: 5c300c8a66 [formerly d6bbcbe863 ] [formerly 5356d22a44516841823c50737da389c199e73bce [formerly 73c592ccdc ]]
Former-commit-id: c7f6ef8a41396b8becbc83515041a176d0edd662 [formerly 80049b2214 ]
Former-commit-id: 7ee48aad3b
|
2012-11-05 14:00:15 -06:00 |
|
Ben Steffensmeier
|
bd38c91cef
|
Issue #189 fix several Unknown Models
Former-commit-id: 373f7b8d25 [formerly b04bca36d4 ] [formerly 579d2e5ba6 ] [formerly 373f7b8d25 [formerly b04bca36d4 ] [formerly 579d2e5ba6 ] [formerly 365a2274dd [formerly 579d2e5ba6 [formerly 56d97231ac950ad0db6a1063beb5f42483b7d137]]]]
Former-commit-id: 365a2274dd
Former-commit-id: 86b1161cbc [formerly 19caacc7b6 ] [formerly 46e9818a611bcd38c7e2a0dd747646b584e0dc14 [formerly fa29bdf8c0 ]]
Former-commit-id: 4051ba0d78ad12807285172318538e8c4800275a [formerly 2dd884765f ]
Former-commit-id: 6f54171cfb
|
2012-11-02 16:19:46 -05:00 |
|
Ben Steffensmeier
|
d1f5299436
|
Issue #189 update readme with more install notes, remove common subgrid package that was moved to edex, mark several classes deprecated.
Former-commit-id: 4e728158c6 [formerly 9b6833e497 ] [formerly a6ef4957d6 ] [formerly 4e728158c6 [formerly 9b6833e497 ] [formerly a6ef4957d6 ] [formerly c1c55fa7aa [formerly a6ef4957d6 [formerly 99df0ed1cf531a6b60035b79bd5a2cbdf262328d]]]]
Former-commit-id: c1c55fa7aa
Former-commit-id: 2058af5b9f [formerly 11bd701e0a ] [formerly 02699e90e50f6c425f78c163d2e743f7f9771cfc [formerly e4b81a6829 ]]
Former-commit-id: 5e2171ce8bf04d4668a4d8c5719d65395c7d31b1 [formerly 0e69ab3385 ]
Former-commit-id: a097e0f5cd
|
2012-11-02 10:37:42 -05:00 |
|
Dustin Johnson
|
4bc4d95b21
|
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: 7d0e4a6e75 [formerly 8e69107b5a ] [formerly 98d7beae50 ] [formerly 7d0e4a6e75 [formerly 8e69107b5a ] [formerly 98d7beae50 ] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a ] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b ]]
Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388 ]
Former-commit-id: 931d94d1de
|
2012-11-01 13:36:06 -05:00 |
|
Richard Peter
|
0f2e6c97fe
|
Issue #1257: Update PurgeRules to not be hard linked to path keys
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4
Former-commit-id: b2989eb90f [formerly 5787d6278d ] [formerly 275398778f ] [formerly b2989eb90f [formerly 5787d6278d ] [formerly 275398778f ] [formerly 886375172b [formerly 275398778f [formerly 73bca27407552c864765d5924e8609a253493f4c]]]]
Former-commit-id: 886375172b
Former-commit-id: 44b6afb10a [formerly 998278caf7 ] [formerly 3ba6f5a7f032d4b04a9f1b4905d76eb04a5920a4 [formerly bd1d87363a ]]
Former-commit-id: 3ec2c0f1f1a74b387da0ad28f03a1512c353c3f8 [formerly 940d986f6d ]
Former-commit-id: 7df04375f1
|
2012-10-31 18:19:44 -05:00 |
|
Ben Steffensmeier
|
3e225faa8b
|
merge branch Unifeid_Grid into developement
Former-commit-id: c789e1fd94 [formerly 272e057bf1 ] [formerly d0a2ed32b5 ] [formerly c789e1fd94 [formerly 272e057bf1 ] [formerly d0a2ed32b5 ] [formerly b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 0ee5726a56 [formerly 1d94435220 ] [formerly e5e3edb870cf3d09a1893575414b5bd00a8d3081 [formerly 92fd247ccc ]]
Former-commit-id: 51550491838571c9141b390aa875633f1c0b19a4 [formerly 38b0dafe0b ]
Former-commit-id: 1931b503a2
|
2012-10-30 12:24:54 -05:00 |
|
Ben Steffensmeier
|
84ee3cecaa
|
merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e ] [formerly 6a9ff88b33 ] [formerly 1a215cb42a [formerly 4f503d3a1e ] [formerly 6a9ff88b33 ] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 24de750932 [formerly 9b8f2bcdbd ] [formerly de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8 ]]
Former-commit-id: c7706c1a1114c9415a5ad6c33596002a145bf919 [formerly dd5ab10b61 ]
Former-commit-id: 86562637f0
|
2012-10-25 12:22:11 -05:00 |
|
Steve Harris
|
2d368b5b0b
|
12.11.1-6 baseline
Former-commit-id: 58cd1e90f8 [formerly 30c786a885 ] [formerly fba4a443a0 ] [formerly 58cd1e90f8 [formerly 30c786a885 ] [formerly fba4a443a0 ] [formerly 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: ae73939b02 [formerly 8beb6fc0b8 ] [formerly 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14 ]]
Former-commit-id: bfbc6b62be31cb07dee1061fd2ffeb9b2a9e932a [formerly 4f27cbb406 ]
Former-commit-id: 9c597c7060
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
92be4d5105
|
12.11.1-5 baseline
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca ] [formerly 03f3f3c36a ] [formerly bb8fe6e556 [formerly 362d6ffaca ] [formerly 03f3f3c36a ] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]]
Former-commit-id: a0eaf651ff
Former-commit-id: dfdf01de85 [formerly 85ad066b70 ] [formerly 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba ]]
Former-commit-id: 90ed5b647bfe3dc11c44294f7a83b7e770575415 [formerly dff8d5de9c ]
Former-commit-id: 13cdd55545
|
2012-10-18 15:46:42 -05:00 |
|
Richard Peter
|
5b6c0864d8
|
Issue #1257: Revert radar file name changes. Change grib path to just be by master level name.
Change-Id: If3515614408906a5dc0e54b4c8d261fae5fcaf26
Former-commit-id: b8d8783a1d [formerly 36c53a2cc8 ] [formerly 85eb3b7598 ] [formerly b8d8783a1d [formerly 36c53a2cc8 ] [formerly 85eb3b7598 ] [formerly 72acca2422 [formerly 85eb3b7598 [formerly ca23e50157bb0c381dbcd6bf4d4f08bbd0a35f6f]]]]
Former-commit-id: 72acca2422
Former-commit-id: 810861c25a [formerly cfcef0a7b1 ] [formerly 138ec3daed9f4e2b28e4d65ab7a94258646d71aa [formerly 8cb830c1c6 ]]
Former-commit-id: 95d80db3ad50a4b9407b44f79e39dfddd2e1e88e [formerly efdd09b5d6 ]
Former-commit-id: 0986063c20
|
2012-10-17 13:22:00 -05:00 |
|
Steve Harris
|
8794e3b599
|
12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9 ] [formerly d3497e47eb ] [formerly 6e44abdba1 [formerly 98171b5de9 ] [formerly d3497e47eb ] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07 ] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce ]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3 ]
Former-commit-id: 35e34308c5
|
2012-10-16 13:27:07 -05:00 |
|
Richard Peter
|
d16a017c1c
|
Issue #1257: Update grib path keys to include hdf5 layout. Turn on TcpNoDelay
Change-Id: I296d0d4b1c204a325c499b3aeb1f9d7f16de0c9b
Former-commit-id: f5fe7cf872 [formerly e32d77c87f ] [formerly 68ac1abca4 ] [formerly f5fe7cf872 [formerly e32d77c87f ] [formerly 68ac1abca4 ] [formerly c5e3b54caa [formerly 68ac1abca4 [formerly 29b54f75013685f1bcd9ed3129c9ba3ddf629395]]]]
Former-commit-id: c5e3b54caa
Former-commit-id: 4c990fa2b7 [formerly 19797b9064 ] [formerly a0fc10b28ef8f7a0ad614832eb3f6018b40d3685 [formerly a80db469b2 ]]
Former-commit-id: 1c4b8466bae13745e2693b78424e0599547c6d68 [formerly 3ef8bbab2f ]
Former-commit-id: fce0aee1b7
|
2012-10-15 20:15:39 -05:00 |
|
Richard Peter
|
9c9e23d8a2
|
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: 202c7b885e [formerly 12bcfbda80 ] [formerly ca0c9b7502 ] [formerly 202c7b885e [formerly 12bcfbda80 ] [formerly ca0c9b7502 ] [formerly bcb0560291 [formerly ca0c9b7502 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]]]
Former-commit-id: bcb0560291
Former-commit-id: 6c0bfb9858 [formerly 46870808e0 ] [formerly a9406efb61625c7381ceb47856f2fa57a257622d [formerly ce85c8e1a6 ]]
Former-commit-id: cc07adda4c70d3d12938f64d2565a522222ba657 [formerly 881582885c ]
Former-commit-id: 61892fee88
|
2012-10-15 09:52:14 -05:00 |
|
Ben Steffensmeier
|
51d1c03c36
|
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: a67ce9586c [formerly de3769129c ] [formerly 8b7256b1ae ] [formerly a67ce9586c [formerly de3769129c ] [formerly 8b7256b1ae ] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]]
Former-commit-id: 266a2f317f
Former-commit-id: 97c23508d7 [formerly fde1e73d58 ] [formerly aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3 ]]
Former-commit-id: 4391a50cd6a1b526355ffcad5b2b61ac30604784 [formerly b2fdd9283d ]
Former-commit-id: 29777154bb
|
2012-10-12 12:45:50 -05:00 |
|
Ben Steffensmeier
|
4c897de4a8
|
Issue #189 minor fixes to grid for issues discovered during dev tests
Former-commit-id: 735099e934 [formerly fa380d06c1 ] [formerly 23da6e6494 ] [formerly 735099e934 [formerly fa380d06c1 ] [formerly 23da6e6494 ] [formerly 509c09ebb0 [formerly 23da6e6494 [formerly 4ae112f6fcc9c2d0bb8715033a80d265dbdfe8b4]]]]
Former-commit-id: 509c09ebb0
Former-commit-id: 21ce531c20 [formerly 4cacd4a7b1 ] [formerly 627ed14f2e45b950eb951d0e5438cdc4375e3303 [formerly 59754c0f6a ]]
Former-commit-id: f6701bf3b87cd3a761f14792a180ae78fbb00546 [formerly b3a945b203 ]
Former-commit-id: 069958385b
|
2012-10-10 16:32:36 -05:00 |
|
Ben Steffensmeier
|
af85004f92
|
Issue #189 remove some deprecated grib functionality
Former-commit-id: 64aa4cdd79 [formerly 589b08c5c2 ] [formerly 797616c72b ] [formerly 64aa4cdd79 [formerly 589b08c5c2 ] [formerly 797616c72b ] [formerly 6fb6762585 [formerly 797616c72b [formerly 25f8bfa8c8739f63e088aee7b3536e28620c6494]]]]
Former-commit-id: 6fb6762585
Former-commit-id: 4e940be1d6 [formerly 7572fa223e ] [formerly 2328107cbc4d44dc31122ab45df8b37d3d9d6c6f [formerly e4e6b0d037 ]]
Former-commit-id: f59a210888b8fe8c50291a26d629e2ce5aaf32b8 [formerly 5ee9aa83bd ]
Former-commit-id: 7018e0d77f
|
2012-10-10 16:32:31 -05:00 |
|
David Gillingham
|
6531f7ee27
|
Issue #1236: Merge tropical automated testing changes from old git repo to common baseline.
Change-Id: I820b4e09482b52ecd42252bec7eb95c1db741c95
Former-commit-id: 6f1720aae0 [formerly 65057b8ced ] [formerly e27be9180b ] [formerly 6f1720aae0 [formerly 65057b8ced ] [formerly e27be9180b ] [formerly f17309d5f7 [formerly e27be9180b [formerly b64085fb436bb8347c3bff529f1c421c665c6438]]]]
Former-commit-id: f17309d5f7
Former-commit-id: 9860f9eed6 [formerly e66c3f0928 ] [formerly 8ded654ab949ff63a98e7045999dea96969f38da [formerly cb7b660c77 ]]
Former-commit-id: a46b21a9eec00f1adcf2b55a85b6d9d882228b60 [formerly e488b92b68 ]
Former-commit-id: d4004aafbd
|
2012-10-02 14:11:32 -05:00 |
|
Ben Steffensmeier
|
b48277e1a3
|
Issue #189 changes from code review comments for gridcoverage.
Former-commit-id: 71dad77e66 [formerly 516742e64a ] [formerly 94e4f2adb6 ] [formerly 71dad77e66 [formerly 516742e64a ] [formerly 94e4f2adb6 ] [formerly 7f99750ba5 [formerly 94e4f2adb6 [formerly cfac5882643a0bde47c6f81623dd80ec41604a82]]]]
Former-commit-id: 7f99750ba5
Former-commit-id: 3557427a09 [formerly a6561786fa ] [formerly 64c581d84610c78f923da469f663319100baf9b5 [formerly 57d35bb700 ]]
Former-commit-id: 69d2e3611f60275a0348b3e21b99abfbf81dfce0 [formerly 8f40c154fb ]
Former-commit-id: 22e8f3bb1a
|
2012-10-01 12:49:28 -05:00 |
|
Steven Harris
|
db663faca9
|
12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3 ] [formerly 618aa3f316 ] [formerly ffe3641057 [formerly 0e86bfd1d3 ] [formerly 618aa3f316 ] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93 ] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022 ]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83 ]
Former-commit-id: 2f855322f6
|
2012-09-27 15:57:45 -05:00 |
|
Ben Steffensmeier
|
2be6128151
|
Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 54767956bc [formerly 8e5b20236d ] [formerly 9632663c0a ] [formerly 54767956bc [formerly 8e5b20236d ] [formerly 9632663c0a ] [formerly f918b6636f [formerly 9632663c0a [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]]
Former-commit-id: f918b6636f
Former-commit-id: ecdef95d0a [formerly 9512238d6e ] [formerly 7490d8b24afa2934ebd15d8ff27aa170ba918366 [formerly 6c38e6abb2 ]]
Former-commit-id: c681a18cb95fad2c1f4c02dc98365a32a2b66a40 [formerly 769e28c28d ]
Former-commit-id: 231ab11d9a
|
2012-09-24 14:05:22 -05:00 |
|
James Korman
|
5e4a193f5d
|
Issue #1206 - Added logging of load of postProcessedModels.xml
Change-Id: I141c165a5ffefa7a50793fc9e8092239288dfbb8
Former-commit-id: ead0490555 [formerly ebf25e384d ] [formerly 9d332ba278 ] [formerly ead0490555 [formerly ebf25e384d ] [formerly 9d332ba278 ] [formerly 25da735129 [formerly 9d332ba278 [formerly 5eae43298a59973727c537aed3e9ca499d99b135]]]]
Former-commit-id: 25da735129
Former-commit-id: 88579b0bc8 [formerly ccf06fa64e ] [formerly 3c080fd20ee7c1eef3d32b242aee2417733d7966 [formerly 6e1230e5b4 ]]
Former-commit-id: 9628067e30c1d33fb17469bee41b4b1482a19d0b [formerly 464ef9eb58 ]
Former-commit-id: 6fbfa94a6e
|
2012-09-20 15:58:40 -05:00 |
|
Ben Steffensmeier
|
d418d8c7bc
|
Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640
Former-commit-id: 69283c27a8 [formerly 5f787b6a6b ] [formerly 4be2aa88c7 ] [formerly 69283c27a8 [formerly 5f787b6a6b ] [formerly 4be2aa88c7 ] [formerly 0132d35871 [formerly 4be2aa88c7 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]]]
Former-commit-id: 0132d35871
Former-commit-id: 263cfe59f4 [formerly d1c3a0c1eb ] [formerly 6b333c59dfdca8b278d838cd1ed91e9d23e9ae87 [formerly 174d8ad029 ]]
Former-commit-id: 7dc1a53eb5c14b2a4f3a69bbdfcd21cb9ea1c4b6 [formerly 90dc005f25 ]
Former-commit-id: 3b6a1ac6a9
|
2012-09-20 12:24:35 -05:00 |
|
Ben Steffensmeier
|
f13ba32307
|
Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece
Former-commit-id: 9eecab65c0 [formerly 4fe2127bfb ] [formerly bd8eb7fc15 ] [formerly 9eecab65c0 [formerly 4fe2127bfb ] [formerly bd8eb7fc15 ] [formerly 05849f634d [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]]]
Former-commit-id: 05849f634d
Former-commit-id: 6af74b843c [formerly 6b058ace34 ] [formerly 28ed264c21455f309a74a270145d56d9aa7064df [formerly b547d9dd8f ]]
Former-commit-id: f3894ca9c56c5ba2f1f317fbf84aa3eceec77726 [formerly a28984c40c ]
Former-commit-id: 9509d72ef9
|
2012-09-18 15:19:05 -05:00 |
|
David Gillingham
|
d10b8b964d
|
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: 4d7f324f64 [formerly 03a202134a ] [formerly 21739d1d38 ] [formerly 4d7f324f64 [formerly 03a202134a ] [formerly 21739d1d38 ] [formerly 99ab0a124b [formerly 21739d1d38 [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]]]
Former-commit-id: 99ab0a124b
Former-commit-id: a048dee4b3 [formerly 28ade875c5 ] [formerly cfc850e4fc58538a74d0f8c0490660cc9d30f0f8 [formerly 964927b19d ]]
Former-commit-id: da7d3be134a3c74fcdb1e41cda076543ccedbfc9 [formerly 527a457e55 ]
Former-commit-id: dcc5c7789d
|
2012-09-13 15:39:58 -05:00 |
|
Steve Harris
|
4ccea19158
|
12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d ] [formerly 250f0ccac9 ] [formerly bb190a66a1 [formerly dde1f4c54d ] [formerly 250f0ccac9 ] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]]
Former-commit-id: a66f3f4b60
Former-commit-id: 406bde9fd0 [formerly ec74f638e5 ] [formerly f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d ]]
Former-commit-id: c8612b01cf2efa0937102321eb6c14dfe7097005 [formerly cc3c3dadee ]
Former-commit-id: 5684a84a46
|
2012-09-11 15:50:57 -05:00 |
|
Steve Harris
|
98059f9ef1
|
12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44 ] [formerly 61f269f54c ] [formerly 77cbd6c1e5 [formerly a1d931fd44 ] [formerly 61f269f54c ] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5 ] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb ]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed ]
Former-commit-id: 2d928d328e
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
867586657b
|
12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960 ] [formerly dcda3a2290 ] [formerly 71b024e3a1 [formerly 36c108e960 ] [formerly dcda3a2290 ] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3 [formerly d7d60cc623 ] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b ]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501 ]
Former-commit-id: 7e1d1f6e08
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
d7acb65c06
|
12.9.1-3 baseline
Former-commit-id: 8083b81729 [formerly c11f7d396e ] [formerly 36d80b1f60 ] [formerly 8083b81729 [formerly c11f7d396e ] [formerly 36d80b1f60 ] [formerly 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 988563a4b6 [formerly a535b51eba ] [formerly 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a ]]
Former-commit-id: 60681d51155fd0d8fea0ced04f4dc5174712adca [formerly 8c5c5ad6eb ]
Former-commit-id: 03bb51ed0e
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
31353e2296
|
12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9 ] [formerly 31ae7ea218 ] [formerly b9fb1c89d4 [formerly 8309193ce9 ] [formerly 31ae7ea218 ] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df ] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416 ]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121 ]
Former-commit-id: 16d7d955fc
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
23dc8deeb0
|
12.7.1-8 baseline
Former-commit-id: b242dd98d6 [formerly 11f96dbedd ] [formerly 16bf591a33 ] [formerly b242dd98d6 [formerly 11f96dbedd ] [formerly 16bf591a33 ] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972 [formerly f2102bfb24 ] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964 ]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9 ]
Former-commit-id: 36e2ad3023
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
c74431ba29
|
12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868 ] [formerly 2c0ff851ca ] [formerly 32fdf6ed3b [formerly 7c064b6868 ] [formerly 2c0ff851ca ] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443 ] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0 ]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b ]
Former-commit-id: 37f2b6e138
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e ] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f ]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c ]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
7f90924706
|
12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d ] [formerly 9f8cb727a5 ] [formerly 7fa9dbd5fb [formerly 4bfbdad17d ] [formerly 9f8cb727a5 ] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82 ] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5 ]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86 ]
Former-commit-id: 0c25458510
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd ] [formerly 67a5a68300 ] [formerly 4767b0e069 [formerly 750b7543dd ] [formerly 67a5a68300 ] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae ] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd ]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c ]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
43ff909553
|
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: 5a96582f16 [formerly 92084b3f20 ] [formerly d0bbbfefcc ] [formerly 5a96582f16 [formerly 92084b3f20 ] [formerly d0bbbfefcc ] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be [formerly 92b7072b82 ] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719 ]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012 ]
Former-commit-id: 3aef320ffd
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
3a4af24369
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de ] [formerly c8aae98741 ] [formerly 829d2791e9 [formerly 8da36046de ] [formerly c8aae98741 ] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6 [formerly b55a488ed8 ] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963 ]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc ]
Former-commit-id: 978d22db50
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
33aafe9ce0
|
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: d129eab241 [formerly c268da57bc ] [formerly 4b76d22f77 ] [formerly d129eab241 [formerly c268da57bc ] [formerly 4b76d22f77 ] [formerly cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]]
Former-commit-id: cc66c8be24
Former-commit-id: c9a7ff42f4 [formerly dd911bed4d ] [formerly 892342d6ba506e3495ef7df3355174001fd47f5a [formerly 54b5b6baef ]]
Former-commit-id: 589ae505ef0a6ce52a577fd189d1c8eec012a6bd [formerly 09b81c6e00 ]
Former-commit-id: 60bf5aeced
|
2012-02-20 12:43:38 -06:00 |
|
Steve Harris
|
8c9e581f41
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36 ] [formerly 93f6535bd8 ] [formerly 7b4b066a2b [formerly c209d6de36 ] [formerly 93f6535bd8 ] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]
Former-commit-id: b137302802
Former-commit-id: 43c3cfdd1a [formerly 1ac6b36d1f ] [formerly eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24 ]]
Former-commit-id: f9b44e61385fcc409fa97cc2681f13c4a9c57a4a [formerly 895404abeb ]
Former-commit-id: 9a09879521
|
2012-02-17 10:55:02 -06:00 |
|