Hello community, here is the log from the commit of package salt for openSUSE:Factory checked in at 2014-07-11 20:05:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/salt (Old) and /work/SRC/openSUSE:Factory/.salt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "salt" Changes: -------- --- /work/SRC/openSUSE:Factory/salt/salt.changes 2014-07-10 09:31:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.salt.new/salt.changes 2014-07-11 20:05:45.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 10 18:25:05 UTC 2014 - [email protected] + +- Update to 2014.7 + This release was a hotfix release for the regression listed above which was present in the 2014.1.6 +- Fix batch mode regression (issue 14046) + +------------------------------------------------------------------- Old: ---- salt-2014.1.6.tar.gz New: ---- salt-2014.1.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ salt.spec ++++++ --- /var/tmp/diff_new_pack.VozOEf/_old 2014-07-11 20:05:46.000000000 +0200 +++ /var/tmp/diff_new_pack.VozOEf/_new 2014-07-11 20:05:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: salt -Version: 2014.1.6 +Version: 2014.1.7 Release: 0 Summary: A parallel remote execution system License: Apache-2.0 ++++++ salt-2014.1.6.tar.gz -> salt-2014.1.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/PKG-INFO new/salt-2014.1.7/PKG-INFO --- old/salt-2014.1.6/PKG-INFO 2014-07-08 23:01:34.000000000 +0200 +++ new/salt-2014.1.7/PKG-INFO 2014-07-09 23:02:13.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: salt -Version: 2014.1.6 +Version: 2014.1.7 Summary: Portable, distributed, remote execution and configuration management system Home-page: http://saltstack.org Author: Thomas S Hatch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/doc/conf.py new/salt-2014.1.7/doc/conf.py --- old/salt-2014.1.6/doc/conf.py 2014-06-27 22:26:23.000000000 +0200 +++ new/salt-2014.1.7/doc/conf.py 2014-07-09 22:57:10.000000000 +0200 @@ -117,7 +117,7 @@ version = salt.version.__version__ #release = '.'.join(map(str, salt.version.__version_info__)) -release = '2014.1.6' +release = '2014.1.7' language = 'en' locale_dirs = [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/doc/topics/releases/2014.1.7.rst new/salt-2014.1.7/doc/topics/releases/2014.1.7.rst --- old/salt-2014.1.6/doc/topics/releases/2014.1.7.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/salt-2014.1.7/doc/topics/releases/2014.1.7.rst 2014-07-09 22:56:59.000000000 +0200 @@ -0,0 +1,31 @@ +=========================== +Salt 2014.1.7 Release Notes +=========================== + +:release: 2014-07-09 + +Version 2014.1.7 is another bugfix release for :doc:`2014.1.0 +</topics/releases/2014.1.0>`. Changes include: + +- Fix batch mode regression (:issue:`14046`) + +This release was a hotfix release for the regression listed above which was +present in the 2014.1.6 release. The changes included in 2014.1.6 are listed +below: + +- Fix extra ``iptables --help`` output (Sorry!) (:issue:`13648`, + :issue:`13507`, :issue:`13527`, :issue:`13607`) +- Fix ``mount.active`` for Solaris +- Fix support for ``allow-hotplug`` statement in debian_ip network module +- Add sqlite3 to esky builds +- Fix ``jobs.active`` output (:issue:`9526`) +- Fix the ``virtual`` grain for Xen (:issue:`13534`) +- Fix eauth for batch mode (:issue:`9605`) +- Fix force-related issues with ``tomcat`` support (:issue:`12889`) +- Fix KeyError when cloud mapping +- Fix salt-minion restart loop in Windows (:issue:`12086`) +- Fix detection of ``service`` virtual module on Fedora minions +- Fix traceback with missing ipv4 grain (:issue:`13838`) +- Fix issue in roots backend with invalid data in mtime_map (:issue:`13836`) +- Fix traceback in ``jobs.active`` (:issue:`11151`) +- Fix ``master_tops`` and ``_ext_nodes`` issue (:issue:`13535`, :issue:`13673`) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/salt/cli/__init__.py new/salt-2014.1.7/salt/cli/__init__.py --- old/salt-2014.1.6/salt/cli/__init__.py 2014-06-27 22:26:23.000000000 +0200 +++ new/salt-2014.1.7/salt/cli/__init__.py 2014-07-09 20:14:25.000000000 +0200 @@ -59,27 +59,7 @@ return if self.options.batch: - eauth = {} - if 'token' in self.config: - eauth['token'] = self.config['token'] - - # If using eauth and a token hasn't already been loaded into - # kwargs, prompt the user to enter auth credentials - if 'token' not in eauth and self.options.eauth: - resolver = salt.auth.Resolver(self.config) - res = resolver.cli(self.options.eauth) - if self.options.mktoken and res: - tok = resolver.token_cli( - self.options.eauth, - res - ) - if tok: - eauth['token'] = tok.get('token', '') - if not res: - sys.exit(2) - eauth.update(res) - eauth['eauth'] = self.options.eauth - batch = salt.cli.batch.Batch(self.config, eauth) + batch = salt.cli.batch.Batch(self.config) # Printing the output is already taken care of in run() itself for res in batch.run(): pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/salt/cli/batch.py new/salt-2014.1.7/salt/cli/batch.py --- old/salt-2014.1.6/salt/cli/batch.py 2014-06-27 22:26:23.000000000 +0200 +++ new/salt-2014.1.7/salt/cli/batch.py 2014-07-09 20:14:39.000000000 +0200 @@ -18,11 +18,10 @@ ''' Manage the execution of batch runs ''' - def __init__(self, opts, eauth=None, quiet=False): + def __init__(self, opts, quiet=False): self.opts = opts - self.eauth = eauth self.quiet = quiet - self.local = salt.client.get_local_client(opts['conf_file']) + self.local = salt.client.LocalClient(opts['conf_file']) self.minions = self.__gather_minions() def __gather_minions(self): @@ -42,7 +41,7 @@ args.append(self.opts.get('expr_form', 'glob')) fret = [] - for ret in self.local.cmd_iter(*args, **self.eauth): + for ret in self.local.cmd_iter(*args): for minion in ret: if not self.quiet: print('{0} Detected for this batch run'.format(minion)) @@ -114,8 +113,7 @@ new_iter = self.local.cmd_iter_no_block( *args, raw=self.opts.get('raw', False), - ret=self.opts.get('return', ''), - **self.eauth) + ret=self.opts.get('return', '')) # add it to our iterators and to the minion_tracker iters.append(new_iter) minion_tracker[new_iter] = {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/salt/client/__init__.py new/salt-2014.1.7/salt/client/__init__.py --- old/salt-2014.1.6/salt/client/__init__.py 2014-06-27 22:26:23.000000000 +0200 +++ new/salt-2014.1.7/salt/client/__init__.py 2014-07-09 20:14:57.000000000 +0200 @@ -18,6 +18,17 @@ # 3. What arguments need to be passed to the function? # 4. How long do we wait for all of the replies? # +# Next there are a number of tasks, first we need some kind of authentication +# This Client initially will be the master root client, which will run as +# the root user on the master server. +# +# BUT we also want a client to be able to work over the network, so that +# controllers can exist within disparate applications. +# +# The problem is that this is a security nightmare, so I am going to start +# small, and only start with the ability to execute salt commands locally. +# This means that the primary client to build is, the LocalClient + # Import python libs from __future__ import print_function import os diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/salt-2014.1.6/salt/version.py new/salt-2014.1.7/salt/version.py --- old/salt-2014.1.6/salt/version.py 2014-07-08 22:57:29.000000000 +0200 +++ new/salt-2014.1.7/salt/version.py 2014-07-09 22:57:34.000000000 +0200 @@ -55,7 +55,7 @@ # ----- Please refrain from fixing PEP-8 E203 ---------------------------------------------------------------> # The idea is keep this readable # ------------------------------------------------------------------------------------------------------------ - 'Hydrogen': (2014, 1, 6, 0), + 'Hydrogen': (2014, 1, 7, 0), 'Helium': (sys.maxint - 107, 0, 0, 0), 'Lithium': (sys.maxint - 106, 0, 0, 0), 'Beryllium': (sys.maxint - 105, 0, 0, 0), -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
