rallytime
670538c9cd
But only fix it in the correct place...
2015-01-22 01:22:18 -07:00
rallytime
e4856b6fc7
Fix assertion string in failing linux_lvm unit test
2015-01-22 01:20:16 -07:00
Joseph Hall
ac4bc04835
Merge pull request #19939 from s0undt3ch/2015.2
...
White-space lint fix
2015-01-21 18:26:47 -07:00
Pedro Algarvio
88ef44f04f
White-space lint fix
2015-01-22 01:21:28 +00:00
Nahum Shalman
32c222f8f2
SmartOS Esky: fix build version identification
...
"bdist" doesn't do the right thing in the absence of
version files produced by "sdist".
Run "sdist" then extract out the contents of the tarball
into place
2015-01-21 20:06:48 -05:00
Tiru Srikantha
c727e55a7f
Split out tar options into long and short
...
Fixes #19928 . This commit changes the behavior of tar_options so that anything
without a - to start gets appended to the "x" for extraction (e.g. "z" or "J")
but anything that starts with a - properly gets appended as an explicit
argument. In addition, filename no longer needs quoting since it's an
array-based argument now.
2015-01-21 16:00:45 -08:00
Colton Myers
a067e6ceba
Fix the grains precedence documentation
...
Fixes #19611
2015-01-21 16:10:18 -07:00
Justin Findlay
db76a42c59
create /etc/sysctl.d/99-salt.conf if not present
2015-01-21 15:27:10 -07:00
Thomas S Hatch
8e9c34705a
Merge pull request #19922 from thatch45/output_fallback
...
single out the output fallback routine
2015-01-21 13:56:25 -07:00
Thomas S Hatch
0cd3d4ea49
Merge pull request #19919 from JaseFace/osfinger-osmajor-bsd
...
Add osmajorrelease and osfinger grains for BSD systems
2015-01-21 13:18:58 -07:00
Thomas S Hatch
37619f0e0c
Add log message for bad outputter
2015-01-21 13:05:02 -07:00
Thomas S Hatch
a44bdb6e2b
Generalize the fallback wrapper
2015-01-21 13:00:41 -07:00
Thomas S Hatch
5bd3ad8f76
Merge pull request #19921 from thatch45/The-Loeki-fix_sysctl
...
Merge #19838
2015-01-21 12:47:11 -07:00
Thomas S Hatch
594220c73a
If we import a function from another module like this
...
Then the salt loader exposes it to salt
2015-01-21 12:45:58 -07:00
Thomas S Hatch
364c2b5919
Merge branch 'fix_sysctl' of https://github.com/The-Loeki/salt into The-Loeki-fix_sysctl
2015-01-21 12:44:40 -07:00
Jason Wolfe
3718e6e368
Add osmajorrelease and osfinger grains for BSD systems
2015-01-21 12:33:12 -07:00
Thomas S Hatch
02782e3a14
Merge pull request #19912 from basepi/salt-ssh-gpg-renderer19114
...
Assume __salt__['config.get'] is present in gpg renderer
2015-01-21 12:22:30 -07:00
Thomas S Hatch
b6faad4bdc
Merge pull request #19913 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-21 12:03:08 -07:00
Thomas S Hatch
7ed5186a4e
Merge pull request #19910 from s0undt3ch/hotfix/create-parent-dirs-2015.2
...
[2015.2] create parent dirs
2015-01-21 11:56:00 -07:00
Mike Place
cff909436c
Add cmd.shell
2015-01-21 11:23:08 -07:00
Mike Place
28882ee17c
cmd_safe hidden config option
2015-01-21 11:23:08 -07:00
Justin Findlay
d6e9396235
Set default to python_shell to False
2015-01-21 11:23:08 -07:00
Colton Myers
098c39596a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/templates/rh_ip/rh5_eth.jinja
salt/templates/rh_ip/rh6_eth.jinja
salt/utils/templates.py
2015-01-21 11:19:06 -07:00
Colton Myers
e2b1079ccb
Assume __salt__['config.get'] is present
2015-01-21 11:08:03 -07:00
Thomas S Hatch
83591dff8f
Merge pull request #19909 from s0undt3ch/hotfix/create-parent-dirs
...
Create parent directories
2015-01-21 10:57:58 -07:00
Thomas S Hatch
938af03520
Merge pull request #19902 from jfindlay/fix_blkid
...
test for blkid before running disk.blkid
2015-01-21 10:57:37 -07:00
Thomas S Hatch
067577288f
Merge pull request #19906 from techhat/verifyssl
...
Allow SSL verification to be turned off
2015-01-21 10:41:55 -07:00
Thomas S Hatch
678c57f414
Merge pull request #19907 from techhat/httpdocs
...
Update HTTP tutorial for new functionality
2015-01-21 10:41:34 -07:00
Pedro Algarvio
1183eb1a93
Make sure parent directories are also created
2015-01-21 17:19:48 +00:00
Pedro Algarvio
82b2b723a1
Create parent directories
2015-01-21 17:19:19 +00:00
Joseph Hall
dcf6304f0d
Use syspaths
2015-01-21 10:17:57 -07:00
Pedro Algarvio
b837c3bc81
Create parent directories
2015-01-21 17:17:14 +00:00
Nicole Thomas
18fc519270
Merge pull request #19905 from techhat/joyent-2015.2
...
Modify how joyent driver handles SSL and URLs
2015-01-21 09:41:35 -07:00
Joseph Hall
483e84c78a
Update HTTP tutorial for new functionality
2015-01-21 09:20:11 -07:00
Joseph Hall
b8a531a955
Allow SSL verification to be turned off
2015-01-21 08:55:11 -07:00
Joseph Hall
667473c72c
Modify how joyent driver handles SSL and URLs
2015-01-21 08:29:06 -07:00
Nicole Thomas
ab725d5c7a
Merge pull request #19904 from rallytime/pylint_dot_seven
...
Fix pylint errors on 2014.7
2015-01-21 08:24:29 -07:00
rallytime
4a6f78821f
Fix pylint errors on 2014.7
2015-01-21 08:23:45 -07:00
Justin Findlay
192ccc7373
test for blkid before running disk.blkid
2015-01-21 07:45:17 -07:00
Thomas S Hatch
80f9267fca
Merge pull request #19885 from whiteinge/rest_cherrypy-token-error
...
Also catch TokenAuthenticationError tracebacks to properly raise a 401
2015-01-20 17:35:09 -07:00
Thomas S Hatch
30b874525d
Merge pull request #19889 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-20 17:33:41 -07:00
Colton Myers
a9b42e4be3
Spaces after commas
2015-01-20 16:18:08 -07:00
Thomas S Hatch
e62ddb5afa
Merge pull request #19881 from cachedout/issue_19807
...
Fixup returner handling.
2015-01-20 16:12:22 -07:00
Thomas S Hatch
0e679b6d7e
Merge pull request #19880 from whiteinge/msazure-dep-docs
...
Added depends section to Azure cloud module docstring
2015-01-20 16:11:46 -07:00
Thomas S Hatch
cd78d8a933
Merge pull request #19873 from Trax-air/fix-show_instance
...
Fixes #19597 - show_instance now shows the cloud_service dictionary under which the instance can be found
2015-01-20 16:09:47 -07:00
Thomas S Hatch
702e248b6c
Merge pull request #19865 from kev009/freebsd-ssd-grain
...
Add FreeBSD support to ssds grain
2015-01-20 16:07:04 -07:00
Thomas S Hatch
602b1a34aa
Merge pull request #19862 from kev009/freebsd-kmods
...
Add freebsdkmod changes to 2014.7.2 relnotes
2015-01-20 16:06:17 -07:00
Thomas S Hatch
275ac80446
Merge pull request #19835 from The-Loeki/fix_rh_mtu
...
Fix MTU setting in network.managed for RH systems
2015-01-20 15:48:06 -07:00
Colton Myers
bd83ad6d0d
Use six.iteritems
2015-01-20 15:44:11 -07:00
Thomas S Hatch
1d5e8b5aaa
Merge pull request #19826 from jfindlay/sdecode_jinja
...
properly decode jinja rendering, fixes #19173
2015-01-20 15:36:58 -07:00
