valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,469 Commits 24 Branches 182 Tags 341 MiB
abf00abea4
Commit Graph

45469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
abf00abea4 remove the docs' .rst file for deleted grains outputter 
See e1f8ea6.
 2015-02-27 18:12:18 +01:00
Mathieu Le Marec - Pasquet
139a30d729 lxc: also network profile overrides in more functions 2015-02-27 18:11:49 +01:00
Mathieu Le Marec - Pasquet
ae7bf59da3 skip comments in _get_veth 2015-02-27 18:11:49 +01:00
Erik Johnson
9747582e67 Lint fix 2015-02-27 18:11:49 +01:00
Mathieu Le Marec - Pasquet
81977525ec LXC: review with @terminalmage 2015-02-27 18:11:49 +01:00
Mathieu Le Marec - Pasquet
220f579769 LXC: Major fix & enhancements 
This reconciles back makinacorpus's LXC fork into upstream.

This fixes various breakages introduced by the refactor which are
so numerous that we cant enumerate them all :).

This also introduce some new features like network reconfiguration
and container reboot.
 2015-02-27 18:11:49 +01:00
Nicole Thomas
5084f845cc Merge pull request #21112 from s0undt3ch/2015.2 
Make the warnings standout
 2015-02-27 09:35:10 -07:00
Pedro Algarvio
ae629d3c6c Make the warnings standout 
Since in yellow they can be confused with unchanged state returns
 2015-02-27 10:23:23 +00:00
Thomas S Hatch
8fe8469190 Merge pull request #21104 from s0undt3ch/2015.2 
[2015.2] Update the bootstrap script to latest stable v2015.02.27
 2015-02-26 21:13:50 -07:00
Pedro Algarvio
98a03b2301 Update the bootstrap script to latest stable v2015.02.27 
* Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van Zantvoort(The-Loeki)
* No need to install packages from the Unstable repository for debian, use backports. Thanks Ari Aosved(devaos)
* Fix an issue in CentOS where the syndic package wasn't being installed(since it's now a separate package). Thanks Ronald van Zantvoort(The-Loeki)
* Enable the server-optionals repository for RHEL >= 7
* RHEL/CentOS 5 now uses the COPR repository. #533
 2015-02-27 01:51:14 +00:00
Thomas S Hatch
629bda36f6 Merge pull request #21081 from rallytime/2.6_compat 
Make sys.version_info python 2.6 compatible
 2015-02-26 11:53:01 -07:00
Thomas S Hatch
d92d549487 Merge pull request #21079 from s0undt3ch/hotfix/deprecate-fopen-lock 
Factor out `uid`, `gid` and `mode` support from `fopen()` into `fpopen()`
 2015-02-26 11:11:56 -07:00
Thomas S Hatch
41d3afefe0 Merge pull request #21078 from rallytime/bp-21061 
Backport #21061 to 2015.2
 2015-02-26 11:11:25 -07:00
Thomas S Hatch
e75d2c6877 Merge pull request #20986 from s0undt3ch/hotfix/push-extra-kwargs-deprecation 
[2015.2] Push extra kwargs deprecation to Carbon
 2015-02-26 11:09:24 -07:00
rallytime
cd481b6bdd Make sys.version_info python 2.6 compatible 
Refs #21053: Named component attributes weren't added until 2.7
 2015-02-26 10:53:20 -07:00
Pedro Algarvio
21e31ec4aa Replace fopen with fpopen which includes permissions and ownership handling 2015-02-26 17:18:50 +00:00
Pedro Algarvio
8bac01beec Some pylint disables 2015-02-26 17:17:33 +00:00
Pedro Algarvio
397d18df1d Factor out uid, gid and mode support from fopen() into fpopen() 2015-02-26 17:14:12 +00:00
Chris Rebert
97d4803232 utils.http.query: use list instead of tuple since handlers gets mutated 
************* Module salt.utils.http
/Users/chris/code/salt/salt/utils/http.py:309: [E1101(no-member), query] Instance of 'tuple' has no 'append' member
 2015-02-26 10:05:49 -07:00
Mike Place
787a99c85d Merge pull request #21065 from s0undt3ch/hotfix/deprecate-fopen-lock 
Move all file locking from `fopen` to `flopen`
 2015-02-26 08:56:25 -07:00
Pedro Algarvio
bcaf524dba Move all file locking from fopen to flopen 
Deprecate the `lock` keyword argument until Salt Beryllium.
 2015-02-26 10:28:21 +00:00
