Commit Graph

27083 Commits

Author SHA1 Message Date
Thomas S Hatch
abb6626995 Merge pull request #10973 from basepi/faqcompatibility
Add more version compatibility information to the FAQ, Fix #10934
2014-03-05 12:00:44 -08:00
Thomas S Hatch
56b4475ae5 Merge pull request #10974 from cachedout/perm_shar
Fix Jenkins test failure
2014-03-05 11:59:47 -08:00
Thomas S Hatch
7c21d1e619 Whitespace 2014-03-05 12:59:09 -07:00
Thomas S Hatch
5427f674c9 Merge pull request #10970 from thedrow/patch-1
Allow access to any environment variable from grains
2014-03-05 11:57:59 -08:00
Thomas S Hatch
c456eef400 Merge pull request #10971 from darrelclute/user-state-updates
fix of lint error causing #10916 to be reverted
2014-03-05 11:56:29 -08:00
Colton Myers
e830bb88d2 Merge pull request #10978 from jacksontj/develop
Add import for cache
2014-03-05 12:45:57 -07:00
Thomas Jackson
4460294a11 Add import for cache 2014-03-05 11:21:09 -08:00
Joseph Hall
b0306fd3ec Merge pull request #10976 from tomashavlas/develop
iptables can save on set_policy
2014-03-05 11:43:51 -07:00
Tomas Havlas
416e7a9213 iptables can save on set_policy 2014-03-05 18:36:50 +00:00
Joseph Hall
93dc0efe9c Merge pull request #10975 from terminalmage/10930
Add information on yum-utils requirement for yum pkg mgmt
2014-03-05 11:27:10 -07:00
Erik Johnson
645ac140c0 Add information on yum-utils requirement for yum pkg mgmt 2014-03-05 12:09:07 -06:00
Mike Place
697f4bf1ce Fix Jenkins test failure
Add build_shar.sh to list of files permitted to be u+x in the git
repo.
2014-03-05 10:59:54 -07:00
Colton Myers
6238abff5b Add more version compatibility information to the FAQ, Fix #10934 2014-03-05 10:35:29 -07:00
Darrel Clute
dcc8c3112f typo fixes in salt/states/user.py 2014-03-05 10:33:46 -07:00
Darrel Clute
faec475aab typo fixes in salt/states/user.py 2014-03-05 10:33:00 -07:00
Thomas S Hatch
eec7b9bff5 Doh! Need to explicitly state the target in transmit 2014-03-05 09:53:37 -07:00
Darrel Clute
eaccc87700 fix of lint error causing #10916 to be reverted 2014-03-05 09:15:45 -07:00
Thomas S Hatch
44749ae18f Merge pull request #10968 from nikicat/develop
fix: master doesn't start when user acl enabled
2014-03-05 08:04:40 -08:00
Omer Katz
8c4423e27f Allow access to any environment variable. Fixes #7873. 2014-03-05 18:42:04 +03:00
Nikolay Bryskin
2c5f656598 fix: master doesn't start when user acl enabled 2014-03-05 13:27:08 +00:00
Thomas S Hatch
7ddc8de31f whitespace 2014-03-05 00:07:21 -07:00
Thomas S Hatch
8d90d136ba more lint 2014-03-04 23:58:59 -07:00
Thomas S Hatch
07260db514 lint fixes 2014-03-04 23:58:59 -07:00
Thomas S Hatch
54bb1e5e03 Revert "Add initial support for user expiry via user state"
This reverts commit 414bcfd723.
2014-03-04 23:58:59 -07:00
Thomas S Hatch
5182e767bd Revert "updated version changed to correct current codename"
This reverts commit 61271eb747.
2014-03-04 23:58:59 -07:00
Thomas S Hatch
ed9a2c473f Merge pull request #10960 from edlane/develop
Final rename of salt runner "diff.py" to "survey.py" and new functionality
2014-03-04 22:51:50 -08:00
Thomas S Hatch
a7cb1afee6 Add new requisite!!!! postmortem
I am still open to changing the name, since this might be a bit on the
morbid side for some.

