Mike Place
b083a9497b
Merge pull request #20567 from cachedout/more_git_test
...
Remove another test.
2015-02-10 11:22:40 -07:00
Nicole Thomas
d196ad2f6c
Merge pull request #20563 from thatch45/RobertFach-feature-20340-gem-sources
...
Merge #20382
2015-02-10 10:57:59 -07:00
Dmitry Kuzmenko
5291fa695f
Fixed lint errors
2015-02-10 20:20:07 +03:00
Dmitry Kuzmenko
de3b50a8c8
Added road_stats and lane_stats runners
2015-02-10 20:20:07 +03:00
Dmitry Kuzmenko
b7187c2685
Manage get_stats runner implementation.
2015-02-10 20:20:07 +03:00
Thomas S Hatch
8734d6f8cc
Merge pull request #20554 from Unity-Technologies/unzip-symlink
...
Fixed the extraction of symbolic links from zip archives
2015-02-10 10:18:14 -07:00
Thomas S Hatch
ad370bc856
Merge pull request #20500 from eliasp/2014.7-issue-20499-fileserver-encoding
...
Use same string encoding for results from all fileserver backends.
2015-02-10 10:00:04 -07:00
Thomas S Hatch
bd4bbd1eb4
Merge pull request #20495 from jcockhren/gpg-renderer-doc-update
...
Fixed language describing the two ways to enable the gpg renderer
2015-02-10 09:57:13 -07:00
Thomas S Hatch
c8a1e6c322
Merge pull request #20476 from atbell/get_signed_cert_in_tls_module
...
get certs in tls module
2015-02-10 09:56:34 -07:00
Thomas S Hatch
54de4cc592
Merge branch 'feature-20340-gem-sources' of https://github.com/RobertFach/salt into RobertFach-feature-20340-gem-sources
2015-02-10 09:51:22 -07:00
Thomas S Hatch
630d03b4b3
Merge pull request #20447 from jacksontj/2015.2
...
2015.2: backport overhaul of LazyLoader from #20274
2015-02-10 09:46:53 -07:00
Mike Place
a122a78a01
Merge pull request #20562 from s0undt3ch/develop
...
Add W1202(logging-format-interpolation) to disabled PyLint checks
2015-02-10 09:44:34 -07:00
Pedro Algarvio
dd17598afb
Add W1202(logging-format-interpolation) to disabled PyLint checks
2015-02-10 16:39:53 +00:00
Nicole Thomas
182fc23824
Merge pull request #20559 from rallytime/pylinting
...
Fix python 3 compat errors that were inadvertently reverted
2015-02-10 09:39:38 -07:00
Erik Johnson
85a689ed63
Merge pull request #20550 from kim0/freebsd-pkg-upgrade-single-pkg
...
Add support for upgrading named packages on FreeBSD pkgng
2015-02-10 10:38:34 -06:00
Mike Place
80720f922b
Merge pull request #20561 from cachedout/gitfs_disable
...
Disable gitfs test that does not produce valuable data
2015-02-10 09:34:40 -07:00
Mike Place
1e14c9d097
Disable gitfs test that does not produce valuable data
2015-02-10 10:06:01 -07:00
rallytime
66cb14cea5
Fix python 3 compat errors that were inadvertently reverted
2015-02-10 09:07:09 -07:00
Daniel Hobley
e3e9f20510
Pylint
2015-02-10 17:04:57 +01:00
Mike Place
0341fdcdbd
Merge pull request #20556 from cachedout/fix_loader_pylint
...
Fix loader pylint
2015-02-10 08:47:46 -07:00
Mike Place
c15756b50f
Fix loader pylint
2015-02-10 09:14:34 -07:00
Mike Place
2e9dfe844a
Merge pull request #20553 from cachedout/fix_random_test
...
Fix mod_random test on older distros
2015-02-10 08:47:05 -07:00
Mike Place
f8aeef25fc
Fix mod_random test on older distros
2015-02-10 08:46:42 -07:00
Mike Place
9e1ae524fb
Merge pull request #20541 from toppur/develop
...
Update formulas.rst
2015-02-10 08:29:11 -07:00
Daniel Hobley
f893029b84
Fixed the extraction of symbolic links from zip archives
2015-02-10 16:26:39 +01:00
Damian Myerscough
98a296a221
Fix pylint errors
2015-02-09 23:13:23 -08:00
Damian Myerscough
4ee43e957f
Initial Kerberos Management
2015-02-09 22:08:11 -08:00
Jayesh Kariya
511a496946
resolved the error
2015-02-10 11:28:01 +05:30
Pedro Algarvio
f232f7f9fe
Merge pull request #20542 from saltstack/revert-20537-py-3-compat
...
Revert "More python 3 compatibility changes"
2015-02-10 04:51:06 +00:00
Nicole Thomas
a0d5c3dc79
Revert "More python 3 compatibility changes"
2015-02-09 19:57:38 -07:00
Nicole Thomas
31fd25b405
Merge pull request #20538 from s0undt3ch/hotfix/disable-py3-dict-fixes
...
Disable the modernize pylint plugin dict fixes
2015-02-09 19:57:09 -07:00
Ahmed Kamal
dfeaa19b0e
Linter happiness
2015-02-10 04:54:17 +02:00
Mike Place
f122c9f6ba
Merge pull request #20481 from jacksontj/loader
...
Add submodule support to LazyLoader
2015-02-09 19:52:33 -07:00
Ahmed Kamal
aa5ae496e0
Add support for upgrading named packages on FreeBSD pkgng
2015-02-10 04:38:20 +02:00
toppur
cdbaff63b7
Update formulas.rst
...
There's not keyword named 'base' here, should be 'default'.
2015-02-09 18:24:11 -08:00
Thomas Jackson
cf5157c533
Support arbitrarily deep modules
...
Note: salt can still only *call* modules on the first depth, but they can then import anything below
2015-02-09 17:51:06 -08:00
Thomas Jackson
7ea33b23ce
Change modulekey for submodule test-- to avoid namespace collisions
2015-02-09 17:51:05 -08:00
Thomas Jackson
ee69948dc4
pylint
2015-02-09 17:51:05 -08:00
Thomas Jackson
d869ce7e5f
Add support for submodules to LazyLoader
...
This was a feature that was inadvertently removed in #20274 , but since it was undocumented and untested no one noticed. Thanks to @steverweber for pointing it out.
This includes the feature as well as tests.
2015-02-09 17:51:05 -08:00
Nicole Thomas
523a8f8962
Merge pull request #20534 from rallytime/bp-20454
...
Backport #20454 to 2014.7
2015-02-09 18:34:10 -07:00
Nicole Thomas
4b862f56b8
Merge pull request #20537 from rallytime/py-3-compat
...
More python 3 compatibility changes
2015-02-09 18:32:52 -07:00
Nicole Thomas
a6fa35a6e6
Merge pull request #20533 from rallytime/bp-20521
...
Backport #20521 to 2014.7
2015-02-09 18:32:01 -07:00
Pedro Algarvio
b6101f7cb8
Disable the modernize pylint plugin dict fixes
2015-02-10 00:46:51 +00:00
rallytime
8b3a764bf8
Python 3 compat for flo/core.py
2015-02-09 17:17:43 -07:00
rallytime
4f1abf8d96
More Python 3 compat for linodepy.py
2015-02-09 17:15:33 -07:00
rallytime
3aa934abb4
Python 3 compat for haproxyconn_test.py
2015-02-09 17:14:04 -07:00
rallytime
bcafb5777f
Python 3 compat for osxdesktop_test.py
2015-02-09 17:13:09 -07:00
Nicole Thomas
3e2e9e3861
Merge pull request #20532 from rallytime/bp-20501
...
Backport #20501 to 2015.2
2015-02-09 17:10:30 -07:00
Nicole Thomas
525f00cb44
Merge pull request #20529 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-02-09 17:09:57 -07:00
Andrii Krykunenko
f1aa6931a4
Fix wrong check for rvm script existence
2015-02-09 16:56:38 -07:00
