Merge branch 'devel-2.3'

* devel-2.3:
  Correct version check for release candidates
  config.py: need explicit %-formatting in errors.OpPrereqError.
  Fix version check
  Add script to check version format

Conflicts:
	Makefile.am

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --cc Makefile.am
index 4bfd094,9436423..7d61f71
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -337,6 -335,8 +338,7 @@@ EXTRA_DIST = 
        autotools/check-python-code \
        autotools/check-man \
        autotools/check-tar \
+       autotools/check-version \
 -      autotools/docbook-wrapper \
        autotools/gen-coverage \
        autotools/testrunner \
        $(RUN_IN_TEMPDIR) \

diff --cc lib/config.py
index 35ed410,eb57cae..a903e18
--- 1/lib/config.py
--- 2/lib/config.py
+++ b/lib/config.py
@@@ -886,9 -874,10 +886,9 @@@ class ConfigWriter
      for nodegroup in self._config_data.nodegroups.values():
        if nodegroup.name == target:
          return nodegroup.uuid
-     raise errors.OpPrereqError("Nodegroup '%s' not found", target)
+     raise errors.OpPrereqError("Nodegroup '%s' not found" % target)
  
 -  @locking.ssynchronized(_config_lock, shared=1)
 -  def GetNodeGroup(self, uuid):
 +  def _UnlockedGetNodeGroup(self, uuid):
      """Lookup a node group.
  
      @type uuid: string