1. 16 Apr, 2010 1 commit
    • Iustin Pop's avatar
      Merge branch 'devel-2.1' · af2ae1c0
      Iustin Pop authored
      
      
      * devel-2.1:
        utils: Add class to split string stream into lines
        Fix cluster behaviour with disabled file storage
        Update docstrings in tools/ and enable epydoc
        Forward-port the ganeti 2.0 cfgupgrade
        Add a new tool: sanitize-config
        Fix cfgupgrade with non-default DATA_DIR
        Improving the RAPI documentation
        Mark cluster-merge as executable
        QA: Make the rapi credential handling less involving
      
      Conflicts:
      	lib/bootstrap.py (merge cds and new file names)
      	lib/cmdlib.py    (trivial, kept 2.1 version for disabled file
      	                  storage)
      	lib/utils.py     (trivial, new imports)
      	tools/cfgupgrade (trivial, new cds parameter)
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      af2ae1c0
  2. 15 Apr, 2010 7 commits
  3. 13 Apr, 2010 1 commit
  4. 12 Apr, 2010 19 commits
  5. 09 Apr, 2010 7 commits
  6. 08 Apr, 2010 5 commits