Erik Johnson
1cd9a4d1b4
Add some debug logging for git_pillar
...
This adds logging showing which directory and which environment are
being processed for each pillar_dir being evaluated.
2015-11-20 01:18:20 -06:00
Erik Johnson
fac588c0bb
Add HEAD ref in git_pillar/winrepo checkout
...
This works around a traceback which occurs due to an API change in pygit
0.21, which occurs when attempting to check out a branch other than the
default. salt.utils.gitfs doesn't actually clone the repository, it adds
a remote and fetches it, so the local ref for HEAD is not present.
pygit2 tries to reference it in the process of checking out a
non-default branch, resulting in a KeyError.
This workaround checks for the existence of the local ref corresponding
to HEAD, and creates it if it was not present.
Fixes #28311 .
2015-11-20 00:52:46 -06:00
Mike Place
c5b667f048
Handle failures inside python's inspect if a module is reloaded
...
Python has a known issue wherein calls to the inspect module which traverse the frame stack will fail if a module has been reloaded.
This caused a serious bug wherein certain uses of the depends decorator would fail hard and prevent the salt module from being initialized and loaded.
This works around that by simply ignoring the inspect failure.
cc: @sjorge (This may impact your fix for esky in #25946 . Please have a look.)
2015-11-19 16:30:17 -07:00
makearl
b091cc1910
Updating deprecation path to be Nitrogen
2015-11-19 15:58:39 -06:00
Mike Place
714ef8ff27
Merge pull request #29057 from lyft/file-manage-local-source-list
...
Add local file support for file.managed source list
2015-11-19 14:57:34 -07:00
Mike Place
30d0e7a0c2
Merge pull request #29008 from k00mi/develop
...
Make systemd service state less slow
2015-11-19 14:54:48 -07:00
Mike Place
040d89e0ad
Merge pull request #29051 from pass-by-value/manage_salt_proxy
...
Manage salt proxy
2015-11-19 14:54:02 -07:00
Mike Place
601d9b7389
Remove unused import
2015-11-19 14:51:47 -07:00
justinta89
64a62662ef
Added sys import
2015-11-19 14:42:15 -07:00
Justin Anderson
978cbbeee0
Merge pull request #1 from jfindlay/utf_diff
...
file state: integration test difflib version check
2015-11-19 14:13:48 -07:00
Justin Findlay
401e4bfd33
file state: integration test difflib version check
2015-11-19 14:10:29 -07:00
Lukas Braun
ad256b9a89
Merge pull request #1 from jfindlay/dtest
...
systemd module: new unit test for available
2015-11-19 21:59:00 +01:00
Justin Findlay
9a4959a42b
systemd module: new unit test for available
2015-11-19 13:29:08 -07:00
Mike Place
c7e3670324
Merge pull request #29058 from TronPaul/requests-connection-error
...
ConnectTimeout does not exist in all requests>=1.0.0
2015-11-19 13:16:53 -07:00
Mike Place
b5a92a5fc3
Pack log handlers with grains and mods
...
Refs #28999
2015-11-19 13:07:30 -07:00
Mike Place
645f687b54
Merge pull request #29055 from cachedout/style_variable_length
...
Add section to style guide
2015-11-19 12:59:46 -07:00
Mike Place
e2959aab45
Merge pull request #29053 from kevinlondon/patch-1
...
Update rabbitmq_user.py
2015-11-19 12:35:08 -07:00
Aditya Kulkarni
a9f70d53ab
Change to salt.utils.fopen
2015-11-19 14:34:32 -05:00
Mark McGuire
2787ba0b61
ConnectTimeout does not exist in all requests>=1.0.0
2015-11-19 13:30:33 -06:00
Mike Place
2bdb67edfd
Merge pull request #29019 from Ch3LL/develop
...
Clarify pillar top file requirement for git external pillars
2015-11-19 12:28:48 -07:00
Mike Place
f4f43381fc
Merge pull request #29017 from jfindlay/pager_util
...
pagerduty runner: add missing salt.utils import
2015-11-19 12:28:35 -07:00
Mike Place
1c61bce0a6
Merge pull request #29039 from alprs/feature-virtualenv_pip_pkgs
...
Allow passing list of pip packages to virtualenv.managed
2015-11-19 12:13:50 -07:00
Mike Place
b8666a8598
Merge pull request #29022 from sjorge/state-smartos-regression2
...
state smartos - fixes from dogfooding
2015-11-19 12:11:04 -07:00
Mike Place
b692ab1cfb
Merge pull request #29047 from schwing/fix-gpg-exception
...
Fix salt.modules.gpg.import_key exception: 'GPG_1_3_1 referenced before assignment'
2015-11-19 12:07:36 -07:00
Mike Place
b4fc2f28a4
Merge pull request #29050 from terminalmage/issue29015
...
Make git_pillar global config option docs more prominent
2015-11-19 12:06:38 -07:00
Mike Place
4b3b2fe1e7
Merge pull request #29048 from nmadhok/patch-1
...
Fix incorrect debug log statement
2015-11-19 12:04:10 -07:00
Mike Place
2ce85f3dd4
Merge pull request #29045 from RealKelsar/develop
...
Gentoo new package installation
2015-11-19 12:03:49 -07:00
Mike Place
e52c117368
Merge pull request #29024 from jfindlay/run_test
...
cache runner test: add new unit tests
2015-11-19 12:02:54 -07:00
Mike Place
3a7e5a105b
Add section to style guide
...
A brief discussion of variable naming standards in Salt.
2015-11-19 12:01:18 -07:00
Mike Place
bcec8d8608
Merge pull request #28967 from cro/fx2_switch
...
Fix some issues with password changes
2015-11-19 11:57:39 -07:00
Kevin London
66bdfbfeba
Update rabbitmq_user.py
...
Corrected spacing to make it clear that the permissions were a level below the vhost name.
2015-11-19 10:44:08 -08:00
Aditya Kulkarni
df5e127c06
Add absolute import
2015-11-19 13:36:28 -05:00
Aditya Kulkarni
451c62cfdf
Add pylint disable
2015-11-19 13:33:05 -05:00
justinta89
f947e1e549
Adjusted the expected output to match the actual results
2015-11-19 11:32:18 -07:00
Mike Place
d6bbd5bb6b
Merge pull request #29037 from eliasp/patch-3
...
Typo (FulLControl → FullControl)
2015-11-19 11:17:34 -07:00
Ch3LL
5df6674e8e
remove whitespace
2015-11-19 11:02:57 -07:00
Erik Johnson
20da057a94
Make git_pillar global config option docs more prominent
2015-11-19 11:52:45 -06:00
Aditya Kulkarni
4a3c8cc399
Add doc and test support
2015-11-19 12:51:45 -05:00
C. R. Oldham
67b5b9b8d2
Add docs on automatic lockout on failed auth attempts.
2015-11-19 10:02:21 -07:00
C. R. Oldham
8a3cea4d95
Lint.
2015-11-19 09:53:04 -07:00
Nitin Madhok
9489d6c3b6
Update vmware.py
2015-11-19 11:18:17 -05:00
Tetja Rediske
0ec3a7814e
We can't query installed use flags for a non installed pkg
2015-11-19 16:39:02 +01:00
Tetja Rediske
27f79dc073
The quoting will lead to false atoms, since emerge isn't called through a shell
2015-11-19 16:29:46 +01:00
John Schwinghammer
813f6e6808
Fix 'GPG_1_3_1 referenced before assignment'
...
- Fix gpg.import_key() exception:
"local variable 'GPG_1_3_1' referenced before assignment"
- Update the unit tests to test both the gpg.GPG_1_3_1=True and
gpg.GPG_1_3_1=False cases.
2015-11-19 09:27:46 -06:00
Quan Tong Anh
d5e5dbbaf8
boto_ec2: allow to choose an existing network interface when launching
...
an instance
2015-11-19 19:47:08 +07:00
Jorge Schrauwen
83ac6573be
Fixed "updates to disks are only allowed when state is stopped, currently: running (running)" when kvm_reboot is true
2015-11-19 11:03:15 +00:00
Jorge Schrauwen
b9718a3ba5
fix some more weird edge cases
2015-11-19 09:42:51 +00:00
Andreas Lutro
f9bff51382
allow passing list of pip packages to virtualenv.managed
2015-11-19 10:27:54 +01:00
Elias Probst
ab1b84545b
Typo (FulLControl → FullControl)
2015-11-19 07:55:32 +01:00
Megan Kearl
7f0a89be23
Fix pep8 whitespace errors
2015-11-18 20:46:20 -06:00
