[Pkg-ganeti-devel] [ganeti] 51/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 759427730b8e4db59b5f88e5c0e83dc04decfa5a
Merge: 1573e03 d433da5
Author: Klaus Aehlig <aehlig at google.com>
Date:   Fri Feb 20 11:07:15 2015 +0100

    Merge branch 'stable-2.14' into master
    
    * stable-2.14
      break line with 81 chars
      Suffix bump for 2.14.0 beta1
      Update NEWS for 2.14.0 beta1
      Update documents for 2.14
      Document NAL removal in NEWS
    
    * stable-2.13
      Fix upgrading of data_collectors entry in cluster
    
    * stable-2.12
      Increase waiting time for WConfD
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Fix haddock comment
    
    * stable-2.9
      Fix file descriptor leak in Confd Client
      Fix hlint warnings found by hlint 1.9.11
    
    Semantical Conflict: Undo suffix bump on master
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Helga Velroyen <helgav at google.com>

 Makefile.am                        |  1 +
 NEWS                               | 17 ++++++++++++++---
 doc/design-2.14.rst                |  9 +++++++++
 doc/design-draft.rst               |  2 +-
 doc/iallocator.rst                 |  2 +-
 doc/index.rst                      |  1 +
 lib/tools/cfgupgrade.py            |  9 ++++++---
 lib/wconfd.py                      |  4 ++--
 src/Ganeti/Confd/Client.hs         |  8 +++++---
 src/Ganeti/DataCollectors/Types.hs |  2 +-
 10 files changed, 41 insertions(+), 14 deletions(-)

diff --cc src/Ganeti/DataCollectors/Types.hs
index b37049c,e4db7b8..6beb042
--- a/src/Ganeti/DataCollectors/Types.hs
+++ b/src/Ganeti/DataCollectors/Types.hs
@@@ -138,10 -138,8 +138,10 @@@ instance JSON DCVersion wher
      then Ok DCVerBuiltin else Ok . DCVersion $ fromJSString s
    readJSON v = fail $ "Invalid JSON value " ++ show v ++ " for type DCVersion"
  
- -- | Type for the value field of the above map.
+ -- | Type for the value field of the `CollectorMap` below.
 -data CollectorData = CPULoadData (Seq.Seq (ClockTime, [Int]))
 +data CollectorData =
 +  CPULoadData (Seq.Seq (ClockTime, [Int]))
 +  | InstanceCpuLoad (Map.Map String (Seq.Seq (ClockTime, Double)))
  
  -- | Type for the map storing the data of the statefull DataCollectors.
  type CollectorMap = Map.Map String CollectorData

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