Merge remote-tracking branch 'gh/next'

Browse Source

Conflicts:
	suites/fs/recovery/tasks/client-limits.yaml
	suites/fs/recovery/tasks/mds-full.yaml
	tasks/ceph_deploy.py

...

This commit is contained in:

Sage Weil 2015-05-05 16:32:35 -07:00

parent e4a7106bb0 7bfe0c3a87

commit 1bfedda6d7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available