Thomas Jackson
4f07cd9b82
Fix check if the item doesn't exist in the ttl cache
2014-03-05 18:01:25 -08:00
Pedro Algarvio
c4bb78a3fe
Merge pull request #10993 from cachedout/10654
...
Modules should not be exec'd directly.
2014-03-06 00:31:57 +00:00
Seth House
cbca82a897
Merge pull request #10986 from thusoy/patch-1
...
Fix inconsistent header formatting in docs
2014-03-05 16:03:10 -08:00
Mike Place
d8000fc222
Modules should not be exec'd directly.
...
Refs #10654
2014-03-05 16:33:34 -07:00
Thomas S Hatch
d7788a2643
Raet Master can now communicate with raet minion!
...
Or rather the pub message makes it down , the minion still needs
to be able to execute it
2014-03-05 16:12:42 -07:00
Thomas S Hatch
adfa8b4a68
Add publish management to the raet master
2014-03-05 16:00:03 -07:00
Joseph Hall
8cde5a58ac
Merge pull request #10991 from timoguin/develop
...
added versionadded directive for minionfs walkthrough
2014-03-05 15:38:54 -07:00
Tim O'Guin
60ebfd6c0e
added versionadded directive for minionfs walkthrough
2014-03-05 16:34:24 -06:00
Thomas S Hatch
6f845789c0
Refine publish and change out master router name
2014-03-05 15:32:55 -07:00
Thomas S Hatch
d5f9f05632
Run the minion router instead of a dead idle
2014-03-05 15:23:03 -07:00
Thomas S Hatch
aadb4a8d84
update minion to connect to master
...
The RAET minion now connects to the master and waits for data
2014-03-05 15:22:10 -07:00
Tarjei Husøy
aec6b11d9a
Fix inconsistent header formatting in docs
2014-03-05 22:21:11 +01:00
Thomas S Hatch
d06667cb6d
Better filter the event publication data
2014-03-05 14:15:11 -07:00
Mike Place
ec171e4b51
Merge pull request #10985 from cachedout/core_environ_revert
...
Revert grains enviorn.
2014-03-05 14:10:30 -07:00
Mike Place
0f1387da14
Revert grains enviorn.
...
This has massively broken the develop branch. Reverting.
2014-03-05 14:08:52 -07:00
Colton Myers
e51d91c269
Merge pull request #10962 from ranl/develop
...
modules.win_dns_client: fix error in add_dns()
2014-03-05 13:35:19 -07:00
Joseph Hall
aa569e5955
Merge pull request #10979 from jasco/iptables-fix
...
Fix iptables comment where format params were apparently mismapped
2014-03-05 13:22:51 -07:00
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
Joel Steres
33aee59320
Fix iptables comment formatting where format params were apparently mismapped
2014-03-05 11:31:34 -08: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
ranl
ce3207c3f8
modules.win_dns_client: fix error in add_dns() when the interface could not be found
2014-03-05 08:43:06 +02: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
