diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-07-26 13:13:41 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-07-26 13:13:41 -0400 |
| commit | d4803039c19a01087964c499c7e9ef9abfa82f74 (patch) | |
| tree | 6e8ac36399f6a7863eecca88ff6255af1cf46a59 /nova/context.py | |
| parent | 8501cc95aa60a0a5759cf911e8adaf624fa9e547 (diff) | |
| parent | 48a6bf42b3af5323d35f9a31bd4233712165b276 (diff) | |
| download | nova-d4803039c19a01087964c499c7e9ef9abfa82f74.tar.gz nova-d4803039c19a01087964c499c7e9ef9abfa82f74.tar.xz nova-d4803039c19a01087964c499c7e9ef9abfa82f74.zip | |
merging trunk; resolving conflicts
Diffstat (limited to 'nova/context.py')
0 files changed, 0 insertions, 0 deletions