Commit Graph

997 Commits

Author SHA1 Message Date
Joe Buck
6c5a7af1b4 move multi_region_enabled() into util class
Moving a helper function into a more general
location so that it can be used by other
classes.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-28 08:59:15 -07:00
Sage Weil
951177b8e5 internal: whitelist btrfs lock imbalance bug 6097
Signed-off-by: Sage Weil <sage@inktank.com>
2013-08-27 21:41:39 -07:00
Josh Durgin
232e3d32bc Fix undefined symbol errors
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-27 15:58:14 -07:00
Sage Weil
502714ba2e admin_socket: fix retry-on-error behavior
Signed-off-by: Sage Weil <sage@inktank.com>
2013-08-26 18:14:37 -07:00
Sage Weil
77706c674c internal: remove (hopefully obsolete) kern.log checks
Signed-off-by: Sage Weil <sage@inktank.com>
2013-08-26 13:48:32 -07:00
Sage Weil
711a02449f internal: unbreak syslog BUG checks and gz
This broke back in ace4cb07b2

Signed-off-by: Sage Weil <sage@inktank.com>
2013-08-26 13:47:07 -07:00
Sage Weil
5ec5e2c0e2 ceph_manager: wait for dump_ops_in_flight on osd revival
Wait for a command that implies a complete startup instead of
'version' (which does not).

Fixes: #5924
Signed-off-by: Sage Weil <sage@inktank.com>
2013-08-24 22:01:45 -07:00
Zack Cerza
0e872533f2 Fix upgrading edge-ish case 2013-08-22 09:49:53 -05:00
Sage Weil
de270b080b install: use get() in _get_config_value_for_remote
Fixes: #6080
Signed-off-by: Sage Weil <sage@inktank.com>
Tested-by: Tamil Muthamizhan <tamil.muthamizhan@inktank.com>
2013-08-21 16:45:46 -07:00
Joe Buck
520a9384c5 radosgw-admin: use check_status for task success
Alter the code to use the 'check_status=True'
option in rgwadmin() rather than following the
call with 'assert not err'. Should make the
tests a bit more clear and result in a more
useful error (throw the call stack rather than
just 'assert new err failed').

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-21 12:38:53 -07:00
Joe Buck
ff2a209f8d radosgw-admin: adding radosgw-admin tests
Adding tests for syncing buckets between
RGWs. Fulfills ticket #5605.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-21 12:38:44 -07:00
Joe Buck
549bac3ede radosgw-admin: use dynamic ports for testing
The rgw.py task was extended to  dynamically
assign port numbers to radosgateways.
This patch extends the radosgw-admin task
to use those ports rather than making out-dated
assumptions of port numbering.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-08-20 21:21:17 -07:00
Alfredo Deza
0a8a1c98b0 Merge pull request #41 from ceph/wip-3791
Various usability and documentation fixes
2013-08-19 14:10:18 -07:00
Joe Buck
558237e5f5 Detect multi-region test cases
Enable multi-region calls and tests only if
the configuration has specified a
radosgw-agent tastk.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-17 08:47:58 -07:00
Sage Weil
e625316d02 kernel: fix sha1
6f8910eca4 inadvertantly started
using the ceph sha1 for the kernel.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-08-16 22:34:26 -07:00
Joe Buck
bbf7c71183 radosgw-agent: adding debug logging
Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-08-16 19:26:41 -07:00
Joe Buck
8a47230d82 rename variables and log messages to be more clear
A few edits to make logging and variable names
more clear.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-08-16 19:26:33 -07:00
Joe Buck
7061e3c6dc rgw: fix domain root pool name assignment
Do not make the domain root pool the same
as the zone root pool. That causes sync issues.
Also, clarify a logging message.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-08-16 19:26:21 -07:00
Joe Buck
b883e338cd radosgw-admin: correct white space mistake
Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-08-16 19:26:09 -07:00
Warren Usui
694cd67048 Fix ARM releases to be quantal armv7l releases.
Made grub execution conditional and not done when ARM.
Use ctx parameter to change machine type to tala.
Fix kernel assignments when running ARM systems.

