Skip to content

Commit

Permalink
Merge branch 'liberty' into mitaka
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Breaux committed Jul 26, 2017
2 parents cf180bb + 06fede4 commit 4e9bb01
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ deploy:
- provider: script
skip_cleanup: true
on:
all_branches: true
branch: mitaka
repo: F5Networks/f5-openstack-lbaasv2-driver
condition: $TRAVIS_TAG = ""
script:
Expand Down
15 changes: 5 additions & 10 deletions docs/scripts/test-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,12 @@
set -x
set -e

#echo "Downloading project dependencies"
#pip install --user -e . \
# git+https://github.com/openstack/neutron.git@liberty-eol \
# git+https://github.com/openstack/neutron-lbaas.git@liberty-eol

#curl -O -L https://github.com/F5Networks/neutron-lbaas/releases/download/v9.1.0/f5.tgz
#tar xvf f5.tgz -C /venv/lib/python2.7/dist-packages/neutron_lbaas/drivers/

echo "Building docs and Checking links with Sphinx"
make -C docs html
make -C docs linkcheck

echo "Checking grammar and style"
write-good `find ./docs -not \( -path ./docs/drafts -prune \) -name '*.rst'` --passive --so --no-illusion --thereIs --cliches
write-good `find ./docs -not \( -path ./docs/drafts -prune \) -name '*.rst'` --passive --so --no-illusion --thereIs --cliches

set +e
echo "Checking links"
make -C docs linkcheck
2 changes: 1 addition & 1 deletion f5lbaasdriver/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "9.3.2"
__version__ = "9.3.3.b1"

0 comments on commit 4e9bb01

Please sign in to comment.