Merge branch 'stable-2.7' into stable-2.8

* stable-2.7
  Fix RAPI to include missing network fields
  Add support for querying network timestamps
  In the crontab example, look for the correct binary
  Fix wrong numbering in UPGRADE documentation

Conflicts:
	src/Ganeti/Objects.hs
	test/hs/Test/Ganeti/Objects.hs
Resolved by taking both additions.

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

diff --cc UPGRADE
Simple merge

diff --cc lib/config.py
Simple merge

diff --cc lib/query.py
Simple merge

diff --cc lib/rapi/rlib2.py
Simple merge

diff --cc src/Ganeti/Objects.hs
index cd8d024,07d7f20..702efbc
--- 1/src/Ganeti/Objects.hs
--- 2/src/Ganeti/Objects.hs
+++ b/src/Ganeti/Objects.hs
@@@ -258,7 -186,7 +258,8 @@@ $(buildObject "Network" "network" 
    , optionalField $
      simpleField "ext_reservations" [t| String |]
    ]
 +  ++ uuidFields
+   ++ timeStampFields
    ++ serialFields
    ++ tagsFields)
  
@@@ -268,9 -196,10 +269,13 @@@ instance SerialNoObject Network wher
  instance TagsObject Network where
    tagsOf = networkTags
  
 +instance UuidObject Network where
 +  uuidOf = networkUuid
 +
+ instance TimeStampObject Network where
+   cTimeOf = networkCtime
+   mTimeOf = networkMtime
+ 
  -- * NIC definitions
  
  $(buildParam "Nic" "nicp"

diff --cc test/hs/Test/Ganeti/Objects.hs
index b27bba5,110df56..0598a39
--- 1/test/hs/Test/Ganeti/Objects.hs
--- 2/test/hs/Test/Ganeti/Objects.hs
+++ b/test/hs/Test/Ganeti/Objects.hs
@@@ -247,9 -174,10 +247,11 @@@ genValidNetwork = d
    gateway6 <- genMaybe genIp6Addr
    res <- liftM Just (genBitString $ netmask2NumHosts netmask)
    ext_res <- liftM Just (genBitString $ netmask2NumHosts netmask)
 +  uuid <- arbitrary
+   ctime <- arbitrary
+   mtime <- arbitrary
 -  let n = Network name mac_prefix net net6 gateway
 -          gateway6 res ext_res ctime mtime 0 Set.empty
 +  let n = Network name mac_prefix (Ip4Network net netmask) net6 gateway
-           gateway6 res ext_res uuid 0 Set.empty
++          gateway6 res ext_res uuid ctime mtime 0 Set.empty
    return n
  
  -- | Generate an arbitrary string consisting of '0' and '1' of the given length.