Fixes: #5000
Signed-off-by: Warren Usui <warren.usui@inktank.com>
2013-08-16 15:44:54 -07:00
Warren Usui
47224f2da3 Revert "Fix ARM releases to be quantal armv7l releases."
This reverts commit aabfabc34c.
2013-08-16 15:01:01 -07:00
wusui
666b2a4834 Merge pull request #40 from ceph/wip-teutharm-wusui
Wip teutharm wusui
2013-08-16 14:47:59 -07:00
Warren Usui
aabfabc34c Fix ARM releases to be quantal armv7l releases.
Made grub execution conditional and not done when ARM.
Use ctx parameter to change machine type to tala.
Fix kernel assignments when running ARM systems.

Fixes: #5000
Signed-off-by: Warren Usui <warren.usui@inktank.com>
2013-08-16 14:39:00 -07:00
Joe Buck
a39e7f1b09 Adding multi-region tests
Adding tests for ticket #5604 to test
user propagation via the radosgw-agent.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-16 10:38:12 -07:00
Zack Cerza
d74eefd9eb Use the json format for raw_cluster_status(). 2013-08-16 11:24:55 -05:00
Joe Buck
2c9ac3e0ee Detect multi-region test cases
Enable multi-region calls and tests only if
the configuration has specified a
radosgw-agent tastk.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-16 09:09:46 -07:00
Zack Cerza
6115d456f2 Do more than just sleep and raise an exception. 2013-08-16 10:17:18 -05:00
Sandon Van Ness
4a47eedce7 Fixing assumed typo.
Assuming this has to be a typo but its breaking the ceph-deploy
task.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2013-08-15 19:00:54 -07:00
Zack Cerza
17667301f3 Don't raise an exception if apt-key list fails 2013-08-15 12:42:47 -05:00
Zack Cerza
f41436abd5 Tweak regex to work for non-FQDN hostnames 2013-08-15 09:57:27 -05:00
Zack Cerza
5746efbbc2 Fix some instances where print is being used instead of log 2013-08-15 08:49:35 -05:00
Zack Cerza
f1c9125f27 Fix a case where _get_config_value_for_remote could return None mistakenly 2013-08-13 13:30:22 -05:00
Sage Weil
0f3d9eddd9 Merge remote-tracking branch 'gh/next' 2013-08-13 11:03:00 -07:00
Sage Weil
000efc658d samba: wait longer for smbd to start
sleep(1) is occasionally not long enough, it seems!
2013-08-13 11:02:40 -07:00
Zack Cerza
13edfe6bdf Merge pull request #28 from alfredodeza/5887
Allow a user to define a ceph-deploy branch to use (instead of master)
2013-08-13 09:10:45 -07:00
Alfredo Deza
ac78bc9069 Merge pull request #24 from ceph/wip-5937
Don't hit an AttributeError if ctx.config['overrides'] is set to None
2013-08-13 08:57:18 -07:00
Alfredo Deza
643da65e83 remove fallback of the fallback. so silly
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
2013-08-13 11:56:37 -04:00
Zack Cerza
3aa995a62a Remove three characters just for Alfredo 2013-08-13 10:45:53 -05:00
Alfredo Deza
70cd884f42 safer fallback. Updates docstring
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
2013-08-13 11:42:22 -04:00
Joe Buck
d4c2576c34 radosgw-agent.py: refactor, enable overrides
Refactored the radosgw-agent.py code so that it
is structured more like existing teuthology
tasks.
Additionally, added code to enable:
using the override field in YAML files,
specifying which radosgw-agent github branch
to use checkout and for the YAML file to
specify one of the following: a full sync,
an incremental sync and the starting of the
test radosgw-agent server (previously the
server was always started by this task).

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-12 23:25:57 -07:00
Joe Buck
1d90d7bc83 rgw.py: fix example config
In the example config, the region root and
zone root where pointing to the same pool,
which is not a best practice. Updated the
example to show them pointing to different pools.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-08-12 23:25:43 -07:00
Joe Buck
9ee6452404 rgw.py: add a better error message
When pulling region info from the config
structure, if the region info isn't there,
log a more helpful message.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-08-12 23:25:33 -07:00
Joe Buck
e517cd4cfc s3readwrite.py: make user creation optional
Extend the s3readwrite.py task to enable the
creation and deletion of users for the s3readwrite
tests to be independently specified with the default
assumption to both being true.
This is needed for tests that will create a user and
data in one execution and read it in another.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-08-12 23:25:24 -07:00
Joe Buck
e3b9add3fb rgw.py: refactor configure
Extend the rados pool configuration options to
specify all pools (if desired).
Also, reordered zone and region configuration
so that they're configure (per client) in
this order: zone, region, set default region

Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-08-12 23:25:16 -07:00
Joe Buck
18e80147f3 rgy.py: make log_(data|metadata) configurable
The log_data and log_metadata are made configurable
via the YAML file and default to false
(meaning neither data nor metadata operations are
logged).

Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-08-12 23:25:06 -07:00
Yehuda Sadeh
3fb53189d0 agent name should also contain port number
otherwise multiple agents per machines will have the same id

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-08-12 23:24:13 -07:00
Yehuda Sadeh
4adc1da58a radosgw-admin: various multiregion related fixes and changes
Go to the master zone in the master region for radosgw-admin
operations. Trigger metadata sync. Other fixes.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-08-12 23:24:04 -07:00
Dan Mick
fa733e43d3 Change "Exception" to "RuntimeError" as advised by zackc
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-08-12 15:43:02 -07:00
Dan Mick
28e42197d8 tasks/ceph-deploy: allow configurations with no mds
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-08-12 14:55:14 -07:00
Zack Cerza
93b532f0bf Don't hit an AttributeError if ctx.config['overrides'] is set to None 2013-08-12 16:18:42 -05:00
Zack Cerza
cabb4142d1 Make this module pep8-clean. 2013-08-12 11:40:04 -05:00
Sage Weil
5aee4a8b6c Merge pull request #22 from ceph/rpm-upgrades
Fix rpm upgrades for nested branch configs
2013-08-10 11:35:05 -07:00
Zack Cerza
7c377cb77c Make _get_baseurlinfo_and_dist() provide the correct uri 2013-08-10 12:45:21 -05:00
Zack Cerza
251cbf7fd7 Merge pull request #21 from ceph/rpm-upgrades
Make install.upgrade work on RPM-based systems.
2013-08-09 16:26:39 -07:00
Zack Cerza
b78a6c779b Make install.upgrade work with CentOS/RHEL/Fedora. 2013-08-09 17:01:36 -05:00
Sage Weil
a0e74a9614 admin_socket: split command into multiple arguments
We were passing the command as a single string, but that does not work the
same way it used to.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-08-09 09:04:25 -07:00
Alfredo Deza
6acee41c07 add a key for ceph-deploy-branch detection
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
2013-08-06 15:20:56 -07:00
Joe Buck
70f4eeb970 s3readwrite.py: enable overrides
Enable s3readwrite task to have the branch to
download specified and for overrides to be
incorporated into the config at run-time.
Code based on the s3tests.py task.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-06 12:15:37 -07:00
Sage Weil
18580c1d9c Merge remote-tracking branch 'gh/next' 2013-08-04 14:54:26 -07:00
Sage Weil
89347539ad samba: wait for smbd process to exit
I saw

