« Previous | Next » 

Revision fd981347

IDfd9813477e42a4d2e8d6b515a8d4ea2a86a843b4
Parent d4e96b2a, 37696520
Child dd2b770b

Added by Ted almost 10 years ago

Merge branch 'feature-754' of git://git.opennebula.org/one into x509-2

Conflicts:
src/authm_mad/remotes/x509/x509_auth.rb

Files

  • added
  • modified
  • copied
  • renamed
  • deleted