Colton Myers
400a8ab351
Improve file.directory documentation around `recurse
2014-07-02 16:05:18 -06:00
Samuel Smith
f316c64d08
Merge pull request #13947 from SmithSamuelM/sam_raet_49
...
Used get. for some reason opts['id'] not always available
2014-07-02 16:02:00 -06:00
Samuel M Smith
b2526492fd
Merge remote-tracking branch 'upstream/develop' into sam_raet_49
2014-07-02 15:59:44 -06:00
Samuel M Smith
d556ba8ee7
use get incase id not in opts
2014-07-02 15:59:09 -06:00
Mike Place
51e3089a7c
Fix broken test.
2014-07-02 14:40:08 -06:00
Nitin Madhok
bd51c3305f
Fixing lint in salt/modules/tls.py
2014-07-02 16:12:51 -04:00
Nitin Madhok
900021a820
Fixing lint in tests/integration/shell/auth.py
2014-07-02 16:11:49 -04:00
Nitin Madhok
a5fb5ad44f
Fixing lint in salt/daemons/flo/core.py
2014-07-02 16:09:50 -04:00
Samuel Smith
df2ab0837e
Merge pull request #13938 from SmithSamuelM/sam_raet_49
...
Added stale yard keep directory cleanup behavior to master and minion
2014-07-02 13:51:49 -06:00
Samuel M Smith
98ebad06c5
Merge remote-tracking branch 'upstream/develop' into sam_raet_49
2014-07-02 13:47:55 -06:00
Samuel M Smith
22ca5b0b51
Added behavior to master and minion to clean up stale yard keep directories on startup
...
Refactored flo scripts to ensure cleanup runs first
Refactored road and lane setup behaviors so the stack creation happens in action not postinitio so that
stacks do not start until after cleanup
2014-07-02 13:45:20 -06:00
Mike Place
f5b544c7c6
Mine over raet
2014-07-02 12:01:30 -06:00
Thomas S Hatch
a351337784
Merge pull request #13914 from garethgreenaway/13910_recurse_symlink
...
Fix to file.check_perms related to symlinks and chmod
2014-07-02 11:18:10 -06:00
Thomas S Hatch
dff407690d
Merge pull request #13909 from garethgreenaway/13758
...
Ability to specify multiple sources for file.recurse, picking the first one that exists.
2014-07-02 10:21:48 -06:00
Thomas S Hatch
c7c5ab90c1
Merge pull request #13908 from lyft/boto-elb-activate-deactivate
...
Add support for registering and deregistering ELB members in boto_elb mo...
2014-07-02 10:19:35 -06:00
Thomas S Hatch
337c065e9d
Merge pull request #13906 from s0undt3ch/hotfix/lint
...
Lint fixes
2014-07-02 10:18:18 -06:00
Thomas S Hatch
4eccf705cb
Merge pull request #13905 from s0undt3ch/hotfix/transifex-updates
...
Update 'doc/.tx/config' - Build #99
2014-07-02 10:17:51 -06:00
Thomas S Hatch
a985508513
Merge pull request #13902 from cachedout/auth_test_fixing
...
Fix failing auth test
2014-07-02 10:17:16 -06:00
Thomas S Hatch
199b2bc2a9
Merge pull request #13895 from jeteokeeffe/patch-2
...
Adding logrotate script for salt in rpm
2014-07-02 10:16:47 -06:00
Thomas S Hatch
593aceb225
Merge pull request #13893 from jeteokeeffe/patch-1
...
Adding logrotate file
2014-07-02 10:16:06 -06:00
Thomas S Hatch
861ab75ebc
Merge pull request #13882 from techhat/sqlitequeue
...
Fix the option for sqlite_queue_dir
2014-07-02 10:14:14 -06:00
Thomas S Hatch
cf527511e5
Merge pull request #13881 from garethgreenaway/salt_schedule_like_cron
...
Adding the ability to schedule Salt jobs using cron like syntax
2014-07-02 10:08:28 -06:00
Thomas S Hatch
92b354d11d
Merge pull request #13880 from craig5/develop
...
add finger_master to key module
2014-07-02 10:07:00 -06:00
Thomas S Hatch
1c46fa0383
Merge pull request #13877 from spsoit/mod_random_uses_pycrypto
...
mod_random to use pycrypto backend
2014-07-02 10:04:09 -06:00
Thomas S Hatch
489729e3ef
Merge pull request #13874 from makinacorpus/ssl
...
Check and fix wrong x509 version field.
2014-07-02 10:03:00 -06:00
Gareth J. Greenaway
be969f799a
Changing file.check_perms to only attempt to update permissions of a symlink if follow_symlinks is True.
2014-07-01 22:12:26 -07:00
Erik Johnson
1b9660a40a
Fix 2nd person
2014-07-01 23:42:03 -05:00
Gareth J. Greenaway
9c936d9153
Ability to specify multiple sources for file.recurse and have it pick the first available directory. Similar functionaility found in file.managed.
2014-07-01 18:34:29 -07:00
Seth House
030035e1ff
Run xelatex three times to catch the TOC
2014-07-01 19:10:46 -06:00
Ryan Lane
816f58980a
Add support for registering and deregistering ELB members in boto_elb module
2014-07-01 20:03:49 -05:00
Pedro Algarvio
b48595227d
Merge pull request #13903 from techhat/minlist
...
Do not do a list_nodes_min for --query commands
2014-07-02 01:05:07 +01:00
Pedro Algarvio
984542ca65
New line fix
2014-07-02 00:59:38 +01:00
Pedro Algarvio
10d1e3a613
New line fix
2014-07-02 00:59:06 +01:00
Pedro Algarvio
5d52b65313
Fix indentation
2014-07-02 00:58:19 +01:00
Pedro Algarvio
1eea61aeaa
Update 'doc/.tx/config' - Build #99
...
http://cookingwithsalt.org/job/salt/job/transifex/99/
Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-07-02 00:47:44 +01:00
Erik Johnson
dd93dd22dc
Add missing period at end of sentence
2014-07-01 18:40:22 -05:00
Joseph Hall
a91d7d9e34
Satisfying s0undt3ch's pendatic nature
2014-07-01 17:28:07 -06:00
Seth House
b3f641a134
Merge pull request #13885 from techhat/ec2
...
Add default value for del_all_vols_on_destroy
2014-07-01 17:16:30 -06:00
Samuel Smith
a486f82c3c
Merge pull request #13904 from SmithSamuelM/sam_raet_48
...
Added better cleanup of Raet Stack Keep data directories with .clearAllDir
2014-07-01 17:13:28 -06:00
Samuel M Smith
d38e3e06c4
Merge remote-tracking branch 'upstream/develop' into sam_raet_48
...
Conflicts:
salt/daemons/flo/minion.flo
2014-07-01 17:10:31 -06:00
Samuel M Smith
b74234b18e
Added cleaAllDir to clean up Raet Stack Keep directories
...
Fixed error in minion.flo
2014-07-01 17:08:09 -06:00
Mike Place
a8c422da07
Just run useradd/userdel once
2014-07-01 17:04:16 -06:00
Thomas S Hatch
cc91ebd6dd
Merge pull request #13864 from whiteinge/salt-ssh-sls-dict-tweaks
...
Tweaks to salt-ssh error handling
2014-07-01 16:59:01 -06:00
Thomas S Hatch
0dee0d82e9
Merge pull request #13901 from cachedout/fix_arg_test
...
Fix broken arg test
2014-07-01 16:57:46 -06:00
Joseph Hall
9461920f41
Do not do a list_nodes_min for --query commands
2014-07-01 16:56:23 -06:00
Mike Place
6e31fb42a0
Decorate teardown just to be sure
2014-07-01 16:40:32 -06:00
Thomas S Hatch
d7caaa1b0f
Merge pull request #13899 from cachedout/fix_state_tests
...
Fix failing state tests
2014-07-01 16:39:30 -06:00
Mike Place
be07ccbd7c
Fix failing auth test
2014-07-01 16:38:30 -06:00
Thomas S Hatch
a2a50f6701
transition correctly to manorsetup
2014-07-01 16:26:16 -06:00
Mike Place
504378668c
Fix broken arg test
2014-07-01 16:07:59 -06:00
