git.apps.os.sepia.ceph.com Git

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

author	Tommi Virtanen <tv@eagain.net>
	Tue, 13 Sep 2011 21:10:12 +0000 (14:10 -0700)
committer	Tommi Virtanen <tv@eagain.net>
	Tue, 13 Sep 2011 21:10:12 +0000 (14:10 -0700)
commit	bf46fd53942b28cd3c863f11a1cdf327bdc0ba64
tree	34ca6afb8de2fa75cfd504296a74ae6613d7c724	tree \| snapshot
parent	cc72fe6cf3d7d9f831ca322b061293ce47f8877b	commit \| diff
parent	e056686f62baa67dff3936aee771da3939dee4cb	commit \| diff

Merge orchestra into teuthology.

There are too many things called Orchestra out there,
including Ubuntu's new multi-machine service orchestration
framework. The code might still be beneficial outside of
teuthology, but it can be spun off at that time.

Conflicts:
bootstrap
requirements.txt
setup.py

requirements.txt	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

requirements.txt	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history