Pedro Algarvio
c047a1beb8 Correct indentation. 2015-02-26 09:49:36 +00:00
rallytime
cd5ad52c2e Fix pylint errors on develop 2015-02-26 09:43:52 +00:00
Pedro Algarvio
70ddfaf363 Extra keyword arguments are deprecating till Salt Carbon 2015-02-26 09:41:22 +00:00
Pedro Algarvio
d3c364713e Include the warnings in the highstate outputter 2015-02-26 09:41:22 +00:00
Pedro Algarvio
53daa36bf4 Also quote in the plural form 2015-02-26 09:41:22 +00:00
Pedro Algarvio
38ddbbc227 Fix imports 2015-02-26 09:41:22 +00:00
Pedro Algarvio
8fc9009e6e Fix missed Lithium to Beryllium references 2015-02-26 09:41:22 +00:00
Pedro Algarvio
160cb2982c Add __pub_pid to the known extra state kwargs 2015-02-26 09:41:22 +00:00
Pedro Algarvio
066f185653 Fix pylint ignores 2015-02-26 09:41:22 +00:00
Pedro Algarvio
f587c50cc6 Push the extra kwargs deprecation to Beryllium 2015-02-26 09:41:22 +00:00
Pedro Algarvio
c35c5ed6cf Revert "Start raising SaltInvocationError" 
This reverts commit f2276afac9.
 2015-02-26 09:41:22 +00:00
Pedro Algarvio
a24ae29ee9 Revert "We no longer warn." 
This reverts commit 5d35f856ac.
 2015-02-26 09:41:22 +00:00
Nicole Thomas
7d53643205 Merge pull request #21053 from s0undt3ch/2015.2 
We can't use 'six.moves.builtins`.
 2015-02-25 20:58:21 -07:00
Pedro Algarvio
6088279c53 We can't use 'six.moves.builtins`. 
Apparently the `six` `builtins` get deleted sooner than we hoped for.
Every builtin gets reset to `None`.

Fixes #21036
 2015-02-26 01:10:48 +00:00
Thomas S Hatch
660de607da Merge pull request #20944 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-02-25 17:53:44 -07:00
Thomas S Hatch
9b81e8cb1c Merge pull request #21048 from rallytime/bp-20943 
Backport #20943 to 2015.2
 2015-02-25 17:44:11 -07:00
Aneesh Agrawal
2ae9b8adf0 Fix indentation. 2015-02-25 16:24:02 -07:00
Aneesh Agrawal
5c5aeb1434 File.replace module gains symlink awareness; fixes #20910. 
Note: backup behavior with symlinks currently mirrors the regular option.
For a symlink 'bar' pointing to a file 'foo', this entails creating a
'foo.bak' file to store the actual backup, and a 'bar.bar' symlink to it
to maintain consistency to the user (mv bar.bar bar will do what the
user wants, which is effectively undoing the change).
 2015-02-25 16:24:02 -07:00
Colton Myers
8b024927b1 Backport #20963 to 2015.2 2015-02-25 16:17:06 -07:00
Thomas S Hatch
d3924af554 Merge pull request #21035 from basepi/salt-ssh-salt-api-2015.2-20418 
[2015.2] Extend fix from #21034 to new code in 2015.2
 2015-02-25 16:09:24 -07:00
Colton Myers
9c7696dc4d Extend fix from #21034 to new code in 2015.2 2015-02-25 12:21:32 -07:00
Mike Place
de441aba35 Merge pull request #21001 from jacksontj/2015.2 
Fix #19658 (_pillar not having access to minion grains)
 2015-02-25 10:11:46 -07:00
Mike Place
aa0308267b Merge pull request #20967 from s0undt3ch/features/system-encoding-detection-2015.2 
Add system encoding detection
 2015-02-25 10:03:32 -07:00
Mike Place
14f522cbbe Merge pull request #21014 from wt/2015.2-flake8_on_jinja_py 
Fix all flake8 issues in a one file.
 2015-02-25 09:20:42 -07:00
Mike Place
5e0efed289 Merge pull request #21003 from jacksontj/saltnado 
Better dep checking in rest_tornado
 2015-02-25 09:18:08 -07:00
Mike Place
237533994b Merge pull request #20982 from cachedout/id_event 
ID field for event returns in mysql
 2015-02-25 09:15:17 -07:00
Warren Turkal
26f32ee5c7 Fix all flake8 issues in one file. 2015-02-24 23:08:42 -08:00
Thomas Jackson
9ae0408ae8 Typo fix 2015-02-24 20:56:57 -08:00
Nicole Thomas
8d013efe66 Merge pull request #21000 from rallytime/skip_ec2_tests 
Skip the ec2 nightly cloud tests for now
 2015-02-24 17:38:57 -07:00