Dustin Johnson
064ecbb159
Issue #1322 Add server keyed routing
...
Amend:
Remove ServiceLoader files for RequestRouter.
Resolve peer review comments.
Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b
Former-commit-id: 22c930824c
[formerly d1024d091c
] [formerly 87148a8061
] [formerly 22c930824c
[formerly d1024d091c
] [formerly 87148a8061
] [formerly 8a6be78eb0
[formerly 87148a8061
[formerly d7010894ecd0d1702567d52260fdf6088468eb09]]]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 9b9f41cb5a
[formerly a448369b44
] [formerly 0e562f6e19c01c0c23b34e7e423696a3b7663f29 [formerly 1d5714b994
]]
Former-commit-id: 960ecc6840d0a9a5daf8843cf376de88f65aa067 [formerly 2afb19d76b
]
Former-commit-id: 08f3910ece
2012-11-16 14:43:45 -06:00
Max Schenkelberg
0cf0cec449
Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed
...
Change-Id: I25ab9832d725647c17aea505514334a7c0026ae7
Former-commit-id: 8b497d5900
[formerly 34c4ec44c3
] [formerly 0daa22064b
] [formerly 8b497d5900
[formerly 34c4ec44c3
] [formerly 0daa22064b
] [formerly 71367ef5bb
[formerly 0daa22064b
[formerly a7386c6570455fe6f9175eaeae1225923124cce8]]]]
Former-commit-id: 71367ef5bb
Former-commit-id: 09c3fa90aa
[formerly afc4de9a1a
] [formerly abe81bf3cd4269bfb4f9905a69a85f5a8e3dafd3 [formerly 102c2dbaa1
]]
Former-commit-id: d6b0b16d2c9a2fc53d971c3121462eb681da9d9c [formerly 755c64bfdc
]
Former-commit-id: dc4876fa33
2012-11-16 14:12:27 -06:00
Ben Steffensmeier
cdf020c370
Issue #189 fix modes for gridcoverage to include converter registration
...
Former-commit-id: 27f6224e91
[formerly 1082b1b51d
] [formerly 1a7560b8a3
] [formerly 27f6224e91
[formerly 1082b1b51d
] [formerly 1a7560b8a3
] [formerly 6b0ed3fa50
[formerly 1a7560b8a3
[formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 4135b1ad21
[formerly 5126024a6b
] [formerly 0225fcc4d96c0f4eb7101fbb5dc6255eb318fcbc [formerly 2a0769d094
]]
Former-commit-id: f60fc16527266f7a3df7c30bc25390365c9b1b12 [formerly 13f8f28c2e
]
Former-commit-id: 268f7cb64d
2012-11-16 12:25:00 -06:00
Max Schenkelberg
f980bf1d4f
Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
...
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737
Former-commit-id: a40abfda65
[formerly a472f5535b
] [formerly 655f54b098
] [formerly a40abfda65
[formerly a472f5535b
] [formerly 655f54b098
] [formerly f540f65fd7
[formerly 655f54b098
[formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]]]
Former-commit-id: f540f65fd7
Former-commit-id: d86550c239
[formerly db2fe0b5e8
] [formerly 6ed55cce2d899bb904eca4a9886c9f8d39f745d2 [formerly f1866b2e49
]]
Former-commit-id: b6193bec079d86df90df890267f3f0fecb331b78 [formerly 7ffce5cd45
]
Former-commit-id: a94b9c173d
2012-11-15 16:21:42 -06:00
Benjamin Phillippe
46cbdc741d
Issue #1335 Fixed EHCache warnings. Changes to necessary config files
...
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8
Former-commit-id: 1fa596463d
[formerly 44519995ee
] [formerly 5bf46d468d
] [formerly 1fa596463d
[formerly 44519995ee
] [formerly 5bf46d468d
] [formerly 5c31b34e12
[formerly 5bf46d468d
[formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]]]
Former-commit-id: 5c31b34e12
Former-commit-id: 41647b0274
[formerly 43b94988c8
] [formerly d2f70d8685a2cd0f6ca4f66510f619573250a39a [formerly 6b1b73429b
]]
Former-commit-id: e5d6b1e32304c3b9436510d0224ab4073c0f9011 [formerly 688e19acc1
]
Former-commit-id: debdd584fd
2012-11-15 13:35:25 -06:00
Max Schenkelberg
ecde93e6fc
Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
...
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.
Amend: Rebased
Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567
Former-commit-id: 61f0c0501b
[formerly fe11e31bfb
] [formerly dcde9e8951
] [formerly 61f0c0501b
[formerly fe11e31bfb
] [formerly dcde9e8951
] [formerly 28e61c8285
[formerly dcde9e8951
[formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]]
Former-commit-id: 28e61c8285
Former-commit-id: 91607fb03e
[formerly 5aa26e4f13
] [formerly 5f777b3fc72c55ae811d6c28a223bff8a71b24e9 [formerly 2e20c3e799
]]
Former-commit-id: 2d176fd248163b3e85988708b437bfc1e899b487 [formerly 429ddc7312
]
Former-commit-id: eec401909b
2012-11-14 16:19:37 -06:00
Nate Jensen
0dc2166356
Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development
...
Former-commit-id: c4cc7b638c
[formerly 0398aeaa5b
] [formerly 49c2079963
] [formerly c4cc7b638c
[formerly 0398aeaa5b
] [formerly 49c2079963
] [formerly 31637efbbc
[formerly 49c2079963
[formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]]]
Former-commit-id: 31637efbbc
Former-commit-id: c281cd6661
[formerly 9158625765
] [formerly 0bf1056e5bebc6db3ad2c4e0bf1d7112695b64f7 [formerly 8944e220f6
]]
Former-commit-id: cb5b6558e1c8f1296d96b7f556b9a32c12b8431e [formerly 25602f0183
]
Former-commit-id: 46f902852f
2012-11-14 16:09:00 -06:00
Dustin Johnson
c6dbe1bc0c
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: 069c8d4788
[formerly d27bce13c2
] [formerly bff32bbe58
] [formerly 069c8d4788
[formerly d27bce13c2
] [formerly bff32bbe58
] [formerly 0d1d663f41
[formerly bff32bbe58
[formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]]
Former-commit-id: 0d1d663f41
Former-commit-id: 08fd67e94a
[formerly 5d5dbe27e1
] [formerly 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b
]]
Former-commit-id: bcac2231856130f2c05f39f9472f65a6c8313dca [formerly ff33643234
]
Former-commit-id: 6d21c445c2
2012-11-14 14:41:57 -06:00
Steve Harris
ccb16b9b44
12.12.1-4 baseline
...
Former-commit-id: b968ab5135
[formerly b91b7f0fae
] [formerly 85130eb611
] [formerly b968ab5135
[formerly b91b7f0fae
] [formerly 85130eb611
] [formerly 57578da521
[formerly 85130eb611
[formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]]
Former-commit-id: 57578da521
Former-commit-id: 4300583fc2
[formerly e35a321a8c
] [formerly 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6
]]
Former-commit-id: 83b699079d09b1ae989d5d92097f6ebe23a8c242 [formerly 493f335c0b
]
Former-commit-id: 2c2bfc949d
2012-11-14 14:19:20 -06:00
Ben Steffensmeier
88ccafacce
Issue #189 changes to mappings and ncep merge from code review
...
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47
Former-commit-id: 233398088a
[formerly 3d126b41e1
] [formerly 2c8f3f09ac
] [formerly 233398088a
[formerly 3d126b41e1
] [formerly 2c8f3f09ac
] [formerly 2d864c3b09
[formerly 2c8f3f09ac
[formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]]]
Former-commit-id: 2d864c3b09
Former-commit-id: 069028be40
[formerly 47759f025b
] [formerly 93da211e0f7547578a2ee201bcf8f17e845566f7 [formerly 91254adfd6
]]
Former-commit-id: e4d04345db41c59b5fd45edf11fdb36401df1850 [formerly 84abe4fa4f
]
Former-commit-id: e57c669f2e
2012-11-14 12:22:53 -06:00
Dustin Johnson
f4fc1060be
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: f1cfa9a60d
[formerly afd9a767ea
] [formerly 7d9e7567bd
] [formerly f1cfa9a60d
[formerly afd9a767ea
] [formerly 7d9e7567bd
] [formerly 7c59f9ea41
[formerly 7d9e7567bd
[formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]]]
Former-commit-id: 7c59f9ea41
Former-commit-id: 21dc859b85
[formerly 5d410ff934
] [formerly caae98dd9803817a99d22d4cbbe38eccdaeff2f9 [formerly c0c60c2488
]]
Former-commit-id: 0453e709fd374f851f35d3dfd273d46e8e3bbc65 [formerly 3129d3bd3a
]
Former-commit-id: 0c5a52f3b1
2012-11-14 12:19:10 -06:00
Ron Anderson
8e80989c76
Merge "Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb" into development
...
Former-commit-id: 31d37c7a8f
[formerly 29559e851e
] [formerly 86c4a247cd
] [formerly 31d37c7a8f
[formerly 29559e851e
] [formerly 86c4a247cd
] [formerly 0fe91e0d95
[formerly 86c4a247cd
[formerly 46116a80d319050628e6c8a7d01c7c2d0bb5402f]]]]
Former-commit-id: 0fe91e0d95
Former-commit-id: 6a2f93a290
[formerly 9f112f298c
] [formerly 57456c56cf1258f5f07f6b333d1c42e7c804071e [formerly 652c27918c
]]
Former-commit-id: aee4171ea8900a7297e87f2ffb6c5e46cedc6142 [formerly 7a828a608c
]
Former-commit-id: 499a0f888a
2012-11-14 11:23:06 -06:00
Ben Steffensmeier
d04b50ce84
Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb
...
Former-commit-id: af2808c4f4
[formerly 6e6823d62d
] [formerly 5a1a6f2fdb
] [formerly af2808c4f4
[formerly 6e6823d62d
] [formerly 5a1a6f2fdb
] [formerly 1b4236ccc5
[formerly 5a1a6f2fdb
[formerly 26e79c68560dced9b7148e8eebf4a7394461bd7c]]]]
Former-commit-id: 1b4236ccc5
Former-commit-id: 1fe90be139
[formerly 5367f936f4
] [formerly 5960908c4df2a4a5a484c956e47d7a5861f6bc10 [formerly 159817f538
]]
Former-commit-id: 4092985a83a2da81f61e0bd48cedd09d7277c87d [formerly 6093c7cf31
]
Former-commit-id: 1231facebe
2012-11-14 11:05:42 -06:00
Steve Harris
8c348e81ad
Merge "Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml" into development
...
Former-commit-id: fb70b19b31
[formerly ac834c0ebb
] [formerly f5c87b04d6
] [formerly fb70b19b31
[formerly ac834c0ebb
] [formerly f5c87b04d6
] [formerly 956e1a45da
[formerly f5c87b04d6
[formerly ce25af9ad1e713bd85fd24f10188c9f46c83da5c]]]]
Former-commit-id: 956e1a45da
Former-commit-id: 0e13c45e0b
[formerly 397cac3352
] [formerly 16c5eaa729364210458557da2e30a37a959c6022 [formerly a5ca238e96
]]
Former-commit-id: 7e4e88a9a74612e3e4514a6d49ddbaefbd65757b [formerly 71648c8d59
]
Former-commit-id: b543be0ff1
2012-11-14 10:19:27 -06:00
Ben Steffensmeier
80df234f6c
Issue #1331 fix grib-request spring
...
Former-commit-id: 2ca7447dee
[formerly 23190381cd
] [formerly b128a3f3c5
] [formerly 2ca7447dee
[formerly 23190381cd
] [formerly b128a3f3c5
] [formerly c97223458e
[formerly b128a3f3c5
[formerly 3b4dda66b20f04915f406df814ca989350794ae7]]]]
Former-commit-id: c97223458e
Former-commit-id: 7e06343c7c
[formerly 7590451249
] [formerly 2b1b7db15036a1c0cfab26f1a1c0221fd8283b45 [formerly 60743ec4b1
]]
Former-commit-id: d0a1deffbd294676d92bcff73c40f492c188b4a5 [formerly 3736a94482
]
Former-commit-id: dede328be5
2012-11-14 10:07:44 -06:00
Brad Gonzales
41724473c1
Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml
...
Change-Id: I6de95db502206b7b4dda198d61844570ed428862
Former-commit-id: de29d9feba
[formerly 782ffb92ea
] [formerly 4af27e092f
] [formerly de29d9feba
[formerly 782ffb92ea
] [formerly 4af27e092f
] [formerly 1617341e2a
[formerly 4af27e092f
[formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]]]
Former-commit-id: 1617341e2a
Former-commit-id: e092183f27
[formerly cc8ed35821
] [formerly f8f796be57c18271c59de81d8c886b4407b52ee5 [formerly c024c94050
]]
Former-commit-id: de69544595b3c7f2cd1e6325947b28b15e0de06f [formerly dfc125236d
]
Former-commit-id: ec0fc6417a
2012-11-14 09:39:26 -06:00
Steve Harris
b5fd6ed2fd
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 1ee8938748
[formerly 8fc896f7d4
] [formerly 448dd1c35f
] [formerly 1ee8938748
[formerly 8fc896f7d4
] [formerly 448dd1c35f
] [formerly 00f3d51546
[formerly 448dd1c35f
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]]
Former-commit-id: 00f3d51546
Former-commit-id: 98670f1cc2
[formerly 21ecd53719
] [formerly 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915
]]
Former-commit-id: 02f982c590df771367e3d55fa354bfe951bed8de [formerly 59efd9a217
]
Former-commit-id: ae9d9985cd
2012-11-13 17:28:50 -06:00
Steve Harris
f21d879641
12.12.1-3 baseline
...
Former-commit-id: 48fa2a9106
[formerly a81c46987b
] [formerly c999505fba
] [formerly 48fa2a9106
[formerly a81c46987b
] [formerly c999505fba
] [formerly b3b5e6d28f
[formerly c999505fba
[formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 5f628acefd
[formerly 2e3662028f
] [formerly b188535ef6619becad681ca44d5bacd7a27bb351 [formerly 2797cbcdd0
]]
Former-commit-id: 379f849720c82d98605dec3a6a94876bfa6a52fb [formerly 314495dc8e
]
Former-commit-id: 7058ebec23
2012-11-13 17:27:04 -06:00
Steve Harris
9e4dbe2640
12.12.1-2 baseline
...
Former-commit-id: 7192b19284
[formerly ed809a02db
] [formerly a8560580f8
] [formerly 7192b19284
[formerly ed809a02db
] [formerly a8560580f8
] [formerly 6868eb9b23
[formerly a8560580f8
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 5365b72401
[formerly 111e7607cf
] [formerly 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed
]]
Former-commit-id: 0a26a9f757bec6107dd0eb5024ce9aaf5d84b865 [formerly 96a4a4f3f5
]
Former-commit-id: 53d74c66e7
2012-11-13 17:14:24 -06:00
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
Mike Duff
48b3a2fa10
Issue #1317 - Fix problem in edexProcessStats.xml
...
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03
Former-commit-id: 24aa44a46d
[formerly 248db814c1
] [formerly 0e32ab85db
] [formerly 24aa44a46d
[formerly 248db814c1
] [formerly 0e32ab85db
] [formerly e14b372f42
[formerly 0e32ab85db
[formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]]]
Former-commit-id: e14b372f42
Former-commit-id: 5aadd96ae5
[formerly b91dca252e
] [formerly 965fd4a7f301467fa40bb5165f739960f012cec8 [formerly 363aa7bec6
]]
Former-commit-id: 51bc6f29597e663341c326541b8f01a260c10c5d [formerly 4771bb25ac
]
Former-commit-id: 3eee332949
2012-11-13 11:44:02 -06:00
Nate Jensen
ef31519264
Merge "Issue #1323 initial commit of interfaces of data access framework" into development
...
Former-commit-id: 73636a68e9
[formerly b43634a58f
] [formerly c2631b5ba6
] [formerly 73636a68e9
[formerly b43634a58f
] [formerly c2631b5ba6
] [formerly ff16f82b18
[formerly c2631b5ba6
[formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]]]
Former-commit-id: ff16f82b18
Former-commit-id: 6719a66001
[formerly 9170b7f75e
] [formerly bdd1ffdd3e03e63afdf42976f2fb37cc88db659c [formerly 14a139c813
]]
Former-commit-id: 14719f603c1220f9a9fd7977012472ec241180a1 [formerly 61beb174fe
]
Former-commit-id: e99e40f886
2012-11-13 09:01:43 -06:00
Nate Jensen
6c6feff5ab
Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
...
Former-commit-id: 35ea1b7773
[formerly 254e88a70c
] [formerly 8a1f3a10a4
] [formerly 35ea1b7773
[formerly 254e88a70c
] [formerly 8a1f3a10a4
] [formerly e51d86ce3a
[formerly 8a1f3a10a4
[formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]]]
Former-commit-id: e51d86ce3a
Former-commit-id: 826c997e0b
[formerly 14b61ef0f8
] [formerly 41eca00d43f0977ae5f16683be5bae42fb520906 [formerly cf8fd9f731
]]
Former-commit-id: b90abea64ee950c05accfd4ff636e4e81d7537dd [formerly d94afa6a55
]
Former-commit-id: 0f982fbf32
2012-11-12 17:16:07 -06:00
Max Schenkelberg
9de9bb8cb1
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: 1ed5f10230
[formerly 30c1802398
] [formerly d1099addc6
] [formerly 1ed5f10230
[formerly 30c1802398
] [formerly d1099addc6
] [formerly 00822a4f39
[formerly d1099addc6
[formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]]
Former-commit-id: 00822a4f39
Former-commit-id: 25f5a9b1aa
[formerly 4408af827f
] [formerly 5eaaf2b42110ba677fab87f22b62f6cd269072be [formerly c4e5092f94
]]
Former-commit-id: ce52baa9c7936da99037dab8b484c380e17a0b39 [formerly 9a13824af2
]
Former-commit-id: c6b516ff9e
2012-11-12 16:46:21 -06:00
Nate Jensen
7a6797dd62
Issue #1323 initial commit of interfaces of data access framework
...
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02
Former-commit-id: d7f7152e93
[formerly b24c9eb456
] [formerly f255f65b3c
] [formerly d7f7152e93
[formerly b24c9eb456
] [formerly f255f65b3c
] [formerly bf72e29752
[formerly f255f65b3c
[formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]]]
Former-commit-id: bf72e29752
Former-commit-id: 6d3beb139e
[formerly cfed9d9664
] [formerly 321cb3de1f60b624ae9aad5c85b473334d3d249e [formerly 78a1185b19
]]
Former-commit-id: 614aba708193784746c4469f65a0cc453381e39b [formerly 5b837a1b13
]
Former-commit-id: 7fce83f574
2012-11-12 16:45:33 -06:00
Ben Steffensmeier
e93dcd17d2
Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
...
Former-commit-id: dfe697a59c
[formerly 65441372df
] [formerly 7d3f479031
] [formerly dfe697a59c
[formerly 65441372df
] [formerly 7d3f479031
] [formerly b5b472dee1
[formerly 7d3f479031
[formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]]]
Former-commit-id: b5b472dee1
Former-commit-id: 58ba7be711
[formerly 810e0abd77
] [formerly 4bb07970a3378bedd6d8d48f328087592e3c8036 [formerly 220f41ec4c
]]
Former-commit-id: 223e4373f81b95cb6e11301886a243f1b7c34c53 [formerly 94d44ed440
]
Former-commit-id: 19f9437de6
2012-11-12 15:15:49 -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
Richard Peter
95f360eadf
Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
...
Former-commit-id: fbe5195de2
[formerly 62e5aff255
] [formerly 3450ca3cd3
] [formerly fbe5195de2
[formerly 62e5aff255
] [formerly 3450ca3cd3
] [formerly 2e9cdbe43e
[formerly 3450ca3cd3
[formerly 6fce68b90116d30cf090db64032322916276136b]]]]
Former-commit-id: 2e9cdbe43e
Former-commit-id: 4699630bee
[formerly b8ea93cb95
] [formerly a52da4e3f534d6b1c014b4090e04029d85686d2b [formerly 4e0c207306
]]
Former-commit-id: f86b250fd3d09f2abe58e40dde9aedc0200a1b48 [formerly e72818025a
]
Former-commit-id: 04bd114046
2012-11-08 13:30:27 -06:00
Dustin Johnson
2a67e36e56
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
...
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: 67e02347b5
[formerly 1220f5167e
] [formerly ddaa681d8a
] [formerly 67e02347b5
[formerly 1220f5167e
] [formerly ddaa681d8a
] [formerly 9784b563cf
[formerly ddaa681d8a
[formerly 217a17fe79d9156f03597d72e51ab47325b00991]]]]
Former-commit-id: 9784b563cf
Former-commit-id: 0eb86d565e
[formerly d0867fedef
] [formerly 4d6abc650d9441b7590743271c86e80abcff2657 [formerly 9bb53555a9
]]
Former-commit-id: 4d8009edd28c60ab7a3978054089c3f8ebdd0b7f [formerly cd392c40bf
]
Former-commit-id: 1ac34361b4
2012-11-08 12:00:15 -06:00
Nate Jensen
c01ba565ff
Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development
...
Former-commit-id: 00dcf33480
[formerly e3487942ac
] [formerly 96cb1ecc7f
] [formerly 00dcf33480
[formerly e3487942ac
] [formerly 96cb1ecc7f
] [formerly 01072652dc
[formerly 96cb1ecc7f
[formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]]]
Former-commit-id: 01072652dc
Former-commit-id: 650f477e09
[formerly bdbad943ef
] [formerly aaf573b212c0441c984a07ad356d4eb57494bd79 [formerly 375c864d28
]]
Former-commit-id: 37993b2f7b4b612fb5581e122656c2af79b9c13d [formerly 7430e8dbfe
]
Former-commit-id: d70b6dd868
2012-11-08 11:08:48 -06:00
Mike Duff
1311448ee0
Issue #1317 - Update the stats config files
...
Issue #1317 - Peer review comments.
Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f
Former-commit-id: 7398e4fd68
[formerly e72c2822ad
] [formerly 1372c08cdc
] [formerly 7398e4fd68
[formerly e72c2822ad
] [formerly 1372c08cdc
] [formerly 50f0c4c226
[formerly 1372c08cdc
[formerly 8cc9210d25324ab4b5cbd5af3687b371101d282b]]]]
Former-commit-id: 50f0c4c226
Former-commit-id: 26210e06ef
[formerly 7bed38a373
] [formerly f2b77e9dc771b60a8323ff83614ff068514ec645 [formerly 688b7cce30
]]
Former-commit-id: 439fa8528bc980d4f66acf555660ffd2ad83b7b3 [formerly a4574d22b1
]
Former-commit-id: d08fca46ef
2012-11-08 10:15:41 -06:00
Max Schenkelberg
23f933d9c3
Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time.
...
Change-Id: Icc7f89812936f97029e2a06adbc527ec658d8d9b
Former-commit-id: 001d0710e7
[formerly 5f0b4286ba
] [formerly 9aa4221fdf
] [formerly 001d0710e7
[formerly 5f0b4286ba
] [formerly 9aa4221fdf
] [formerly c80dbffad8
[formerly 9aa4221fdf
[formerly 598e0268c95155536fb94798cc134d18b2566dbc]]]]
Former-commit-id: c80dbffad8
Former-commit-id: 577a6e3631
[formerly c219fcb112
] [formerly 07b9c0188335e4ff522ce4e82831fe234a9fdd70 [formerly 0a410412db
]]
Former-commit-id: 9e391025cbbca9821f11536724c5e64f2e425fde [formerly d7afa4376e
]
Former-commit-id: f1a74fb0c5
2012-11-08 10:08:38 -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
Bryan Kowal
8e8c6cb350
Issue #1318 - fix first dat dependency issue.
...
Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78
Former-commit-id: 872c104321
[formerly a4d6021e5f
] [formerly 079fdb33a0
] [formerly 872c104321
[formerly a4d6021e5f
] [formerly 079fdb33a0
] [formerly 88a5451ce1
[formerly 079fdb33a0
[formerly 0087827da79fedd354a227bad4e02aa76cebc684]]]]
Former-commit-id: 88a5451ce1
Former-commit-id: d68619f4a7
[formerly b45ba40abf
] [formerly 8fa4f436be1875e2804bfffd7d8de4c33cfcbff3 [formerly 4f36912786
]]
Former-commit-id: 57b98543bd4dbe98b81e2898652d512aac412692 [formerly 1b19c0f3c0
]
Former-commit-id: c25250edd9
2012-11-08 07:27:39 -06:00
Nate Jensen
5d362c8a85
Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
...
Former-commit-id: b0bb920fde
[formerly 20a63254e2
] [formerly b32a9e839e
] [formerly b0bb920fde
[formerly 20a63254e2
] [formerly b32a9e839e
] [formerly 6b205399d4
[formerly b32a9e839e
[formerly 1902ab64c3ab11c41af906e5d78368689833561f]]]]
Former-commit-id: 6b205399d4
Former-commit-id: 19b0afefc5
[formerly 2fe69a5871
] [formerly 04ac668436ffe2114a4379e6e35db8978db0e543 [formerly e3208d48a0
]]
Former-commit-id: 9da7f44423baa4bda5048fd140e50b9a387e9505 [formerly 01e11761d8
]
Former-commit-id: 04c843cb1b
2012-11-07 18:18:06 -06:00
Brad Gonzales
b0faa6b4b3
Issue #1309 added units to Aggregate.java and AggregateRecord.java
...
Amend:
Changed ProcessEvent.processingTime and ProcessEvent.processingLatency to longs.
Removed Unit from AggregateRecord.java.
Change-Id: If4f6fccb65c584055d68129874a398d6391155e7
Former-commit-id: 04d7e36077
[formerly 2a0b6ad151
] [formerly 577df6943e
] [formerly 04d7e36077
[formerly 2a0b6ad151
] [formerly 577df6943e
] [formerly 4c49c9116d
[formerly 577df6943e
[formerly 3afbeecdaecfb9ab7cea7e59db688639dbdad972]]]]
Former-commit-id: 4c49c9116d
Former-commit-id: 39f635354a
[formerly 69d7fe5cd0
] [formerly c5ea7dd8201ef99851ee8be6489272c0127fe903 [formerly b17893d7e0
]]
Former-commit-id: ba8ce43b0c907cff5e4697dc142aa31acfe21997 [formerly c25fc27e89
]
Former-commit-id: edfed65902
2012-11-07 15:36:44 -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
Nate Jensen
465fbb8653
Merge "Issue #1276 - v1.0 of multiple WA deployment support" into development
...
Former-commit-id: 1f4489d2b0
[formerly 904120bb43
] [formerly 2cf2e79f34
] [formerly 1f4489d2b0
[formerly 904120bb43
] [formerly 2cf2e79f34
] [formerly 433a79e689
[formerly 2cf2e79f34
[formerly bab65855839a69e29d90582e021d13ae439242ce]]]]
Former-commit-id: 433a79e689
Former-commit-id: 4ee5577111
[formerly 87a1701dd1
] [formerly 9c3cc271de1ac44980ed1712255104bfb1f2fbf2 [formerly b3ecd946ff
]]
Former-commit-id: d5887ed5a9ee84d5fe88f4639ed6afb641139653 [formerly ed96e701d7
]
Former-commit-id: 5783705d57
2012-11-07 11:04:45 -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
Max Schenkelberg
3a1cefc612
Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
...
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345
Former-commit-id: 94e64c9b0d
[formerly f069f34a96
] [formerly 2f90120248
] [formerly 94e64c9b0d
[formerly f069f34a96
] [formerly 2f90120248
] [formerly ca4177dd08
[formerly 2f90120248
[formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]]
Former-commit-id: ca4177dd08
Former-commit-id: f9e6347863
[formerly 5a5bd522a1
] [formerly 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9
]]
Former-commit-id: 0f95dc114844e36c224300902fd5c26ef83108c0 [formerly 50625b0453
]
Former-commit-id: 2345861756
2012-11-07 10:44:42 -06:00
Richard Peter
2609c54a32
Merge "Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties." into development
...
Former-commit-id: aabb8e044f
[formerly ec86e24f71
] [formerly 51638344a8
] [formerly aabb8e044f
[formerly ec86e24f71
] [formerly 51638344a8
] [formerly 67471e4453
[formerly 51638344a8
[formerly 45cd4048eeda02b7eb8199e4514ad4ec9f3b7c03]]]]
Former-commit-id: 67471e4453
Former-commit-id: 958dbf764b
[formerly ef5c835118
] [formerly d3cbb46324df3cfba56fa79184278dbeae927e05 [formerly 9125602f3a
]]
Former-commit-id: a769e240c518766bfac03649957d96f970b9d19a [formerly fc8324eb44
]
Former-commit-id: dfa2c5f943
2012-11-07 09:32:25 -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
Bryan Kowal
aea2a6e1d0
Issue #1276 - v1.0 of multiple WA deployment support
...
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5
Former-commit-id: 7ecbbdfdbb
[formerly cae04523db
] [formerly 9263a0ac57
] [formerly 7ecbbdfdbb
[formerly cae04523db
] [formerly 9263a0ac57
] [formerly 4fd43ee45c
[formerly 9263a0ac57
[formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]]]]
Former-commit-id: 4fd43ee45c
Former-commit-id: 4f02bbc98e
[formerly d928e2f257
] [formerly 16e7831852267916f15c8ff6963b429fd72ee1c5 [formerly 2c14ea1bb7
]]
Former-commit-id: 7c8688d9c7ce55813d21a7b1c007f541fa3341e5 [formerly 2cd64bd5cc
]
Former-commit-id: cf7ae375b9
2012-11-06 16:13:26 -06:00
Richard Peter
9eb6774757
Issue #1257 : Fix Tropical Test Tool
...
Change-Id: I50c1d7e703d0d5e825ab9825f7fdbcd17ac0e49b
Former-commit-id: 76e97d7ab4
[formerly 449ad67f82
] [formerly 45b25ead66
] [formerly 76e97d7ab4
[formerly 449ad67f82
] [formerly 45b25ead66
] [formerly e3da5faf40
[formerly 45b25ead66
[formerly ffb46aa8beab26ce61aa27eaeb8da41a417a24c0]]]]
Former-commit-id: e3da5faf40
Former-commit-id: 977450cdfb
[formerly 76102aa826
] [formerly dd02dbc917361787e7d1e6779798e6d39049b7dd [formerly 415cc64c14
]]
Former-commit-id: fb7117074b745314a6805b95e86e4d1c8189f425 [formerly d1b406ed52
]
Former-commit-id: 6789b4d3af
2012-11-06 08:47:41 -06:00
Brad Gonzales
9e5526bb0f
Issue #1305 updated ProcessEvent with quantitative statistics. removed duplicate processStats.properties.
...
Amend:
removed groupBy attribute "fileName"
added LogLevel enum and attribute to Event.java. Default level is DEBUG.
Change-Id: I13c155b1fae19cf5a3c82fbb633bf6c7fb217c07
Former-commit-id: 7acf0f1874
[formerly cbce70fd0b
] [formerly 6ddd1cbdb3
] [formerly 7acf0f1874
[formerly cbce70fd0b
] [formerly 6ddd1cbdb3
] [formerly a4bc175653
[formerly 6ddd1cbdb3
[formerly 51802e671ac15d451fec19262dfa7a352f0e4c09]]]]
Former-commit-id: a4bc175653
Former-commit-id: fcfc68b5aa
[formerly 5257f9a81a
] [formerly d18adde3f073af91cd602064130a1c394a72bc1b [formerly ce47edb905
]]
Former-commit-id: 745ce4007b06b68179c46700454bf8b93c78ff89 [formerly d226ca28c4
]
Former-commit-id: 803ac115ff
2012-11-06 07:31:19 -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