diff options
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | AUTHORS | 10 | ||||
| -rw-r--r-- | CHANGELOG | 12 | ||||
| -rw-r--r-- | setup.cfg | 3 | ||||
| -rw-r--r-- | swiftbench/__init__.py | 2 | ||||
| -rw-r--r-- | swiftbench/bench.py | 5 |
6 files changed, 27 insertions, 6 deletions
@@ -24,3 +24,4 @@ Victor Rodionov <victor.rodionov@nexenta.com> <vito.ordaz@gmail.com> Florian Hines <syn@ronin.io> <florian.hines@gmail.com> Kun Huang <gareth@unitedstack.com> <academicgareth@gmail.com> Tom Fifield <tom@openstack.org> Tom Fifield <fifieldt@unimelb.edu.au> +Ondrej Novy <ondrej.novy@firma.seznam.cz> @@ -1,6 +1,7 @@ Alex Gaynor <alex.gaynor@gmail.com> Anne Gentle <anne@openstack.org> Chmouel Boudjnah <chmouel@enovance.com> +Christian Schwede <christian.schwede@enovance.com> Chuck Thier <cthier@gmail.com> Clay Gerrard <clay.gerrard@gmail.com> Dan Prince <dprince@redhat.com> @@ -12,6 +13,8 @@ Florian Hines <syn@ronin.io> François Charlier <francois.charlier@enovance.com> Greg Holt <gholt@rackspace.com> Greg Lange <greglange@gmail.com> +Jenkins <jenkins@review.openstack.org> +Jeremy Stanley <fungi@yuggoth.org> Joe Arnold <joe@swiftstack.com> John Dickinson <me@not.mn> Jon Snitow <otherjon@swiftstack.com> @@ -21,11 +24,16 @@ Kun Huang <gareth@unitedstack.com> Maru Newby <mnewby@internap.com> Michael Barton <mike@weirdlooking.com> Monty Taylor <mordred@inaugust.com> -ning_zhang <ning@zmanda.com> +Ondrej Novy <ondrej.novy@firma.seznam.cz> Peter Portante <peter.portante@redhat.com> Samuel Merritt <sam@swiftstack.com> +Sascha Peilicke <saschpe@gmx.de> TheSriram <sriram@klusterkloud.com> +Thiago da Silva <thiago@redhat.com> Tom Fifield <tom@openstack.org> Victor Rodionov <victor.rodionov@nexenta.com> Zap Chang <zapchang@gmail.com> ZhiQiang Fan <aji.zqfan@gmail.com> +dharmendra <dharmendra.kushwaha@nectechnologies.in> +ning_zhang <ning@zmanda.com> +reedip <reedip.banerjee@nectechnologies.in> @@ -1,3 +1,15 @@ +swift-bench (1.2) + + * updated setup.cfg for release tooling + +swift-bench (1.1) + + * Added a storage policy option to allow containers to be created + with a given policy rather than the cluster default. + * eventlet dependency has been raised to >=0.17.4 + * Warn if an HTTP proxy is detected. + * Various other minor fixes + swift-bench (1.0) * Initial release, after moving from OpenStack Swift @@ -10,3 +10,6 @@ detailed-errors = 1 cover-package = swiftbench cover-html = true cover-erase = true + +[metadata] +name = swift-bench diff --git a/swiftbench/__init__.py b/swiftbench/__init__.py index 87d58d5..36173fa 100644 --- a/swiftbench/__init__.py +++ b/swiftbench/__init__.py @@ -1 +1 @@ -__version__ = '1.1-dev' +__version__ = '1.2.1-dev' diff --git a/swiftbench/bench.py b/swiftbench/bench.py index ae44f2f..696b6ad 100644 --- a/swiftbench/bench.py +++ b/swiftbench/bench.py @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import json import re import sys import uuid @@ -32,10 +33,6 @@ import swiftclient as client from swiftbench.utils import config_true_value, using_http_proxy -try: - import simplejson as json -except ImportError: - import json try: from swift.common import direct_client |