Skip to content

Commit

Permalink
Merge branch 'release/1.2.2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
glennmatthews committed Feb 19, 2015
2 parents 7adcb70 + 90d817a commit 6cf1984
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Common OVF Tool (COT)
=====================

[![build status](https://api.travis-ci.org/glennmatthews/cot.svg?branch=develop)](https://travis-ci.org/glennmatthews/cot)
[![Coverage Status](https://coveralls.io/repos/glennmatthews/cot/badge.svg?branch=develop)](https://coveralls.io/r/glennmatthews/cot?branch=develop)
[![Documentation Status](https://readthedocs.org/projects/cot/badge/?version=latest)](https://readthedocs.org/projects/cot/?badge=latest)
[![build status](https://api.travis-ci.org/glennmatthews/cot.svg?branch=master)](https://travis-ci.org/glennmatthews/cot)
[![Coverage Status](https://coveralls.io/repos/glennmatthews/cot/badge.svg?branch=master)](https://coveralls.io/r/glennmatthews/cot?branch=master)
[![Documentation Status](https://readthedocs.org/projects/cot/badge/?version=stable)](https://readthedocs.org/projects/cot/?badge=stable)

COT (the Common OVF Tool) is a tool for editing
[Open Virtualization Format](http://dmtf.org/standards/ovf)
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ COT: the Common OVF Tool
.. image:: https://coveralls.io/repos/glennmatthews/cot/badge.svg?branch=master
:target: https://coveralls.io/r/glennmatthews/cot?branch=master
:alt: Coverage Status
.. image:: https://readthedocs.org/projects/cot/badge/?version=latest
:target: https://readthedocs.org/projects/cot/?badge=latest
.. image:: https://readthedocs.org/projects/cot/badge/?version=stable
:target: https://readthedocs.org/projects/cot/?badge=stable
:alt: Documentation Status

COT (the Common OVF Tool) is a tool for editing `Open Virtualization Format`_
Expand Down
4 changes: 2 additions & 2 deletions docs/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Introduction
src="https://coveralls.io/repos/glennmatthews/cot/badge.svg?branch=master"
alt="Coverage Status">
</a>
<a href="https://readthedocs.org/projects/cot/?badge=latest">
<img src="https://readthedocs.org/projects/cot/badge/?version=latest"
<a href="https://readthedocs.org/projects/cot/?badge=stable">
<img src="https://readthedocs.org/projects/cot/badge/?version=stable"
alt="Documentation Status">
</a>
</p>
Expand Down

0 comments on commit 6cf1984

Please sign in to comment.