2013-08-03T12:56:26.641 DEBUG:teuthology.orchestra.run:Running [10.214.131.28]: 'sudo killall -9 smbd'
2013-08-03T12:56:26.727 DEBUG:teuthology.orchestra.run:Running [10.214.131.28]: 'sudo lsof /home/ubuntu/cephtest/93695/mnt.0'
2013-08-03T12:56:26.830 INFO:teuthology.orchestra.run.out:[10.214.131.28]: COMMAND   PID USER   FD   TYPE DEVICE SIZE/OFF NODE NAME
2013-08-03T12:56:26.830 INFO:teuthology.orchestra.run.out:[10.214.131.28]: smbd    12381 root  cwd    DIR    0,0        0    1 /home/ubuntu/cephtest/93695/mnt.0

which makes me think we just need to wait a moment before
attempting the umount?

Signed-off-by: Sage Weil <sage@inktank.com>
2013-08-04 14:54:20 -07:00
Joe Buck
4bd5b591d4 rgw.py: add None object check when parsing info
The rgw task was failing to check for a None object
when parsing user info in the case where there were
config options set for the client that did not include
user info (e.g. valgrind: ).
2013-08-03 17:16:52 -07:00
Sage Weil
98f35a5e49 rgw: do not ignore leaks
Signed-off-by: Sage Weil <sage@inktank.com>
2013-08-02 12:00:18 -07:00
Joe Buck
3accf1c68a rgw.py: adding a safety check
Correcting a bug where specifying
a rgw server for a client but not specifying
a system user would throw an exception.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-01 21:05:15 -07:00
Josh Durgin
9110c7d8ca rgw: add log settings to example config
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-01 19:12:05 -07:00
Josh Durgin
1787a72ef0 radosgw-agent: get verbose logs from the agent
This makes it a lot easier to debug.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-01 19:12:03 -07:00
Josh Durgin
1ec9c1b4b8 radosgw-agent: move zone extraction to helper
This will be useful for other tasks.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-01 19:12:02 -07:00
Josh Durgin
fdde365858 rgw: don't make domain_root pool the same as zone root
These are supposed to be separate pools.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-01 19:12:01 -07:00
Josh Durgin
d79a2db578 rgw: create system users with the --system flag
without this they have no special permissions

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-01 19:11:59 -07:00
Joe Buck
3eb62d2a36 rgy.py: make log_(data|metadata) configurable
The log_data and log_metadata are made configurable
via the YAML file and default to false
(meaning neither data nor metadata operations are
logged).

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-01 19:11:58 -07:00
Josh Durgin
ef68b98822 radosgw-agent: rename task to match tool name
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-01 17:33:36 -07:00
Josh Durgin
189e04fa88 rgw_sync_agent: fix a bunch of issues
- Read ceph.conf from stored copy that includes overrides
- Get system users and keys from cluster instead of reading other
  tasks' yaml, which may not be complete.
