Commit Graph

38988 Commits

Author SHA1 Message Date
rallytime
4427f42bb6 Whitespace fix 2015-05-13 09:14:49 -06:00
Mike Place
dd9115466e Add warning to get_or_set_hash about reserved chars
Refs #22141
2015-05-13 02:17:54 -06:00
Thomas S Hatch
f20c0e42ce Merge pull request #23595 from rallytime/bp-23549
Backport #23549 to 2014.7
2015-05-12 15:19:40 -06:00
Thomas S Hatch
1acaf86da7 Merge pull request #23594 from rallytime/bp-23496
Backport #23496 to 2014.7
2015-05-12 15:19:34 -06:00
Thomas S Hatch
2c221c7332 Merge pull request #23593 from rallytime/bp-23442
Backport #23442 to 2014.7
2015-05-12 15:19:26 -06:00
Thomas S Hatch
fadd1ef63c Merge pull request #23606 from twangboy/fix_installer
Fixed checkbox for starting service and actually starting it
2015-05-12 15:18:50 -06:00
twangboy
038331edab Fixed checkbox for starting service and actually starting it 2015-05-12 18:04:42 +00:00
Thomas S Hatch
10b3f0f643 Merge pull request #23592 from rallytime/bp-23389
Backport #23389 to 2014.7
2015-05-12 10:44:42 -06:00
vr-jack
6efcac09ad Update __init__.py
pass _pillar_rend=True to compile_template when processing top.sls as well
2015-05-12 10:17:16 -06:00
Martin Hoefling
d5ae1d268a Fix for issue #23110
This resolves issues when the freshly created directory is removed
by fileserver.update.
2015-05-12 10:09:25 -06:00
Z. Liu
39869a15bd check w/ low['name'] only 2015-05-12 10:02:39 -06:00
Z. Liu
304cc499e9 another fix for file defined w/ id, but require name
for following sls:

 /root/a:
   file.directory:
     - user: root
     - group: root
     - mode: 0755
     - clean: True
     - require:
         - file: /root/a/b
         - file: /root/a/c

 /root/a/b:
   file.directory:
     - user: root
     - group: root
     - mode: 0755

 id_test:
   file.managed:
     - name: /root/a/c
     - user: root
     - group: root
     - mode: 0755
     - replace: False
2015-05-12 10:02:39 -06:00
Z. Liu
8814d4180e add directory itself to keep list
if not fixed, following sls will delete /root/a/b

 /root/a:
   file.directory:
     - user: root
     - group: root
     - mode: 0755
     - clean: True
     - require:
         - file: /root/a/b

 /root/a/b:
   file.directory:
     - user: root
     - group: root
     - mode: 0755
