jfindlay
1fa8c7aab7
Merge pull request #20953 from rallytime/bp-20888
...
Backport #20888 to 2014.7
2015-02-23 17:01:01 -07:00
jfindlay
dfef980918
Merge pull request #20951 from rallytime/bp-20837
...
Backport #20837 to 2014.7
2015-02-23 16:44:08 -07:00
Justin Findlay
e9ff8ffd19
fix lint
2015-02-23 15:58:34 -07:00
Joe Hoyle
86029e7369
Trim the env base off the dest file path in the s3fs fileserver
2015-02-23 15:58:34 -07:00
Viktor Krivak
5d1bc21901
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-23 15:55:00 -07:00
jfindlay
55e7927077
Merge pull request #20922 from bbinet/2014.7_fix20921
...
2014.7: fix issue 20921
2015-02-23 08:35:02 -07:00
Robin Björklin
c0f9b9dd8d
Fixed problem with tags occuring twice with docker.pulled
2015-02-23 11:37:24 +01:00
Sebastien Estienne
c53ce9d0d9
Docker: improve tags support
...
Conflicts:
salt/states/dockerio.py
2015-02-23 11:37:03 +01:00
Mike Place
081867c7d4
Merge pull request #20895 from bechtoldt/2014.7
...
fix wrong dict access in smtp returner in 2014.7
2015-02-21 07:02:47 -07:00
Arnold Bechtoldt
8ee52d65e1
fix wrong dict access in smtp returner, that is already fixed in 2015.2
...
and later
2015-02-21 11:38:32 +01:00
Thomas S Hatch
964e77e504
Merge pull request #20880 from thatch45/systemd_listdir
...
fix bug from systems without any legacy init scripts
2015-02-20 17:47:34 -07:00
Thomas S Hatch
9401b24b8c
Merge pull request #20881 from thatch45/listen_req
...
Remove requisites from listen post calls
2015-02-20 17:41:17 -07:00
jfindlay
e6f1eb0c29
Merge pull request #20856 from jrgp/2014.7
...
Don't remount loop back filesystems upon every state run
2015-02-20 16:58:33 -07:00
Thomas S Hatch
44cda29411
Remove requisites from listen post calls
...
We don't want to evaluate requsites at this point, also the running
dict is not available when doing listen post calls so we don't need
these anyway
2015-02-20 15:51:34 -07:00
Thomas S Hatch
626e13a211
fix bug from systems without any legacy init scripts
2015-02-20 15:22:22 -07:00
Nicole Thomas
abda600001
Merge pull request #20866 from terminalmage/issue20742
...
Update the RHEL installation guide
2015-02-20 13:37:23 -07:00
Erik Johnson
396e234848
Update the RHEL installation guide
...
This updates the RHEL install instructions to reflect the new COPR for
installation on RHEL/CentOS 5.
Additionally, it provides better instructions on how to enable EPEL:
- We don't care about EPEL5, so this link has been removed.
- We needed a link for EPEL7, so this has been added.
- The old RPM installation example used hard-coded URLs to an arbitrary
EPEL mirror. This is not a good idea since A) the mirror could go
away, and B) we are unfairly sending people to a single mirror when
the Fedora Project has a perfectly good link on their wiki to send
people to a "random" mirror. The install example now uses these links.
2015-02-20 11:59:19 -06:00
Joe Gillotti
8dbfed664d
Don't remount loop back filesystems upon every state run
2015-02-20 11:03:07 +00:00
jfindlay
ca79845b2f
Merge pull request #20848 from rallytime/new_requisites_tests
...
Integration tests for the new requisites added in 2014.7
2015-02-19 18:29:00 -07:00
Nicole Thomas
c9b766c0f3
Merge pull request #20847 from rallytime/state_kwargs
...
Add listen and listen_in to state internal kwargs
2015-02-19 16:43:50 -07:00
rallytime
c3f786c966
listen and listen_in requisite tests
2015-02-19 16:13:23 -07:00
rallytime
5d22cba10c
Add listen and listen_in to state internal kwargs
2015-02-19 15:54:28 -07:00
rallytime
1437c9a1f5
onfail and onfail_in requisite tests
2015-02-19 14:35:26 -07:00
Nicole Thomas
e0ba92f631
Merge pull request #20839 from rallytime/bp-20608
...
Backport #20608 to 2014.7
2015-02-19 13:07:45 -07:00
rallytime
208b4906d8
Onchanges and onchanges_in requisite tests!
2015-02-19 13:06:38 -07:00
Nicole Thomas
2ef28c7e45
Merge pull request #20842 from thatch45/state_kwargs
...
Add requisite ins to state internal kwargs
2015-02-19 13:06:07 -07:00
Thomas S Hatch
97cda220fa
Add requisite ins to state internal kwargs
2015-02-19 12:13:37 -07:00
Mike Place
e4ced3e783
Avoid trying to deserialize empty files
...
This fixes errors encountered by the minion where an attempt to read an empty file from the cache will produce msgpack exceptions in the log.
2015-02-19 11:01:05 -07:00
jfindlay
e488572610
Merge pull request #20834 from peresadam/fix_format_call_2014.7
...
Fixed dict unpacking in salt.utils.format_call
2015-02-19 10:41:24 -07:00
jfindlay
3f42cf3ea9
Merge pull request #20831 from RobertFach/fix-20828-mount-nointr
...
added nointr invisible mount option
2015-02-19 10:40:24 -07:00
Thomas S Hatch
7d44aaad0b
Merge pull request #20613 from jfindlay/fix_output
...
change incorrect 'text' outputter to 'txt'
2015-02-19 10:15:17 -07:00
Adam Peres
b50497b380
Fixed dict unpacking in salt.utils.format_call
2015-02-19 17:29:48 +01:00
Robert Fach
6855ca1844
added nointr invisible mount option
2015-02-19 16:07:38 +00:00
rallytime
8f0e80bd66
Add one onchanges requisite test
2015-02-18 17:16:07 -07:00
Mike Place
71ccd5e51a
Merge pull request #20813 from rallytime/arch_installation_docs
...
Update Arch installation docs to reference salt-zmq and salt-raet pkgs
2015-02-18 16:25:46 -07:00
rallytime
9322d3b307
Update Arch installation docs to reference salt-zmq and salt-raet pkgs
2015-02-18 16:22:46 -07:00
jfindlay
f669b25211
Merge pull request #20810 from rallytime/windows_install_docs_update
...
Add 2014.7.2 package links to the windows installer docs
2015-02-18 14:54:47 -07:00
rallytime
928bb30a6b
Add 2014.7.2 package links to the windows installer docs
2015-02-18 13:55:26 -07:00
Thomas S Hatch
2cf898e55f
Merge pull request #20800 from rallytime/bp-20768
...
Backport #20768 to 2014.7
2015-02-18 10:59:31 -07:00
vladislav-jomedia
30616defe5
Update config.py
2015-02-18 09:56:25 -07:00
vladislav-jomedia
89fd8ee6fe
"dictionary changed size during iteration" issue fixed in config.py for salt-cloud
...
iterating over dict fixed "RuntimeError: dictionary changed size during iteration" issue
2015-02-18 09:56:25 -07:00
Thomas S Hatch
90ef4d7b0f
Merge pull request #20778 from terminalmage/issue18943
...
Add Synology OS detection
2015-02-17 17:38:32 -07:00
Erik Johnson
bd65632096
Add Synology OS detection
2015-02-17 17:27:59 -06:00
Justin Findlay
0d6663b8a8
conform shell integration tests to txt runner
2015-02-17 15:40:17 -07:00
Justin Findlay
f202aaf072
change incorrect 'text' outputter to 'txt'
...
Fixes #20612 . As to why the messages were going to the cli rather than
the log is an issue for someone more wise and wizardly. I nominate
@cachedout.
2015-02-17 15:40:17 -07:00
Thomas S Hatch
5ad79aec76
Merge pull request #20762 from jfindlay/fix_nftables
...
fix nftables.get_rule_handle return error
2015-02-17 13:01:39 -07:00
jfindlay
8fda896623
Merge pull request #20765 from rallytime/bp-20706
...
Backport #20706 to 2014.7
2015-02-17 12:36:10 -07:00
Thomas S Hatch
237f80497f
Merge pull request #20739 from mikn/publish_return_fixes
...
Giving publish.publish more robust return handling
2015-02-17 12:31:17 -07:00
Achim Herwig
5d9ecaa434
Fix pep8 issues.
2015-02-17 10:23:33 -07:00
Achim Herwig
40d69636e2
Make systemd implementation of service.running aware of legacy service units.
2015-02-17 10:23:33 -07:00