- Put zone info extraction from the cluster into utility functions,
  since it'll be useful for other tests later.
- Work with more than one agent on a single host
- Accept more than one client to run, like almost every other task
- Rename target to dest for consistency with radosgw-agent
- Don't make everything one large function

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-01 17:33:36 -07:00
Josh Durgin
ad6a9e537f rgw: ignore exit status when removing base apache dir
subdirs have already been removed, and this only needs to succeed once
per host.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-08-01 17:33:35 -07:00
Greg Farnum
f930f39b18 rgw_sync_agent: add new rgw_sync_agent task
This pulls access data out of the rgw task and off disk,
and then downloads, sets up, and runs an rgw sync agent
in test mode.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-08-01 17:33:35 -07:00
Joe Buck
1552a4b97a rgw.py: check for empty client config
Fixes a bug where an rgw client without
a system user specified would cause teuthology
to error out.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-08-01 10:28:26 -07:00
Joe Buck
7f76c1ced1 rgw.py: refactoring to separate user creation
By separating out the user creation from
generating the region/zone info, we can generate
users for RGW tests that run against the default
pools.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-07-31 16:02:42 -07:00
Joe Buck
8c8e9a1403 rgw.py: change --secret-key to --secret
A 'user create' call was being passed to radosgw-admin
with '--secret-key' instead of the valid '--secret'
which was causing a random secret to be generated,
which was causing subsequent tests to fail.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
2013-07-31 14:18:20 -07:00
Josh Durgin
1f7127b243 s3/swift tests: call radosgw-admin as the right client
This allows the right region and zone info to be read from ceph.conf

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-07-31 13:32:58 -07:00
Josh Durgin
2f2108b3c0 rgw: fix dir creation and keyring
fastcgi_sock dir needs to exist before radosgw starts, and apache-execed radosgw needs an explicit keyring argument.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-07-31 12:47:48 -07:00
Sandon Van Ness
74b344e980 Reconnect after running chef task.
Just a simple change to reconnect to SSH after running
ceph-qa-chef to get around things like ulimit changes.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2013-07-30 17:26:59 -07:00
Sandon Van Ness
00c2ac5b2c Fix RHEL/centos ceph-deploy installs.
Use a hiphen as a diliminator instead of a dot.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2013-07-30 12:36:12 -07:00
Samuel Just
e1cd49bd45 ceph_manager: wait 20s before wait_for_clean in test_map_discontinuity
Fixes: #5806
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-07-30 10:47:22 -07:00
Warren Usui
bcf467c803 Remove now unnecessary try/except/raise that came about as a result of
the previous check-in.

