diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-03-17 15:57:04 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-03-17 15:57:04 -0500 |
| commit | 400ca259f49a741cf2cefd86afcf2494ee0bd446 (patch) | |
| tree | 881a11a7ba5a306f0d728c085a8021cb7e527bd5 /Authors | |
| parent | 038d99d9fa4354bd617adfa332d69a87a9f7918e (diff) | |
| parent | 88ae79505a84736ebdf57ba67c60ff16de5c9e87 (diff) | |
| download | nova-400ca259f49a741cf2cefd86afcf2494ee0bd446.tar.gz nova-400ca259f49a741cf2cefd86afcf2494ee0bd446.tar.xz nova-400ca259f49a741cf2cefd86afcf2494ee0bd446.zip | |
merged trunk, merged qos, slight refactor regarding merges
Diffstat (limited to 'Authors')
| -rw-r--r-- | Authors | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -19,6 +19,7 @@ Devin Carlen <devin.carlen@gmail.com> Ed Leafe <ed@leafe.com> Eldar Nugaev <enugaev@griddynamics.com> Eric Day <eday@oddments.org> +Eric Windisch <eric@cloudscaling.com> Ewan Mellor <ewan.mellor@citrix.com> Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp> Hisaki Ohara <hisaki.ohara@intel.com> @@ -39,6 +40,7 @@ Ken Pepple <ken.pepple@gmail.com> Kevin L. Mitchell <kevin.mitchell@rackspace.com> Koji Iida <iida.koji@lab.ntt.co.jp> Lorin Hochstein <lorin@isi.edu> +Mark Washenberger <mark.washenberger@rackspace.com> Masanori Itoh <itoumsn@nttdata.co.jp> Matt Dietz <matt.dietz@rackspace.com> Michael Gundlach <michael.gundlach@rackspace.com> |