9738 Commits

Author SHA1 Message Date
Jesse Andrews
b158f8fd25 reorder imports spacing 2010-07-15 18:13:48 -05:00
Jesse Andrews
c61357ab70 remove import of vendor since we have PPA now 2010-07-15 11:07:40 -05:00
Todd Willey
7afbe8a15f remove vendor 2010-07-15 01:31:16 -04:00
Todd Willey
e8d63d985e update copyrights 2010-07-15 01:28:51 -04:00
Joshua McKenty
de81a044f6 Merge branch 'master' of github.com:angst/cc 2010-07-14 22:11:48 -07:00
Todd Willey
789f07b24b Merge branch 'master' into rackspace_api 2010-07-15 00:48:44 -04:00
Todd Willey
91a768b748 fix merge errors 2010-07-15 00:21:17 -04:00
Todd Willey
46175789ca Merge branch 'master' into vpnredis
Conflicts:
	nova/auth/users.py
2010-07-14 23:46:23 -04:00
Todd Willey
9e0258f91b Merge branch 'master' into apply_api
Conflicts:
	nova/compute/network.py
	nova/utils.py
2010-07-14 23:42:55 -04:00
Todd Willey
5e9312ae01 Merge branch 'master' into apply_api
Conflicts:
	nova/compute/node.py
	nova/volume/storage.py
2010-07-14 19:32:07 -04:00
Vishvananda Ishaya
d018d345d2 Merge of DHCP changes including dnsmasq callbacks
Conflicts:
	nova/utils.py
2010-07-14 16:27:18 -05:00
Vishvananda Ishaya
f302ab2fb5 Merge branch 'master' into simplenet 2010-07-14 17:53:25 -05:00
Vishvananda Ishaya
fa8a13bc5d datetime import typo 2010-07-08 11:00:53 -07:00
Vishvananda Ishaya
c2657e705b added missing isotime method from utils 2010-07-08 10:53:27 -07:00
Joshua McKenty
4264cc71d7 Fixed the os.environ patch (bogus) 2010-07-07 12:24:24 -07:00
Joshua McKenty
4f00c54803 Fixes as per Vish review (whitespace, import statements) 2010-07-07 12:24:22 -07:00
Joshua McKenty
bc141d7cc7 Got dhcpleasor working, with test ENV for testing, and rpc.cast for real world. 2010-07-07 12:15:11 -07:00
Joshua McKenty
354fa3fc1e Capture signals from dnsmasq and use them to update network state. 2010-07-07 12:06:34 -07:00
Vishvananda Ishaya
2c69755f05 Merge branch 'master' into fixrbac 2010-07-01 17:41:57 -05:00
Vishvananda Ishaya
ce49a4fa2e Merge remote branch 'nova/master'
Conflicts:
	docs/getting.started.rst
2010-07-01 17:38:03 -05:00
Vishvananda Ishaya
aeae45d58b Removed trailing whitespace from header 2010-06-29 21:25:59 -05:00
Devin Carlen
e502293a0b Updated licenses 2010-06-29 21:25:39 -05:00
Vishvananda Ishaya
483c601bfa removed all references to keeper 2010-06-29 18:02:00 -05:00
Jesse Andrews
d47d5ba983 Merge commit '56443020bcd20894c13eb73bd04a0a5eab4ba960'
Conflicts:
	docs/getting.started.rst
2010-06-29 16:59:07 -05:00
Vishvananda Ishaya
e0450fc635 Merge remote branch 'angst/apply_api' into diekeeper 2010-06-28 22:47:02 -07:00
Todd Willey
0b59c1c4c7 Fixes based on code review 27001. 2010-06-25 22:03:45 -04:00
Todd Willey
dc60b1781c Admin API + Worker Tracking. 2010-06-25 18:55:14 -04:00
Vishvananda Ishaya
63ca7465ef Removed trailing whitespace from header 2010-06-23 23:15:06 -07:00
Devin Carlen
f51094b128 Updated licenses 2010-06-23 22:04:16 -07:00
Vishvananda Ishaya
10872f560c Merge of fix to stop twisted threads from interuppting system calls
http://twistedmatrix.com/trac/changeset/28447
2010-06-24 04:12:00 +01:00
Vishvananda Ishaya
439ad0bcda fix fakeldap so it can use redis keeper 2010-06-24 04:11:59 +01:00
andy
9db62b9963 Refactored Instance to get rid of _s bits, and fixed some bugs in state management.
Conflicts:

	nova/compute/node.py
2010-06-24 04:11:55 +01:00
Joshua McKenty
cca767af22 Flush redis db in setup and teardown of tests. 2010-06-24 04:11:55 +01:00
Jesse Andrews
f5978917d6 Update documentation 2010-06-12 17:05:20 -07:00
andy
6ae544a11e make get_my_ip return 127.0.0.1 for testing 2010-06-11 10:08:13 +01:00
andy
489c3077db whitespace fixes for nova/utils.py 2010-06-10 18:39:07 +01:00
Jesse Andrews
1bf8bb0f89 missed the gitignore 2010-05-30 14:12:04 -07:00
Jesse Andrews
d9d5e34526 initial commit 2010-05-27 23:05:26 -07:00