Revert "hack to get deployment.ips.controller_ips to work w/ multi-nics"
Merge pull request #262 from theforeman/revert-258-controller-ip-hack

Revert "hack to get deployment.ips.controller_ips to work w/ multi-nics"
BZ 1128460: removed extra cinder_nfs_shares entry from seeder.rb

There was an extra cinder_nfs_shares entry in seeder.rb that overrode
the original value to [], breaking NFS support.
Merge pull request #263 from sseago/BZ1128460

BZ 1128460: removed extra cinder_nfs_shares entry from seeder.rb
bz1128769: fix memory reporting for host list

The hosts list was always taking the memory number and dividing by
1000. This had 2 problems:
1) should have been 24
2) only worked for hosts reported in MB, not for GB, etc.
Merge pull request #264 from sseago/BZ1128460

bz1128769: fix memory reporting for host list
version bump to 0.2.3
bz1126332: add private_ip to compute nodes
Merge pull request #265 from sseago/BZ1126332

bz1126332: add private_ip to compute nodes
version bump to 0.2.4
Unused hostgroup variable
Assign, Unassign, and Undeploy buttons, and JS.
Nitpick :)
escape # in regexp to avoid syntax errors in older ruby versions
Merge pull request #267 from sseago/regexp-syntax-error

escape # in regexp to avoid syntax errors in older ruby versions
Merge pull request #266 from knowncitizen/hosts_buttons

Hosts Assign, Unassign, and Undeploy buttons
version bump to 0.2.5
JS filter on all 3 sub-tabs of Hosts tab.
Merge pull request #268 from knowncitizen/hosts_filters

JS filter on all 3 sub-tabs of Hosts tab.
Merge branch 'master' into networking

* master:
  JS filter on all 3 sub-tabs of Hosts tab.
  version bump to 0.2.5
  escape # in regexp to avoid syntax errors in older ruby versions
  Nitpick :)
  Assign, Unassign, and Undeploy buttons, and JS.
  Unused hostgroup variable
  version bump to 0.2.4
  bz1126332: add private_ip to compute nodes
  version bump to 0.2.3
  bz1128769: fix memory reporting for host list
  BZ 1128460: removed extra cinder_nfs_shares entry from seeder.rb
  Revert "hack to get deployment.ips.controller_ips to work w/ multi-nics"