[Pkg-ganeti-devel] [ganeti] 18/165: Merge branch 'stable-2.14' into master

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit 6d5362106543acdb865dea88c6b209ab1a0516c8
Merge: 0389f21 b8c96d5
Author: Petr Pudlak <pudlak at google.com>
Date:   Tue Jan 27 18:56:01 2015 +0100

    Merge branch 'stable-2.14' into master
    
    * stable-2.14
      Fix reference to instance disk template in attach
      Fix test failure of node with no memory
    
    * stable-2.13
      Fix haddock comments
    
    * stable-2.12
      Always restart dnsmasq that serves the metad interfaces
      When starting the MetaD, clean up its UDP socket
      Put the MetaD socket name into the Path module
    
    * stable-2.11
      Handle missing 'restart_when' in watcher's state file
      Gluster: fix mount.glusterfs argument passing
    
    * stable-2.10
      Fix spacing
      Ingore automatically generated tools/shebang
      Auto-upgrade hv_state_static and disk_state_static
    
    Signed-off-by: Petr Pudlak <pudlak at google.com>
    Reviewed-by: Helga Velroyen <helgav at google.com>

 .gitignore                                 |  2 +-
 lib/objects.py                             |  6 ++++
 lib/storage/gluster.py                     |  4 +--
 lib/watcher/state.py                       |  2 +-
 src/Ganeti/HTools/Cluster.hs               |  6 ++--
 src/Ganeti/Metad/ConfigServer.hs           | 15 ++++-----
 src/Ganeti/Path.hs                         |  5 +++
 test/hs/Test/Ganeti/HTools/Node.hs         |  5 +--
 test/py/ganeti.storage.gluster_unittest.py |  7 +++--
 tools/ifup-os.in                           | 49 +++++++++---------------------
 10 files changed, 45 insertions(+), 56 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git