~0x44/nova/bug838466

  • Committer: Todd Willey
  • Date: 2010-07-15 04:21:17 UTC
  • mfrom: (131.1.4)
  • Revision ID: git-v1:fb2ea2cafd67fc1ef67edc969a1edf3a1d2fd7f7
fix merge errors
Filename Latest Rev Last Changed Committer Comment Size
..
changelog 116.6.16 14 years ago Vishvananda Ishaya Fix merge changelog and merge errors in utils.py 6.5 KB Diff Download File
compat 1 14 years ago Jesse Andrews initial commit 2 bytes Diff Download File
control 116.6.16 14 years ago Vishvananda Ishaya Fix merge changelog and merge errors in utils.py 6.1 KB Diff Download File
nova-api.conf 3.3.14 14 years ago Soren Hansen keeper_path is really caled datastore_path. 125 bytes Diff Download File
nova-api.init 3.3.24 14 years ago Soren Hansen Move nova related configuration files into /etc/no 1.3 KB Diff Download File
nova-api.install 3.3.24 14 years ago Soren Hansen Move nova related configuration files into /etc/no 51 bytes Diff Download File
nova-common.dirs 3.3.24 14 years ago Soren Hansen Move nova related configuration files into /etc/no 221 bytes Diff Download File
nova-common.install 116.10.1 14 years ago Vishvananda Ishaya Debian package additions for simple network templa 465 bytes Diff Download File
nova-compute.conf 116.10.1 14 years ago Vishvananda Ishaya Debian package additions for simple network templa 427 bytes Diff Download File
nova-compute.init 3.3.24 14 years ago Soren Hansen Move nova related configuration files into /etc/no 1.4 KB Diff Download File
nova-compute.install 3.3.24 14 years ago Soren Hansen Move nova related configuration files into /etc/no 59 bytes Diff Download File
nova-instancemonitor.init 115 14 years ago Devin Carlen added nova-instancemonitor debian config 1.5 KB Diff Download File
nova-instancemonitor.install 115 14 years ago Devin Carlen added nova-instancemonitor debian config 33 bytes Diff Download File
nova-manage.conf 3.3.20 14 years ago Soren Hansen Add a default flag file for nova-manage to help it 172 bytes Diff Download File
nova-objectstore.conf 3.3.14 14 years ago Soren Hansen keeper_path is really caled datastore_path. 197 bytes Diff Download File
nova-objectstore.init 3.3.24 14 years ago Soren Hansen Move nova related configuration files into /etc/no 1.5 KB Diff Download File
nova-objectstore.install 3.3.24 14 years ago Soren Hansen Move nova related configuration files into /etc/no 128 bytes Diff Download File
nova-objectstore.links 3.3.18 14 years ago Soren Hansen Add a dependency on nginx from nova-objectsstore a 108 bytes Diff Download File
nova-objectstore.nginx.conf 3.3.18 14 years ago Soren Hansen Add a dependency on nginx from nova-objectsstore a 300 bytes Diff Download File
nova-volume.conf 3.3.14 14 years ago Soren Hansen keeper_path is really caled datastore_path. 197 bytes Diff Download File
nova-volume.init 3.3.24 14 years ago Soren Hansen Move nova related configuration files into /etc/no 1.4 KB Diff Download File
nova-volume.install 3.3.24 14 years ago Soren Hansen Move nova related configuration files into /etc/no 57 bytes Diff Download File
pycompat 1 14 years ago Jesse Andrews initial commit 2 bytes Diff Download File
pyversions 1 14 years ago Jesse Andrews initial commit 5 bytes Diff Download File
File rules 1 14 years ago Jesse Andrews initial commit 30 bytes Diff Download File