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

447 commits

Author SHA1 Message Date
Richard Peter
a810e06c03 Merge "Issue #728 - Implementation of Statistics graphs peer review comments Changing to use average value rather than sum." into development 
Former-commit-id: e48eef4e8c [formerly 56627c6391] [formerly 3124712dd5 [formerly d4c42ddc3e1f15ec7f415fe1abca1da05ac76ae7]]
Former-commit-id: 3124712dd5
Former-commit-id: 5eb311271a
 2012-11-26 17:36:43 -06:00
Mike Duff
830a3918d9 Issue #728 - Implementation of Statistics graphs 
peer review comments
Changing to use average value rather than sum.

Change-Id: I7f97e27c4f463fe60bec2cbc52f3eac66d8fa77f

Former-commit-id: 4e15f63b4e [formerly c49759d28e] [formerly f000c1a9cf [formerly f15ba1ee009abf4a562bb37450d65f97c7ffa217]]
Former-commit-id: f000c1a9cf
Former-commit-id: 56cd5da64d
 2012-11-26 17:31:29 -06:00
Nate Jensen
47768a36a2 Merge "Issue #1323 Improving framework based on first factory implementation" into development 
Former-commit-id: 72b4ab6ae7 [formerly 912eec5fab] [formerly c665e9c43c [formerly 4d8d7ba7dc2acc827171856657ceea3c8bf13d2f]]
Former-commit-id: c665e9c43c
Former-commit-id: 4c041aa2b0
 2012-11-26 14:27:06 -06:00
Nate Jensen
e8a1a72f31 Issue #1323 Improving framework based on first factory implementation 
Change-Id: I817cb7fbab8ae517cf134e1fd53c9b5c3eee5ab1

Former-commit-id: 7d4aac94c5 [formerly b3602e6bf8] [formerly 9bbba94c53 [formerly f95518ac0b8bb862dc69af9f07d72f286cbea085]]
Former-commit-id: 9bbba94c53
Former-commit-id: a1a21d5af4
 2012-11-26 13:24:37 -06:00
Bryan Kowal
87e0c08179 Issue #1318 - re-order dependencies; the core feature is now dependent on the event feature 
Change-Id: I6639323fc3d3afaef85b35ab6693986d9e4243b0

Former-commit-id: 95efa5f0e0 [formerly 06241d95e0] [formerly f645f60a75 [formerly 31df15583f3b0182736728654b6131fd7d6bc9a8]]
Former-commit-id: f645f60a75
Former-commit-id: f68c9873b7
 2012-11-26 13:06:33 -06:00
Richard Peter
78cad6b0e1 Merge "Issue #189 grid retrieval api. Change-Id: Ice9432ab703420c8d441860de085a8d34a2610c8" into development 
Former-commit-id: 92ff920171 [formerly 0b4f2bd666] [formerly 1cd1f8b793 [formerly dbaf10dc2036589e21245a7166182ee01e401717]]
Former-commit-id: 1cd1f8b793
Former-commit-id: 24e21a3e48
 2012-11-20 11:37:58 -06:00
Ben Steffensmeier
98cab0f2b3 Issue #189 grid retrieval api. 
Change-Id: Ice9432ab703420c8d441860de085a8d34a2610c8

Former-commit-id: 93ac9ccaf2 [formerly 9bccb6ac7c] [formerly 56d375da86 [formerly e0b91523c54227ef15588f5dd672b2450a9dd8ac]]
Former-commit-id: 56d375da86
Former-commit-id: dd1a3154e5
 2012-11-20 11:32:29 -06:00
Richard Peter
cb99915ea1 Merge "Issue #1340 Updates to statistics for common baseline, data delivery stats gathering" into development 
Former-commit-id: 4916961d3e [formerly 5a2ba01a49] [formerly b48635490a [formerly 6176f3ef90779a5b99c99b1cfd8f0ffc60a6f316]]
Former-commit-id: b48635490a
Former-commit-id: ffd6fd3e5e
 2012-11-20 10:25:57 -06:00
Dave Hladky
1e16e81c9e Issue #1340 Updates to statistics for common baseline, data delivery stats gathering 
Change-Id: I0b59f1db8579900c7eb50939d60acfeef2db44b8