2015-05-12 10:02:39 -06:00
Mike Place
734cc43801 Correct fail_hard typo
Closes #22908
2015-05-12 10:01:00 -06:00
Thomas S Hatch
cd34b9b6c4 Merge pull request #23573 from techhat/novaquery
Scan all available networks for public and private IPs
2015-05-12 09:22:22 -06:00
Thomas S Hatch
2a72cd71c2 Merge pull request #23558 from jfindlay/fix_ebuild
reorder emerge command line
2015-05-12 09:17:46 -06:00
Thomas S Hatch
a664a3c6fd Merge pull request #23530 from dr4Ke/fix_salt-ssh_to_include_pkg_sources
salt-ssh state: fix including all salt:// references
2015-05-12 09:13:43 -06:00
Joseph Hall
f92db5e92f Linting 2015-05-12 04:38:38 -06:00
Joseph Hall
26e00d3ccc Scan all available networks for public and private IPs 2015-05-12 04:16:18 -06:00
David Boucha
55c3869861 Merge pull request #23433 from twangboy/list_pkgs_fix
Obtain all software from the registry
2015-05-11 22:47:52 +00:00
Justin Findlay
755bed0abd Merge pull request #23554 from jleroy/debian-hostname-fix
Debian: Hostname always updated
2015-05-11 15:57:00 -06:00
Justin Findlay
6ec87ce9f5 Merge pull request #23551 from dr4Ke/grains.append_unit_tests
grains.append unit tests, related to #23474
2015-05-11 15:54:24 -06:00
salt_build
8ab5b1b86f Fix pylint error 2015-05-11 21:37:02 +00:00
Justin Findlay
45404fb2a6 reorder emerge command line
Fixes #23479.
2015-05-11 14:32:31 -06:00
salt_build
2d11d6545e Obtain all software from the registry 2015-05-11 20:24:59 +00:00
Christophe Drevet-Droguet
ebff9df5b2 fix pylint errors 2015-05-11 21:21:10 +02:00
Jonathan Leroy
5ff749e487 Debian: Hostname always updated 2015-05-11 20:59:08 +02:00
Justin Findlay
e96c5c5bf3 Merge pull request #23474 from dr4Ke/fix_grains.append_nested
Fix grains.append in nested dictionnary grains #23411
2015-05-11 12:00:20 -06:00
Justin Findlay
ab7e1aed8e Merge pull request #23537 from t0rrant/patch-1
Update changelog
2015-05-11 11:02:15 -06:00
Christophe Drevet-Droguet
5df6a8008c fix pylint warning 2015-05-11 18:51:34 +02:00
C. R. Oldham
b79fed3a92 Merge pull request #23538 from cro/licupdate
Update date in LICENSE file
2015-05-11 09:19:25 -06:00
C. R. Oldham
345efe25c9 Update date in LICENSE file 2015-05-11 09:17:39 -06:00
Manuel Torrinha
8e03cc99d3 Update changelog
So the generated packages have a proper name, relating to version, and correctly overwriting the older ones in the apt repository.
2015-05-11 15:57:52 +01:00
Christophe Drevet-Droguet
d0549e56ba salt-ssh state: fix including all salt:// references
Fixes #23355
- recursive look into each chunk of state (salt_refs)
- don't break after including the first file of the list (prep_trans_tar)
2015-05-11 11:01:54 +02:00
Christophe Drevet-Droguet
c4954046ad unit tests for grains.append module function
- separate test functions for every return
- add tests for nested lists
- add test for appending to an element of a list (fails silently)
2015-05-10 17:27:32 +02:00
Christophe Drevet-Droguet
0c9a32326c use MagickMock 2015-05-09 18:34:02 +02:00
Thomas S Hatch
a123a36f05 Merge pull request #23505 from aneeshusa/remove-unused-ssh-config-validator
Remove unused ssh config validator. Fixes #23159.
2015-05-09 07:24:15 -06:00
Aneesh Agrawal
90af1672ca Remove unused ssh config validator. Fixes #23159. 2015-05-08 16:47:41 -04:00
Christophe Drevet-Droguet
c838a22377 unit tests for grains.append module function 2015-05-08 21:01:36 +02:00
Christophe Drevet-Droguet
a01a5bb51e grains.get, parameter delimititer, versionadded: 2014.7.6 2015-05-08 16:52:06 +02:00
Thomas S Hatch
ca2c21a63c Merge pull request #23467 from slinu3d/2014.7
Added AWS v4 signature support
2015-05-08 08:36:19 -06:00
Shouguan Lin
0b4081d8f4 Fixed pylint error at line 363 2015-05-07 14:57:44 -07:00
Shouguan Lin
5be5eb5b14 Fixed pylink errors 2015-05-07 13:37:08 -07:00
Mike Place
e6f9eec02e Merge pull request #23444 from techhat/novacreateattach
Add create_attach_volume to nova driver
2015-05-07 13:51:32 -06:00
Shouguan Lin
e64f374ffa Fixed lint errors 2015-05-07 12:29:50 -07:00
Justin Findlay
e331463319 Merge pull request #23460 from s0undt3ch/hotfix/bootstrap-script-2014.7
[2014.7] Update to latest stable bootstrap script v2015.05.07
2015-05-07 13:10:54 -06:00
Pedro Algarvio
edcd0c41f2 Update to latest stable bootstrap script v2015.05.07
* Lower required requests version dependency. Use system requests package where possible.
* Allow Ubuntu alternate ppas. Thanks Peter Tripp(notpeter). saltstack/salt-bootstrap#563
2015-05-07 17:06:38 +01:00
Christophe Drevet-Droguet
b39f50475d remove debugging output 2015-05-07 15:35:22 +02:00
Joseph Hall
ebdb7eae2d Add create_attach_volume to nova driver 2015-05-07 02:02:22 -06:00
Justin Findlay
7a8ce1a954 Merge pull request #23439 from techhat/maxtries
Add wait_for_passwd_maxtries variable
2015-05-07 01:28:56 -06:00