Author: tmckay
Date: 2013-02-12 15:56:13 +0000 (Tue, 12 Feb 2013)
New Revision: 5688
Modified:
branches/tmckay/cumin/etc/cumin.conf
branches/tmckay/cumin/python/cumin/util.py
Log:
sigh, more of the same
Modified: branches/tmckay/cumin/etc/cumin.conf
===================================================================
--- branches/tmckay/cumin/etc/cumin.conf 2013-02-12 15:46:46 UTC (rev 5687)
+++ branches/tmckay/cumin/etc/cumin.conf 2013-02-12 15:56:13 UTC (rev 5688)
@@ -13,9 +13,7 @@
[common]
# database: dbname=cumin
-# brokers: localhost:5672
-# sasl-mech-list: [default, 'anonymous' or 'plain digest-md5' with
usr/passw]
-# wallaby-broker: [default, first item in 'brokers' list]
+# wallaby-broker:
http://localhost
# wallaby-refresh: 60
# log-level: info
# log-max-mb: 10
@@ -77,7 +75,7 @@
# Default cumin-data configuration at installation.
# Expiration of samples and vacuuming of the database is handled
# by the data.grid thread.
-datas: data.grid, data.grid-slots, data.grid-submissions, data.sesame
+datas: data.grid, data.grid-slots, data.grid-submissions
# To run a single cumin-data process in a small deployment set 'datas' as
follows
# and optionally modify 'include-classes' and 'exclude-classes' in the
[data]
Modified: branches/tmckay/cumin/python/cumin/util.py
===================================================================
--- branches/tmckay/cumin/python/cumin/util.py 2013-02-12 15:46:46 UTC (rev 5687)
+++ branches/tmckay/cumin/python/cumin/util.py 2013-02-12 15:56:13 UTC (rev 5688)
@@ -6,7 +6,6 @@
from crypt import crypt
from datetime import datetime, timedelta
-from qpid.datatypes import uuid4
from pprint import *
from random import randint
from random import sample
@@ -310,4 +309,4 @@
days = dd * 86400
hours = hh * 3600
minutes = mm * 60
- return days + hours + minutes
\ No newline at end of file
+ return days + hours + minutes