]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Tue, 5 May 2015 23:32:35 +0000 (16:32 -0700)
committerSage Weil <sage@redhat.com>
Tue, 5 May 2015 23:32:35 +0000 (16:32 -0700)
commit1bfedda6d73a8ee7dd27202f87baab19f50b869f
tree3a2dde6d7e7ea521deece8a61ebbbe93d4527639
parente4a7106bb0c53e64c1f66698f5b78faf978e7f9f
parent7bfe0c3a8745abea289b2587014cbaaf90b9e79f
Merge remote-tracking branch 'gh/next'

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