resolving conflict w/ merge, cleaning up virtenv setups

This commit is contained in:
Paul Voccio 2010-07-26 23:23:44 -05:00
parent 0082ae2ac4
commit 4199dab2e7
2 changed files with 1 additions and 5 deletions

View File

@ -1,4 +0,0 @@
#!/bin/bash
_TOOLS=`dirname $0`
_VENV=$_TOOLS/../.nova-venv
source $_VENV/bin/activate

View File

@ -72,7 +72,7 @@ def print_help():
To activate the Nova virtualenv for the extent of your current shell session
you can run:
$ source tools/activate_venv.sh
$ source .nova-venv/bin/activate
Or, if you prefer, you can run commands in the virtualenv on a case by case
basis by running: