Thomas S Hatch
c362592044
Merge pull request #19040 from whiteinge/salt-log-granular-example
...
Updates to the logging docs in the example conf files
2014-12-17 14:52:35 -07:00
Thomas S Hatch
2e28c3868a
Merge pull request #19038 from mikaelhm/add-depth-to-git-latest
...
An attempt to solve #16920 - added an optional depth parameter to salt.states.git.latest.
2014-12-17 14:51:15 -07:00
Thomas S Hatch
5af06f26ee
Merge pull request #19037 from jacksontj/develop
...
Misc. eauth cleanup
2014-12-17 14:50:19 -07:00
Thomas S Hatch
45365c095e
Merge pull request #19029 from basepi/merge-forward
...
Merge forward from 2014.7 to develop
2014-12-17 14:48:01 -07:00
Thomas S Hatch
0fea74d51c
Merge pull request #19025 from gravieinc/develop
...
Fix for #18994
2014-12-17 14:44:58 -07:00
Thomas S Hatch
d13d8b37b1
Merge pull request #19017 from rupeshta/at_unit_tests
...
At unit tests
2014-12-17 14:44:04 -07:00
Thomas S Hatch
ea28266b35
Merge pull request #19014 from nmadhok/fix-state-file-serialize
...
Adding ability to do a test run with test=True.
2014-12-17 14:42:35 -07:00
Thomas S Hatch
60f1e368bc
Merge pull request #19008 from juiceinc/bugfix/tomcat-pillar
...
Backwards compatibility for Tomcat module Pillar configuration
2014-12-17 14:41:52 -07:00
Thomas S Hatch
a261e5bb31
Merge pull request #19004 from jacksontj/2014.7
...
Fix for new threaded reactor
2014-12-17 14:39:57 -07:00
Thomas S Hatch
b9d5b22559
Merge pull request #19002 from steverweber/network_wol
...
include wol in network module
2014-12-17 14:39:44 -07:00
Thomas S Hatch
c2c9e56b82
Merge pull request #18931 from cachedout/cli_refactor
...
Refactor the entire CLI out of __init__
2014-12-17 14:37:13 -07:00
Thomas S Hatch
6263382858
Merge pull request #18918 from cachedout/salt_cli_retcode
...
Make salt cli return a non-zero error code if an error occurred
2014-12-17 14:36:51 -07:00
Pedro Algarvio
6d27990c58
Merge pull request #19060 from techhat/impacket1
...
Switch from smbclient to impacket
2014-12-17 19:48:22 +00:00
Nitin Madhok
4cb2fd604c
Refactor mdadm tests
2014-12-17 14:27:51 -05:00
Joseph Hall
b347e7706b
Merge pull request #19059 from rallytime/docs_fix
...
Correct master_sign_key_name reference
2014-12-17 12:15:56 -07:00
Erik Johnson
721699d2bb
Fix traceback for non-string values in lxc config files
...
Resolves #19055 .
2014-12-17 13:05:48 -06:00
Nitin Madhok
c7eee6385b
Forgot to end with quotes
2014-12-17 13:48:57 -05:00
Nitin Madhok
502b340553
Fixing unit tests for mdadm
2014-12-17 13:46:34 -05:00
Joseph Hall
bc58c569ab
Update docs for impacket dep
2014-12-17 11:45:49 -07:00
Joseph Hall
0154515873
Switch from smbclient to impacket
2014-12-17 11:40:26 -07:00
rallytime
926c486587
Correct master_sign_key_name reference
...
Fixes #19053
2014-12-17 11:32:23 -07:00
C. R. Oldham
93f76faaf6
Merge pull request #19045 from techhat/smbutil
...
Adding initial utils lib for SMB
2014-12-17 09:46:05 -07:00
Michael Scherer
1b2120b128
Add a option 'shared' for the type of git repository to create
...
--shared is used to specify the permission of the
git repository.
2014-12-17 17:27:22 +01:00
Joseph Hall
85fc273521
Linting
2014-12-17 08:59:26 -07:00
Joseph Hall
5b30c15cf7
Wrap impacket.smbconnection.putFile()
2014-12-17 08:36:05 -07:00
Nitin Madhok
48c5b32b81
Fixing salt.modules.mdadm.create and correcting incorrect code. Fixes #18991
2014-12-17 09:41:36 -05:00
Rupesh Tare
c28620b805
created unit test cases for linux_lvm module
2014-12-17 19:54:11 +05:30
Steve Weber
e7acf3a399
Update network.py
...
fix lint
2014-12-17 09:10:37 -05:00
Joseph Hall
efa011dbaa
Adding initial utils lib for SMB
2014-12-16 21:00:35 -07:00
Jason Wolfe
317ff52631
The uninstall operation needs to inherit DPKG_ENV_VARS set above as install and upgrade currently do. Without this packages that prompt on removal cause that state to hang. resolvconf in particular prompts you with a warning about rebooting your system after removal.
2014-12-16 18:39:10 -07:00
Seth House
7ce1becf34
Added note about using log_level_logfile with log_granular_levels
2014-12-16 18:18:21 -07:00
Seth House
90edd2185b
Removed trailing comma from log_granular_levels example; is invalid YAML
...
Thanks to F. Langelier for the report.
2014-12-16 18:13:07 -07:00
Mike Place
71bba6c676
Merge pull request #19039 from cachedout/progess_docs
...
Add docs to progress outputter
2014-12-16 17:37:47 -07:00
Thomas Jackson
82a42482de
Cleanup "rights" function
...
Since a success followed by a failure is still a success, there is no reason to check the rest
In addition, consolidating the logic to remove the local "good" since it isn't needed
2014-12-16 16:37:12 -08:00
Mike Place
2d38be6952
Add docs to progress outputter
2014-12-16 17:34:05 -07:00
Thomas S Hatch
df4cf1c506
Merge pull request #19033 from rallytime/disable_tests
...
Disable zcbuildout tests as they are not running reliably.
2014-12-16 17:04:00 -07:00
Mikael H. Møller
502a7538eb
removed trailing white space
2014-12-16 15:52:23 -08:00
Thomas S Hatch
b93a77fd5b
Merge pull request #19031 from rallytime/pylint_fix
...
Fix yumpkg pylint error
2014-12-16 16:49:48 -07:00
Thomas S Hatch
9b76717646
Merge pull request #19036 from basepi/lithium-saltssh-release
...
Add salt-ssh publish wrapper to lithium release notes
2014-12-16 16:49:17 -07:00
rallytime
b76f49b9d0
Pylint fix and skip all of the classes
2014-12-16 16:21:27 -07:00
Mikael H. Møller
3a50f1d503
added an optional depth parameter to salt.states.git.latest
2014-12-16 15:19:21 -08:00
Thomas Jackson
09039f3f6f
Remove getter-- since this is just a property
2014-12-16 15:16:17 -08:00
Colton Myers
e0b6f1623c
Add publish wrapper to lithium release notes
2014-12-16 16:13:03 -07:00
Colton Myers
8d8b1be86b
Add publish.runner wrapper function for salt-ssh
2014-12-16 16:09:06 -07:00
rallytime
7f258bf729
Disable zcbuildout tests as they are not running reliably.
...
These tests are not running reliably, aren't quite testing the functionalty
the way they should, and take too long to run as unit tests. When these get
reinstated, they should be implemented as integration tests instead of unit
tests.
2014-12-16 16:00:51 -07:00
Colton Myers
fc16bd16c0
Merge branch '2014.7' into merge-forward
...
Conflicts:
doc/faq.rst
doc/ref/states/compiler_ordering.rst
doc/topics/best_practices.rst
doc/topics/development/conventions/formulas.rst
salt/config.py
salt/modules/state.py
salt/states/mount.py
salt/utils/event.py
tests/unit/utils/process_test.py
2014-12-16 14:45:25 -07:00
Thomas S Hatch
215a4d0e89
Merge pull request #19027 from cvrebert/patch-1
...
utils/__init__.py: rm redundant import
2014-12-16 14:00:15 -07:00
Thomas S Hatch
b448a152af
Merge pull request #19019 from jacksontj/2014.7-config
...
Backport #19012 to 2014.7
2014-12-16 13:01:55 -07:00
Chris Rebert
eb72efd0c0
utils/__init__.py: rm redundant import
...
************* Module salt.utils
salt/utils/__init__.py💯 [W0404(reimported), ] Reimport 'salt.defaults.exitcodes' (imported line 97)
2014-12-16 11:55:31 -08:00
Thomas S Hatch
a5c61bf39b
Merge pull request #19012 from jacksontj/develop
...
Fix infinites spinning in minion RemoteFileClient
2014-12-16 12:34:12 -07:00