Commit Graph

48126 Commits

Author SHA1 Message Date
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
029ff1103d Merge pull request #23615 from rallytime/bp-23577
Backport #23577 to 2015.5
2015-05-12 15:19:11 -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
Ed Kern
8750680d9e virtual returning none warning fixed in dev but missed in 2015.5 2015-05-12 13:29:52 -07:00
msciciel
6f74477129 Fix find and remove functions to pass database param 2015-05-12 14:11:43 -06:00
Nicole Thomas
b8589532d1 Merge pull request #23603 from rahulhan/states_winrepo_unit_test
Adding states/winrepo.py unit tests
2015-05-12 12:40:12 -06:00
Nicole Thomas
3cbbd6d277 Merge pull request #23602 from rahulhan/states_win_path_unit_test
Adding states/win_path.py unit tests
2015-05-12 12:39:37 -06:00
Nicole Thomas
3c904e8739 Merge pull request #23600 from rahulhan/states_win_network_unit_test
Adding states/win_network.py unit tests
2015-05-12 12:39:01 -06:00
Nicole Thomas
10243a7742 Merge pull request #23599 from rahulhan/states_win_firewall_unit_test
Adding win_firewall.py unit tests
2015-05-12 12:37:49 -06:00
twangboy
038331edab Fixed checkbox for starting service and actually starting it 2015-05-12 18:04:42 +00:00
Rahul Handay
6a2909eeea Removed errors 2015-05-12 23:20:36 +05:30
Rahul Handay
b418404eb7 removed lint error 2015-05-12 23:06:20 +05:30
Rahul Handay
a66e7e7f1f Adding states/winrepo.py unit tests 2015-05-12 22:54:54 +05:30
Colton Myers
e73071dbdf Merge pull request #23601 from basepi/jboss.version.added
Add versionadded for jboss module/state
2015-05-12 11:22:59 -06:00
Colton Myers
0174c8fe58 Add versionadded for jboss module/state 2015-05-12 11:22:34 -06:00
Rahul Handay
122c29f71a Adding states/win_path.py unit tests 2015-05-12 22:50:02 +05:30
Rahul Handay
1be802300b Adding states/win_network.py unit tests 2015-05-12 22:45:25 +05:30
Rahul Handay
6cda890517 Adding win_firewall.py unit tests 2015-05-12 22:39:09 +05:30
Rahul Handay
d08d885828 Adding states/win_dns_client.py unit tests 2015-05-12 22:34:31 +05:30
Rahul Handay
4cde78a58a Adding states/vbox_guest.py unit tests 2015-05-12 22:31:03 +05:30
Thomas S Hatch
9beb7bc529 Merge pull request #23469 from s0undt3ch/hotfix/call-the-win-func
Call the windows specific function not the general one
2015-05-12 10:47:22 -06: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
Nicole Thomas
d2f097584c Merge pull request #23583 from jayeshka/ipset_states-unit-test
adding states/ipset unit test case
2015-05-12 10:31:55 -06:00
Nicole Thomas
82a47e8cbf Merge pull request #23582 from jayeshka/keyboard_states-unit-test
adding states/keyboard unit test case
2015-05-12 10:31:17 -06:00
Nicole Thomas
77e5b28566 Merge pull request #23581 from jayeshka/layman_states-unit-test
adding states/layman unit test case
2015-05-12 10:30:36 -06:00
Nicole Thomas
cbe32828ef Merge pull request #23580 from jayeshka/smf-unit-test
adding smf unit test case
2015-05-12 10:29:58 -06:00
Nicole Thomas
16a333832a Merge pull request #23572 from The-Loeki/ssh_auth_fix
Fix regression of #21355 introduced by #21603
2015-05-12 10:28:05 -06:00
Nicole Thomas
f843f89cd7 Merge pull request #23565 from garethgreenaway/2015_2_aptpkg_upgrade_default_to_upgrade
fix to aptpkg module
2015-05-12 10:25:46 -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
c1157cdaee Merge pull request #23550 from jfindlay/fix_rh_ip_test
additional mock for rh_ip_test test_build_bond
2015-05-12 09:17:16 -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
Jayesh Kariya
4f9719157b adding smf unit test case 2015-05-12 18:06:49 +05:30
Jayesh Kariya
297b055b1c adding states/layman unit test case 2015-05-12 18:05:35 +05:30
Jayesh Kariya
fa94d7ab5c adding states/keyboard unit test case 2015-05-12 18:04:26 +05:30
Jayesh Kariya
4330cf4a6e adding states/ipset unit test case 2015-05-12 18:03:14 +05:30
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
Ronald van Zantvoort
d8248dd368 Fix regression of #21355 introduced by #21603 2015-05-12 12:10:47 +02:00
Gareth J. Greenaway
97ae514641 aptpkg.upgrade should default to upgrade instead of dist_upgrade. 2015-05-11 16:46:58 -07:00
Jacob Hammons
16d8a753ad saltstack2 sphinx theme and build settings 2015-05-11 17:29:12 -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