Fixes: #5803
Signed-off-by: Warren Usui <warren.usui@inktank.com>
2013-07-30 10:41:14 -07:00
Warren Usui
48a977e0f2 Always raise exception if yum install fails. This avoids later confusion when
packages are missing (the old code skipped 'Nothing to do' messages, but these
cases are still errors).

Fixes #5803
Signed-off-by: Warren Usui <warren.usui@inktank.com>
Reviewed by: Sandon Van Ness
2013-07-30 10:40:47 -07:00
Samuel Just
8284e19226 ceph_manager: wait for all_up in test_map_discontinuity
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-07-29 13:45:24 -07:00
Samuel Just
e703942ce4 ceph_manager: allow-experimental-feature now causes an EINVAL
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-07-29 12:12:24 -07:00
Yehuda Sadeh
9dac3fe809 s3tests: clone correct branch
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-29 09:09:51 -07:00
Sage Weil
0158f0db9d adjust-ulimits: 16k open files
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-28 15:09:43 -07:00
Sage Weil
496c6773ac ceph_manager, dump_stuck: fix injectargs args
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-27 17:56:08 -07:00
Josh Durgin
73adf33346 radosgw-admin: fix typo in import
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-07-27 12:30:52 -07:00
Sage Weil
45ce9b0b54 valgrind: suppress curl, gnutlss, libfcgi leaks
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-27 07:49:11 -07:00
Sage Weil
a039d4ada7 ceph_manager: don't mark out an out osd on kill_osd(..., mark_out=True)
Fixes

2013-07-27T02:02:23.879 INFO:teuthology.task.thrashosds.thrasher:Recovered, killing an osd
2013-07-27T02:02:23.879 INFO:teuthology.task.thrashosds.thrasher:Killing osd 2, live_osds are [3, 4, 0, 1, 5, 2]
2013-07-27T02:02:24.547 INFO:teuthology.task.thrashosds.thrasher:Removing osd 2, in_osds are: [4, 0, 1, 5]
...
ValueError: list.remove(x): x not in list

Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-27 07:48:55 -07:00
Sage Weil
404f6d245b rest-api: rename
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-26 18:21:21 -07:00
Warren Usui
3f0340f45f Add rest_api, a new task that starts up /usr/bin/ceph-rest-api running
as a daemon.

Fixes: 5613
Signed-off-by: Warren Usui <warren.usui@inktank.com>
2013-07-26 18:20:16 -07:00
Josh Durgin
f2cddda154 rgw: correct socket option name
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-07-26 14:18:24 -07:00
Josh Durgin
699d0a3b27 rgw: add rgw log socket to daemonized radosgw too
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-07-26 14:15:28 -07:00
Josh Durgin
65172a0938 rgw: pass socket path directly to radosgw
Only radosgw needs this option, and each one will be different, so
remove it from the ceph.conf template.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-07-26 14:13:19 -07:00
Samuel Just
a355d9f570 ceph_manager: add test_map_discontinuity to thrasher
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-07-26 10:40:58 -07:00
Greg Farnum
a0b51b1f31 samba: run lsof and fuser after shutdown
The clients are pretty regularly reporting busy on unmount when
samba runs above them. This will hopefully give us some info about why.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-07-26 09:39:26 -07:00
Sandon Van Ness
f19bcfc9df Merge branch 'master' of github.com:ceph/teuthology 2013-07-25 19:50:39 -07:00
Sandon Van Ness
41cafb1a10 Merge remote-tracking branch 'origin/wip-sandon-vm'
Conflicts:
	teuthology/lock.py
	teuthology/misc.py
	teuthology/task/install.py
2013-07-25 19:50:02 -07:00