jfindlay
2a7404b1b2
Merge pull request #22113 from borgstrom/pyobjects-req-issue-2014.7
...
Fix a bug with the implicit list handling in pyobjects requisites
2015-03-28 11:21:51 -06:00
jfindlay
f0b78e2b1b
Merge pull request #22109 from twangboy/win_install_ini
...
Pull minion config settings from minion conf
2015-03-28 11:18:45 -06:00
jfindlay
fb080b1e2f
Merge pull request #22107 from lyft/fix-grafana-dict-profile
...
Fix for grafana dict profiles
2015-03-28 11:17:25 -06:00
Suraj Deshmukh
95d14c3a5b
Datetime support for msgpack for issue-21721
2015-03-28 19:46:37 +05:30
Damian Myerscough
47d4772010
Fixing KeyError
2015-03-27 22:45:25 -07:00
Damian Myerscough
3c3ea84585
Fix PEP8 complaint
2015-03-27 21:44:58 -07:00
Damian Myerscough
d22572d627
Fixing KeyError when there are no additional pages
2015-03-27 21:40:24 -07:00
Evan Borgstrom
181df2e489
Fix a bug with the implicit list handling in pyobjects requisites
...
When specifying a requisite and you only need to list a single item you
can specify it without being wraped in a list and we will handle it
automatically. This was being handled when we built our attrs to output
the final data, but this failed when you extended a require requisite
inside of a context manager.
2015-03-27 21:04:00 -07:00
twangboy
de85a03add
Pull minion config settings from minion conf
2015-03-28 00:14:01 +00:00
Thomas S Hatch
8800629260
Merge pull request #22101 from cro/bp-21273
...
Backport #21273 to 2015.2
2015-03-27 17:36:36 -06:00
Thomas S Hatch
2136b3f765
Merge pull request #22097 from basepi/clean_kwargs_mine
...
[2015.2] Clean kwargs in mine.send
2015-03-27 17:34:37 -06:00
Ryan Lane
f6c9b922b0
Fix for grafana dict profiles
2015-03-27 16:01:46 -07:00
Thomas S Hatch
8278f32f30
initial service beacon
...
I still want to add in support to check for port bindings
2015-03-27 16:43:31 -06:00
Thomas S Hatch
9ecaabfd90
I thought I changed the to 2048 a while ago....
2015-03-27 16:43:31 -06:00
Mike Place
ef942ce3c8
Document becaon intervals
2015-03-27 16:38:36 -06:00
Mike Place
50588717a1
Beacon interval scheduling
2015-03-27 16:38:36 -06:00
Thomas S Hatch
e4e758138f
Merge pull request #22069 from keesbos/bugfix-git_pillar
...
Fix bug introduced in a428023d89
2015-03-27 16:32:17 -06:00
Colton Myers
53bf0b8728
Clean kwargs in mine.send
...
Fixes #22058
2015-03-27 16:19:27 -06:00
Colton Myers
3125264786
Merge pull request #22096 from basepi/ssh_auth.absent.source.versionadded
...
Add versionadded for ssh_auth.absent source argument
2015-03-27 16:06:11 -06:00
Colton Myers
68a68b3c10
Add versionadded for ssh_auth.absent source argument
2015-03-27 16:05:31 -06:00
jfindlay
689e1ab44a
Merge pull request #22070 from dmyerscough/hostnamectl-change
...
systemd hostnamectl
2015-03-27 15:21:05 -06:00
Thomas S Hatch
a4c0c2b5c3
Merge pull request #22090 from jacobhammons/2015.2
...
Rebuilt salt man page
2015-03-27 15:06:13 -06:00
Thomas S Hatch
382582545b
Merge pull request #22093 from cro/bp-20699
...
Backport 20699
2015-03-27 15:05:53 -06:00
Clint Armstrong
90a8801e58
add test state
2015-03-27 17:01:03 -04:00
Clint Armstrong
1670b36b3c
initial tests working
2015-03-27 16:21:03 -04:00
Thomas S Hatch
52c3053a41
Add beacon event firing on the minion
2015-03-27 14:19:22 -06:00
Thomas S Hatch
ef34cb63ba
Add beacon events to the minion event bus - raet
2015-03-27 14:19:22 -06:00
Erik Johnson
cca5adfddd
Merge pull request #22092 from makinacorpus/lxc
...
lxc: reconfigure fixes
2015-03-27 15:11:02 -05:00
Clint Armstrong
aeb969623f
dict conversion complete
2015-03-27 15:38:32 -04:00
Mathieu Le Marec - Pasquet
ab84acbb64
lxc: reconfigure fix memory
2015-03-27 20:23:45 +01:00
Mathieu Le Marec - Pasquet
08c1125c28
lxc: reconfigure fix gateway
2015-03-27 20:16:04 +01:00
jfindlay
6e5d0b4990
Merge pull request #22074 from borgstrom/pyobjects-reqs-2014.7
...
Fix requisites missing from pyobjects that were introduced in 2014.7
2015-03-27 12:51:07 -06:00
Jacob Hammons
7cb6c8fdcb
Updated salt man page
2015-03-27 12:15:49 -06:00
Thomas S Hatch
596dbc3ef2
Merge pull request #22088 from basepi/python_shell.remoteex
...
[2015.2] Default to python_shell=True for cmd.run direct remote execution calls
2015-03-27 11:37:05 -06:00
Thomas S Hatch
eafc398724
Merge pull request #22086 from claudiupopescu/boto_vpc_internet_gateway
...
Adds support for VPC internet gateways
2015-03-27 11:31:23 -06:00
jfindlay
7bc4fc5140
Merge pull request #22079 from jayeshka/nftables-unit-test
...
adding nftables unit test
2015-03-27 11:17:31 -06:00
Thomas S Hatch
42e7bb89c8
Merge pull request #21798 from isbm/isbm-nagios-module-fixes
...
Multiple bugixes for new "nagios_json" module
2015-03-27 10:54:22 -06:00
Colton Myers
23c51d19b6
Pull out python_shell default handling to a helper method
2015-03-27 10:48:20 -06:00
Thomas S Hatch
22bb6836fd
Merge pull request #22072 from thatch45/lazy_functions
...
Add back functions to client loader
2015-03-27 10:47:46 -06:00
Justin Findlay
d9375adc6c
fix LVM tests for new LVM code
2015-03-27 10:43:22 -06:00
Thomas S Hatch
06af80de24
don't try to eval deleted items
2015-03-27 10:30:05 -06:00
Colton Myers
87df65ae27
Add comments
2015-03-27 10:29:12 -06:00
Colton Myers
546187992f
Default to python_shell=True for cmd.run in remote execution
2015-03-27 10:27:45 -06:00
Claudiu Popescu
aa47228aba
Adds support for VPC internet gateways
2015-03-27 17:13:17 +01:00
Damian Myerscough
feff926db7
Fixing lint error
2015-03-27 09:05:58 -07:00
Clint Armstrong
67438f779f
before chaning to dict
2015-03-27 11:46:49 -04:00
Nicole Thomas
5c70cdd349
Merge pull request #22085 from rallytime/pylinting
...
Python 3 compat for azurefs.py
2015-03-27 09:37:31 -06:00
rallytime
2bd8465023
Python 3 compat for azurefs.py
2015-03-27 09:07:57 -06:00
jfindlay
5a0f056e90
Merge pull request #22077 from ticosax/fix-doc-string
...
states.docker: fix docstring
2015-03-27 08:15:25 -06:00
Jayesh Kariya
0cedee74f5
removed pylint errors
2015-03-27 18:21:56 +05:30