The postmortem requisite adds the ability to say "only run this state if
the required stated failed" so it is easy to build in fallback routine
for a failure
2014-03-04 23:36:17 -07:00
Thomas S Hatch
7f9488f1e2 change to always use popleft 2014-03-04 22:01:12 -07:00
ed lane
07e9f99cac pulled from github 2014-03-04 21:55:01 -07:00
ed lane
3b7eecd73e Merge branch 'develop' of https://github.com/edlane/salt into develop
Conflicts:
	salt/runners/diff.py
2014-03-04 21:53:50 -07:00
Thomas S Hatch
4917bccf99 Add bi-direction communication to forking.py 2014-03-04 21:53:30 -07:00
ed lane
0d6877b0a9 renamed module from diff.py to survey.py, added diff function, numerous refactoring 2014-03-04 21:36:23 -07:00
David Boucha
f3532dffaf Merge pull request #10958 from wedge-jarrad/develop
Fix typo in walkthrough
2014-03-04 21:34:45 -07:00
Wedge Jarrad
b4d49cbc09 Fix typo in walkthrough 2014-03-04 20:21:15 -08:00
Thomas S Hatch
7c9774cbe6 Merge pull request #10950 from whiteinge/doc-release-sdist-github
Added note to also upload the sdist to GitHub releases
2014-03-04 19:48:12 -08:00
Thomas S Hatch
fdd0588642 Merge pull request #10949 from cachedout/8866
syndic_finger option
2014-03-04 19:47:30 -08:00
Thomas S Hatch
405be2781d Merge pull request #10946 from philipforget/10944-yum-pass-repo-args
Pass repo_arg to repoquery for available packages
2014-03-04 19:46:28 -08:00
Thomas S Hatch
7b0c5a0892 Merge pull request #10926 from pengyao/network_state
Interface should restart to validate if it's up
2014-03-04 19:44:34 -08:00
Thomas S Hatch
3aef0d754f Merge branch 'top_sls_ordering' of git://github.com/bemehow/salt into bemehow-top_sls_ordering
Conflicts:
	salt/utils/odict.py
2014-03-04 20:42:29 -07:00
Thomas S Hatch
6da02a0411 Merge pull request #10939 from rynemccall/fix-file.directory-recurse-mode
Honor (lack of) mode recurse in file.directory
2014-03-04 19:39:04 -08:00
Thomas S Hatch
ab576bb069 Merge pull request #10920 from gtmanfred/nova
Create SaltNova class
2014-03-04 19:36:30 -08:00
Thomas S Hatch
121a43bb50 Merge pull request #10915 from nateucar/saltruncolor
Add color output control to salt-run
2014-03-04 19:34:47 -08:00
Joseph Hall
0080e01a35 Merge pull request #10952 from yanatan16/patch-1
Update return with libcloud's Node object.
2014-03-04 17:38:11 -07:00
Seth House
3fe6bcf042 Removed trackalyzer JS; was returning a 403 and breaking our JS! 2014-03-04 16:20:20 -08:00
Pedro Algarvio
6ddfe2a876 Merge pull request #10921 from terminalmage/fileserver-exception-logging
Log tracebacks caught in fileserver updates
2014-03-04 23:55:33 +00:00
Pedro Algarvio
39e535bbe3 Merge pull request #10937 from cachedout/10868-1
Refactor minion for single pre-tune-in routine.
2014-03-04 23:52:09 +00:00
Thomas S Hatch
b406501e4b The remote yard is auto added, just track it as an event listener 2014-03-04 16:36:58 -07:00
Jon Eisen
2bfa72269b Update return with libcloud's Node object. 2014-03-04 15:47:56 -07:00
Thomas S Hatch
11ae74ff21 Revert "Fire the event's data, not the entire _minion_event command"
This reverts commit be0a7620aa.
2014-03-04 15:47:00 -07:00
Seth House
14c225989e Added note to also upload the sdist to GitHub releases 2014-03-04 14:39:32 -08:00