Pedro Algarvio
c85d38c493
Merge pull request #20893 from cvrebert/pylint-enable
...
re-enable pylint instead of disabling it twice
2015-02-21 08:29:16 +00:00
Chris Rebert
ea02ef58b7
re-enable pylint instead of disabling it twice
2015-02-20 23:50:30 -08:00
jfindlay
17824a9a19
Merge pull request #20889 from cvrebert/darwin-pkgutil-list-unshadow
...
Avoid shadowing list type in modules.darwin_pkgutil
2015-02-20 23:31:01 -07:00
Chris Rebert
2a52d54a20
Avoid shadowing list type in modules.darwin_pkgutil; fixes #20120
2015-02-20 21:52:25 -08:00
jfindlay
06cfc4ec88
Merge pull request #20892 from cvrebert/patch-1
...
cli/batch.py: re-enable pylint instead of disabling it twice
2015-02-20 22:33:54 -07:00
jfindlay
b2bb5ff086
Merge pull request #20891 from jfindlay/synology
...
pylint #20814
2015-02-20 22:29:40 -07:00
jfindlay
93c282c5d9
Merge pull request #20888 from jfindlay/s3fs
...
pylint #20885
2015-02-20 22:00:19 -07:00
Chris Rebert
4daeae3792
cli/batch.py: re-enable pylint instead of disabling it twice
...
Fixes apparent erratum from fb056b41c8
2015-02-20 20:52:05 -08:00
Justin Findlay
b9c386dd1b
fix lint
2015-02-20 21:30:09 -07:00
Jay McConnell
ef75c5f45a
Fix disk.usage for Synology OS
...
relates to issue <a href="https://github.com/saltstack/salt/issues/20790 ">#20790</a>
2015-02-20 21:28:17 -07:00
Justin Findlay
af68f010e0
fix lint
2015-02-20 21:16:20 -07:00
Joe Hoyle
5d8ba4aac2
Trim the env base off the dest file path in the s3fs fileserver
2015-02-20 21:40:35 -05:00
Thomas S Hatch
aa96665a2b
Merge pull request #20726 from claudiupopescu/boto-vpc-state
...
Boto VPC state draft proposal
2015-02-20 18:10:54 -07:00
Thomas S Hatch
093854f9cb
Merge pull request #20627 from claudiupopescu/boto-rds-state
...
Boto rds state draft
2015-02-20 18:09:29 -07:00
Thomas S Hatch
ee62332d78
Merge pull request #20586 from claudiupopescu/boto-rds
...
Boto rds module
2015-02-20 18:08:36 -07:00
Thomas S Hatch
740af3c8c7
Merge pull request #20870 from yesimon/merge_plists
...
Use plist from pkg in launchd runner.
2015-02-20 17:51:52 -07:00
Simon Ye
23f078d83a
Use plist from pkg in launchd runner.
2015-02-20 14:46:51 -05:00
Thomas S Hatch
a920b851f3
Merge pull request #20835 from rallytime/merge-20782
...
Merge #20782 with pylint fix
2015-02-20 11:21:16 -07:00
Thomas S Hatch
1d6e932a20
Merge pull request #20861 from jayeshka/win_autoruns-unit-test
...
adding win_autoruns unit test case
2015-02-20 11:20:57 -07:00
Thomas S Hatch
7f18365cd7
Merge pull request #20853 from dunz0r/ipcidr-doc-fix
...
Moved ipcidr-doc to ipcidr() instead of compound()
2015-02-20 11:20:44 -07:00
Thomas S Hatch
90994722f0
Merge pull request #20843 from matdrapeau/16556/ImportError_custom_dep
...
Adding current module directory to the sys.path when loading a module
2015-02-20 11:20:32 -07:00
Thomas S Hatch
df0371ece4
Merge pull request #20822 from peresadam/fix_format_call
...
Fixed dict unpacking in salt.utils.format_call
2015-02-20 11:19:38 -07:00
Thomas S Hatch
dc3e6b14b9
Merge pull request #20821 from claudiupopescu/boto-vpc-describe-subnets
...
Adds boto VPC describe subnets
2015-02-20 11:19:27 -07:00
Jayesh Kariya
014ce111ab
adding win_autoruns unit test case
2015-02-20 19:16:09 +05:30
Gabriel Fornaeus
320ba04b22
Moved ipcidr-doc to ipcidr() instead of compound()
2015-02-20 10:40:13 +01:00
Thomas S Hatch
a0440c61d0
Merge pull request #20837 from viktorkrivak/develop
...
Fix multi comps and multi dist bugs
2015-02-19 13:20:52 -07:00
Mathieu Drapeau
4bf1d6838a
Adding current module directory to the sys.path in order to
...
avoid dependencies import errors for other modules at the same
level. (https://github.com/saltstack/salt/issues/16556 )
2015-02-19 14:20:15 -05:00
Thomas S Hatch
16e1d5ce0c
Merge pull request #20829 from cachedout/mine_tok
...
Re-use minion token for mine_send
2015-02-19 10:41:40 -07:00
jfindlay
48ea69e749
Merge pull request #20830 from clinta/patch-1
...
Elasticsearch Timestamp in UTC
2015-02-19 10:39:23 -07:00
Viktor Krivak
a714d2f401
Fix multi comps and multi dist bugs
...
Fix line full_comp_list.union(set(kwargs['comps'])) which actually don't do anything, because union don't modify source set. Looks like typo...
It is possible to have multiple 'dist' in single repository, i.e. wheezy and wheezy-backports . So in consolidate repos, use dist also as a key.
2015-02-19 18:00:42 +01:00
Nicole Thomas
b578e5802a
Merge pull request #20827 from cachedout/key_clean
...
Better error message for first_auth
2015-02-19 09:50:54 -07:00
rallytime
fa5e991197
Pylint fix
2015-02-19 09:43:16 -07:00
Mike Place
2f334fd03e
Re-use minion token for mine_send
2015-02-19 09:37:28 -07:00
Mike Place
52339a3054
Include full salt-key command.
2015-02-19 09:23:59 -07:00
Colton Myers
ffbdbe5db2
Merge pull request #20832 from basepi/2014.7.2release
...
Update latest release in docs to 2014.7.2
2015-02-19 09:23:00 -07:00
Colton Myers
6338b4f820
Update latest release in docs
2015-02-19 09:20:45 -07:00
Mike Place
cf6cfa622e
Provide a hint for new users on minions with pending keys.
2015-02-19 09:11:38 -07:00
Clint Armstrong
e84b5c530e
Elasticsearch Timestamp in UTC
...
Elasticsearch timestamps are expected to be in UTC. Currently the returner sends the timestamp in localtime.
2015-02-19 11:07:18 -05:00
jfindlay
b70ffe2bb8
Merge pull request #20819 from jayeshka/slack_notify-unit-test
...
adding slack_notify unit test case
2015-02-19 08:21:30 -07:00
jfindlay
4c196c522d
Merge pull request #20820 from jayeshka/rpm-unit-test
...
adding rpm unit test case
2015-02-19 08:20:49 -07:00
jfindlay
7fcca3c0ca
Merge pull request #20825 from Unity-Technologies/chocolatey-forcex86
...
Added force_x86 to chocolatey install
2015-02-19 08:18:45 -07:00
Daniel Hobley
56a271cc8c
Added force_x86 to chocolatey install
2015-02-19 14:25:30 +01:00
Claudiu Popescu
6a8c538d11
Adds boto VPC describe subnets
2015-02-19 11:30:40 +01:00
Adam Peres
44a3777c85
Fixed dict unpacking in salt.utils.format_call
2015-02-19 11:24:15 +01:00
Jayesh Kariya
93d5a32bd8
adding rpm unit test case
2015-02-19 14:40:10 +05:30
Jayesh Kariya
6efb71fb6e
adding slack_notify unit test case
2015-02-19 14:38:51 +05:30
jfindlay
16fb2e2680
Merge pull request #20817 from mzupan/develop
...
fixing the doc for get_master_status return
2015-02-18 22:03:21 -07:00
Mike Zupan
7e6f2862bb
fixing the doc for get_master_status return
2015-02-18 20:06:34 -08:00
jfindlay
fac949e3b8
Merge pull request #20815 from terminalmage/add-versionadded-rst
...
Add versionadded directives to new state/module
2015-02-18 18:48:12 -07:00
Erik Johnson
2e30218e4a
Add versionadded directives to new state/module
2015-02-18 18:25:41 -06:00
