jfindlay
3f415683e9
Merge pull request #21080 from freimer/private_key_fix
...
Private key fix
2015-02-27 16:21:53 -07:00
Fred Reimer
7976f5a694
Added pylink disable W0611
2015-02-27 17:23:35 -05:00
Nicole Thomas
c2ca579906
Merge pull request #20965 from rallytime/joyent_cloud_tests
...
Add Joyent cloud provider tests
2015-02-27 14:42:08 -07:00
Thomas S Hatch
adef36a0ae
Merge pull request #21122 from jfindlay/add_script_args
...
add args to cmd.script_retcode
2015-02-27 14:00:41 -07:00
Thomas S Hatch
01798fbc68
Merge pull request #21121 from jacksontj/2015.2
...
Fix duplicate kwargs in syndic
2015-02-27 14:00:34 -07:00
Erik Johnson
36839dc394
Merge pull request #21016 from makinacorpus/lxc_bis
...
LXC: Major fix & enhancements
2015-02-27 12:14:24 -06:00
Justin Findlay
367f14a4d0
add args to cmd.script_retcode
2015-02-27 10:52:15 -07:00
Joseph Hall
e4d7397c23
Merge pull request #21123 from cro/saltcloud-pw-fail
...
Don't omit password from salt-cloud kwargs if missing has_ssh_agent
2015-02-27 10:49:53 -07:00
C. R. Oldham
e0ace73ac3
Don't omit password from salt-cloud kwargs if salt-cloud profile doesn't include 'has_ssh_agent'
2015-02-27 10:43:55 -07:00
Erik Johnson
ff66ad3d11
Correct location of network configuration for Debian/Ubuntu
2015-02-27 18:16:13 +01:00
Erik Johnson
a7ba699ad7
remove grains outputter from autosummary
2015-02-27 18:12:18 +01:00
Erik Johnson
48fed17876
Add warnings about static IP configuration
2015-02-27 18:12:18 +01:00
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
Thomas Jackson
1232355c69
Fix duplicate kwargs in syndic
...
Not sure how this keeps getting back in here...
2015-02-27 09:11:15 -08: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
Fred Reimer
dc0aee67a6
SHA is in Crypto.Hash, not Crypto.Cipher
2015-02-26 12:28:08 -05: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
Fred Reimer
e186c86f70
Windows password decode requires SHA
2015-02-26 11:50:26 -05:00
Fred Reimer
9f234cd705
Fixed private_key missing in vm_ for wait_for_instance
2015-02-26 11:01:30 -05: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
