Erik Johnson
d2b3da6bd7
Add note about libssh2 optdepend for ssh access w/libgit2
...
See https://github.com/saltstack/salt/issues/15424#issuecomment-63493011
2014-11-18 22:08:29 -06:00
Thomas S Hatch
873d1c1803
Merge pull request #18221 from multani/fix/git-config-set-shell-escape
...
Fix Git's config set with values containing white spaces.
2014-11-18 17:14:43 -07:00
Thomas S Hatch
7975b0a11c
Merge pull request #18238 from slafs/salt-ssh-pillar-fix
...
fix pillar get function when using salt-ssh
2014-11-18 17:12:12 -07:00
Thomas S Hatch
30faaaf9e5
Merge pull request #18219 from s0undt3ch/hotfix/merge-18194
...
Merge #18194 & move `salt.utils.six` to `salt.ext.six`
2014-11-18 17:10:14 -07:00
Thomas S Hatch
8a71736e6c
Merge pull request #18240 from freimer/develop
...
Add SSL/TLS option to profile
2014-11-18 17:08:58 -07:00
Fred Reimer
657cf261aa
Add SSL/TLS option to profile
2014-11-18 18:25:41 -05:00
Thomas S Hatch
e3d2518af2
Merge pull request #18213 from sumso/develop
...
Update sqlite3.py to enable autocommit
2014-11-18 15:23:49 -07:00
Thomas S Hatch
1a0434aeb0
Merge pull request #18209 from techhat/cloudroster
...
Add Salt Cloud roster
2014-11-18 15:23:05 -07:00
Sławek Ehlert
649afcd97a
fix pillar get function when using salt-ssh
...
Since there were some changes in ``salt.modules.pillar.get`` (i.e. added
``merge`` and ``delimiter`` arg) it seems that this module should also
be updated to use the new form of ``pillar.get`` function while
using salt via SSH (salt-ssh).
2014-11-18 23:22:27 +01:00
Thomas S Hatch
7260c7044e
Merge pull request #18235 from thatch45/cachedout-issue_16864
...
Merge #18057
2014-11-18 15:17:07 -07:00
Thomas S Hatch
68c03df11c
fix lint
2014-11-18 15:15:39 -07:00
Thomas S Hatch
bae0f5e07d
Merge branch 'issue_16864' of https://github.com/cachedout/salt into cachedout-issue_16864
2014-11-18 15:15:03 -07:00
Thomas S Hatch
63a7ad1c4d
Merge pull request #18229 from rallytime/pylint_develop
...
Fix some pylint errors on develop
2014-11-18 15:13:03 -07:00
Thomas S Hatch
fd98c5e136
Merge pull request #18230 from notpeter/develop
...
states.blockdev appeared in 2014.7
2014-11-18 15:05:18 -07:00
Jonathan Ballet
97959959ca
Add future's absolute import to fix importation of git in tests
...
Tests in pillar.py are importing the "git" module, which is supposed to
be "GitPython", bt since Python 2.x doesn't use absolute import by
default, it imports the "git" submodule, which defines the tests for the
Git module of Salt, instead.
2014-11-18 22:46:35 +01:00
Peter Tripp
c71fe5aba1
states.blockdev appeared in 2014.7
2014-11-18 13:27:09 -08:00
Pedro Algarvio
905aba6e79
Make sat.ext a package
2014-11-18 21:26:45 +00:00
Pedro Algarvio
d0ba57f804
Move salt.utils.six to salt.ext.six
2014-11-18 21:25:31 +00:00
rallytime
018daa7ac6
Fix some pylint errors on develop
...
There are some more pylint errors left-over from a merge-forward.
However, those will be cleaned up on the next merge-forward.
2014-11-18 14:22:43 -07:00
Nitin Madhok
28f7697168
Correcting incorrect replacement
2014-11-18 21:22:27 +00:00
Nitin Madhok
22b470a560
Correcting incorrect replacement
2014-11-18 21:22:27 +00:00
Nitin Madhok
f8afe63d7d
Correcting incorrect replacement
2014-11-18 21:22:27 +00:00
Nitin Madhok
a39405f09f
Replace python six module with salt.utils.six
2014-11-18 21:22:27 +00:00
Nitin Madhok
ce0f96982d
Replace python six module with salt.utils.six
2014-11-18 21:22:27 +00:00
Nitin Madhok
c7afb93f7b
Replaced module six in file /salt/template.py
2014-11-18 21:22:27 +00:00
Nitin Madhok
a2d29c62a4
Replaced module six in file /salt/state.py
2014-11-18 21:22:26 +00:00
Nitin Madhok
75f8695a33
Replaced module six in file /salt/minion.py
2014-11-18 21:22:26 +00:00
Nitin Madhok
c44f50dc04
Replaced module six in file /salt/master.py
2014-11-18 21:22:26 +00:00
Nitin Madhok
5a0c04960b
Replaced module six in file /salt/key.py
2014-11-18 21:22:26 +00:00
Nitin Madhok
45c60b05b7
Replaced module six in file /salt/crypt.py
2014-11-18 21:22:26 +00:00
Nitin Madhok
3dd58d9bc2
Replaced module six in file /salt/config.py
2014-11-18 21:22:26 +00:00
Nitin Madhok
778f806083
Replaced module six in file /salt/runner.py
2014-11-18 21:22:26 +00:00
Nitin Madhok
cef5b1997d
Replaced module six in file /salt/payload.py
2014-11-18 21:22:24 +00:00
Nitin Madhok
f4a78803e1
Replaced module six in file /salt/overstate.py
2014-11-18 21:21:44 +00:00
Nitin Madhok
6077b2fe64
Replaced module six in file /salt/config.py
2014-11-18 21:21:43 +00:00
Nitin Madhok
8f49fc1775
Replaced module six in file /salt/cloud/clouds/opennebula.py
2014-11-18 21:21:43 +00:00
Nitin Madhok
4423aec5d6
Replaced module six in file /salt/utils/thin.py
2014-11-18 21:21:43 +00:00
Nitin Madhok
4f9d9ea226
Replaced module six in file /salt/pillar/cobbler.py
2014-11-18 21:21:43 +00:00
Nitin Madhok
52f23c945f
Replaced module six in file /salt/modules/zypper.py
2014-11-18 21:21:43 +00:00
Nitin Madhok
f244d94c74
Replaced module six in file /salt/returners/carbon_return.py
2014-11-18 21:21:43 +00:00
Nitin Madhok
8c070d845a
Replaced module six in file /salt/tops/cobbler.py
2014-11-18 21:21:43 +00:00
Nitin Madhok
1d70148ebd
Replaced module six in file /salt/cloud/clouds/joyent.py
2014-11-18 21:21:43 +00:00
Nitin Madhok
adae0101ab
Replaced module six in file /salt/utils/http.py
2014-11-18 21:21:43 +00:00
Nitin Madhok
90f843c36e
Replaced module six in file /salt/states/pkg.py
2014-11-18 21:21:43 +00:00
Nitin Madhok
d1cc6e7501
Replaced module six in file /salt/pillar/s3.py
2014-11-18 21:21:42 +00:00
Nitin Madhok
de862e818c
Replaced module six in file /salt/pillar/pepa.py
2014-11-18 21:21:42 +00:00
Nitin Madhok
741e085e5c
Replaced module six in file /salt/pillar/mysql.py
2014-11-18 21:21:42 +00:00
Nitin Madhok
edca109350
Replaced module six in file /salt/pillar/hiera.py
2014-11-18 21:21:42 +00:00
Nitin Madhok
7fdc3332af
Replaced module six in file /salt/pillar/__init__.py
2014-11-18 21:21:42 +00:00
Nitin Madhok
093802c4e1
Replaced module six in file /salt/log/handlers/logstash_mod.py
2014-11-18 21:21:42 +00:00