Former-commit-id: a2a27224c4 [formerly 44a7fffe3e] [formerly a2106c7cbf [formerly 4571b0066a103973184a8d5732d4a945e95d9638]]
Former-commit-id: a2106c7cbf
Former-commit-id: 9722f92d5e
 2012-11-20 10:22:50 -06:00
Richard Peter
d695c10d87 Merge "Issue #189 clean up unneeded references to grib." into development 
Former-commit-id: 42ce93afa8 [formerly b68a8d986f] [formerly 48e33e05e7 [formerly 6cb68df37fd22b45abcaee309f9f364456905191]]
Former-commit-id: 48e33e05e7
Former-commit-id: 36ce487edc
 2012-11-19 17:16:08 -06:00
Ben Steffensmeier
f0c1fcae31 Issue #189 clean up unneeded references to grib. 
Former-commit-id: 9dd5c8d545 [formerly 7226decbe2] [formerly 7e1463f328 [formerly b25e86c8f369297b8e21efe7cdc0a9874c0cc470]]
Former-commit-id: 7e1463f328
Former-commit-id: 9b1b658f42
 2012-11-19 13:33:02 -06:00
Dustin Johnson
dd03bf9bd5 Issue #1322 Move router registry to edex.xml 
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: dd82a472e5 [formerly 13b1683458] [formerly a9d01486ed [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]
Former-commit-id: a9d01486ed
Former-commit-id: 1bb69653af
 2012-11-19 13:21:03 -06:00
Richard Peter
dc5b3410eb Merge "Issue #1322 Fix ingestGrib modes.xml to include router spring file" into development 
Former-commit-id: ac10bd4c27 [formerly b71c022247] [formerly 657c7a35c5 [formerly d846e934736d3e68f65620640ae2699dfb3c7530]]
Former-commit-id: 657c7a35c5
Former-commit-id: e2f026a6a8
 2012-11-19 12:14:16 -06:00
Dustin Johnson
75feca3cd0 Issue #1322 Fix ingestGrib modes.xml to include router spring file 
Amend:
  Add correct bean name.

Change-Id: Ia210fcc0b9299f5b207c16d5c12b363447c31349

Former-commit-id: 9cfb406675 [formerly ea7e8ac946] [formerly 63db1ce6f8 [formerly a7d9c3ab2b7d1ae5cc1a71ccf1f4a2f76e1a0bc0]]
Former-commit-id: 63db1ce6f8
Former-commit-id: 56ea981db7
 2012-11-19 12:03:31 -06:00
Steve Harris
082e1cbd09 Merge "Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed" into development 
Former-commit-id: 264dc4bc43 [formerly 0d16c0c0df] [formerly 63cdc32988 [formerly 4dac2ba9a01b36885188f93fdaf974099cbc9d0c]]
Former-commit-id: 63cdc32988
Former-commit-id: 91bc36fda3
 2012-11-16 15:35:47 -06:00
Dustin Johnson
a448369b44 Issue #1322 Add server keyed routing 
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: d1024d091c [formerly 87148a8061] [formerly 8a6be78eb0 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 1d5714b994
 2012-11-16 14:43:45 -06:00
Max Schenkelberg
afc4de9a1a Issue #1243 Revert locking in UtilityManager.getFileChecksum to avoid lock timing out until FileLocker can be fixed 
Change-Id: I25ab9832d725647c17aea505514334a7c0026ae7

Former-commit-id: 34c4ec44c3 [formerly 0daa22064b] [formerly 71367ef5bb [formerly a7386c6570455fe6f9175eaeae1225923124cce8]]
Former-commit-id: 71367ef5bb
Former-commit-id: 102c2dbaa1
 2012-11-16 14:12:27 -06:00
Ben Steffensmeier
5126024a6b Issue #189 fix modes for gridcoverage to include converter registration 
Former-commit-id: 1082b1b51d [formerly 1a7560b8a3] [formerly 6b0ed3fa50 [formerly 0c521bea12f61d70ee144149a83cd9f8a492b891]]
Former-commit-id: 6b0ed3fa50
Former-commit-id: 2a0769d094
 2012-11-16 12:25:00 -06:00
Max Schenkelberg
db2fe0b5e8 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: a472f5535b [formerly 655f54b098] [formerly f540f65fd7 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]
Former-commit-id: f540f65fd7
Former-commit-id: f1866b2e49
 2012-11-15 16:21:42 -06:00
Benjamin Phillippe
43b94988c8 Issue #1335 Fixed EHCache warnings. Changes to necessary config files 
Change-Id: Ib6ad30965f32a046a1414bdfb534ec44ed875ce8

Former-commit-id: 44519995ee [formerly 5bf46d468d] [formerly 5c31b34e12 [formerly 6bb4fb29b5dd8e30a19ec63412fbd05348bd87a0]]
Former-commit-id: 5c31b34e12
Former-commit-id: 6b1b73429b
 2012-11-15 13:35:25 -06:00
Max Schenkelberg
5aa26e4f13 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: fe11e31bfb [formerly dcde9e8951] [formerly 28e61c8285 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]
Former-commit-id: 28e61c8285
Former-commit-id: 2e20c3e799
 2012-11-14 16:19:37 -06:00
Nate Jensen
9158625765 Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development 
Former-commit-id: 0398aeaa5b [formerly 49c2079963] [formerly 31637efbbc [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]
Former-commit-id: 31637efbbc
Former-commit-id: 8944e220f6
 2012-11-14 16:09:00 -06:00
Dustin Johnson
5d5dbe27e1 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: d27bce13c2 [formerly bff32bbe58] [formerly 0d1d663f41 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: 0d1d663f41
Former-commit-id: e25b7c312b
 2012-11-14 14:41:57 -06:00
Steve Harris
e35a321a8c 12.12.1-4 baseline 
Former-commit-id: b91b7f0fae [formerly 85130eb611] [formerly 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 57578da521
Former-commit-id: 628ca9e5c6
 2012-11-14 14:19:20 -06:00
Ben Steffensmeier
47759f025b Issue #189 changes to mappings and ncep merge from code review 
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 3d126b41e1 [formerly 2c8f3f09ac] [formerly 2d864c3b09 [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]
Former-commit-id: 2d864c3b09
Former-commit-id: 91254adfd6
 2012-11-14 12:22:53 -06:00
Dustin Johnson
5d410ff934 Issue #1322 Common baseline changes to support BandwidthManager 
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: afd9a767ea [formerly 7d9e7567bd] [formerly 7c59f9ea41 [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]
Former-commit-id: 7c59f9ea41
Former-commit-id: c0c60c2488
 2012-11-14 12:19:10 -06:00
Ron Anderson
9f112f298c Merge "Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb" into development 
Former-commit-id: 29559e851e [formerly 86c4a247cd] [formerly 0fe91e0d95 [formerly 46116a80d319050628e6c8a7d01c7c2d0bb5402f]]
Former-commit-id: 0fe91e0d95
Former-commit-id: 652c27918c
 2012-11-14 11:23:06 -06:00
Ben Steffensmeier
5367f936f4 Issue #189 use maxRecords in GFEDao.getD2DDatabaseIdsFromDb 
Former-commit-id: 6e6823d62d [formerly 5a1a6f2fdb] [formerly 1b4236ccc5 [formerly 26e79c68560dced9b7148e8eebf4a7394461bd7c]]
Former-commit-id: 1b4236ccc5
Former-commit-id: 159817f538
 2012-11-14 11:05:42 -06:00
Steve Harris
397cac3352 Merge "Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml" into development 
Former-commit-id: ac834c0ebb [formerly f5c87b04d6] [formerly 956e1a45da [formerly ce25af9ad1e713bd85fd24f10188c9f46c83da5c]]
Former-commit-id: 956e1a45da
Former-commit-id: a5ca238e96
 2012-11-14 10:19:27 -06:00
Ben Steffensmeier
7590451249 Issue #1331 fix grib-request spring 
Former-commit-id: 23190381cd [formerly b128a3f3c5] [formerly c97223458e [formerly 3b4dda66b20f04915f406df814ca989350794ae7]]
Former-commit-id: c97223458e
Former-commit-id: 60743ec4b1
 2012-11-14 10:07:44 -06:00
Brad Gonzales
cc8ed35821 Issue #1327 Added event-ingest.xml to ingestGrib mode in modes.xml 
Change-Id: I6de95db502206b7b4dda198d61844570ed428862

Former-commit-id: 782ffb92ea [formerly 4af27e092f] [formerly 1617341e2a [formerly 0f6ddf0e3084a4deb48b8e1e36d0ab4d9af78295]]
Former-commit-id: 1617341e2a
Former-commit-id: c024c94050
 2012-11-14 09:39:26 -06:00
Steve Harris
21ecd53719 Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 00f3d51546
Former-commit-id: c8cac52915
 2012-11-13 17:28:50 -06:00
Steve Harris
2e3662028f 12.12.1-3 baseline 
Former-commit-id: a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2797cbcdd0
 2012-11-13 17:27:04 -06:00
Steve Harris
111e7607cf 12.12.1-2 baseline 
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
 2012-11-13 17:14:24 -06:00
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
Mike Duff
b91dca252e Issue #1317 - Fix problem in edexProcessStats.xml 
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03

Former-commit-id: 248db814c1 [formerly 0e32ab85db] [formerly e14b372f42 [formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]
Former-commit-id: e14b372f42
Former-commit-id: 363aa7bec6
 2012-11-13 11:44:02 -06:00
Nate Jensen
9170b7f75e Merge "Issue #1323 initial commit of interfaces of data access framework" into development 
Former-commit-id: b43634a58f [formerly c2631b5ba6] [formerly ff16f82b18 [formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]
Former-commit-id: ff16f82b18
Former-commit-id: 14a139c813
 2012-11-13 09:01:43 -06:00
Nate Jensen
14b61ef0f8 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: 254e88a70c [formerly 8a1f3a10a4] [formerly e51d86ce3a [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]
Former-commit-id: e51d86ce3a
Former-commit-id: cf8fd9f731
 2012-11-12 17:16:07 -06:00
Max Schenkelberg
4408af827f Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml 
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 30c1802398 [formerly d1099addc6] [formerly 00822a4f39 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]
Former-commit-id: 00822a4f39
Former-commit-id: c4e5092f94
 2012-11-12 16:46:21 -06:00
Nate Jensen
cfed9d9664 Issue #1323 initial commit of interfaces of data access framework 
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02

Former-commit-id: b24c9eb456 [formerly f255f65b3c] [formerly bf72e29752 [formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]
Former-commit-id: bf72e29752
Former-commit-id: 78a1185b19
 2012-11-12 16:45:33 -06:00
Ben Steffensmeier
810e0abd77 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: 65441372df [formerly 7d3f479031] [formerly b5b472dee1 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]
Former-commit-id: b5b472dee1
Former-commit-id: 220f41ec4c
 2012-11-12 15:15:49 -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
Richard Peter
b8ea93cb95 Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development 
Former-commit-id: 62e5aff255 [formerly 3450ca3cd3] [formerly 2e9cdbe43e [formerly 6fce68b90116d30cf090db64032322916276136b]]
Former-commit-id: 2e9cdbe43e
Former-commit-id: 4e0c207306
 2012-11-08 13:30:27 -06:00
Dustin Johnson
d0867fedef Issue #1302 Fix spring/project errors pointed out by CAVE spring changes 
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c

Former-commit-id: 1220f5167e [formerly ddaa681d8a] [formerly 9784b563cf [formerly 217a17fe79d9156f03597d72e51ab47325b00991]]
Former-commit-id: 9784b563cf
Former-commit-id: 9bb53555a9
 2012-11-08 12:00:15 -06:00
Nate Jensen
bdbad943ef 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: e3487942ac [formerly 96cb1ecc7f] [formerly 01072652dc [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]
Former-commit-id: 01072652dc
Former-commit-id: 375c864d28
 2012-11-08 11:08:48 -06:00
Mike Duff
7bed38a373 Issue #1317 - Update the stats config files 
Issue #1317 - Peer review comments.

Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f

Former-commit-id: e72c2822ad [formerly 1372c08cdc] [formerly 50f0c4c226 [formerly 8cc9210d25324ab4b5cbd5af3687b371101d282b]]
Former-commit-id: 50f0c4c226
Former-commit-id: 688b7cce30
 2012-11-08 10:15:41 -06:00