Commit Graph

48343 Commits

Author SHA1 Message Date
Jayesh Kariya
aaf89354c0 adding win_groupadd unit test case. 2015-05-28 17:12:58 +05:30
Justin Findlay
c2f1fdb244 Merge pull request #24202 from rallytime/bp-24186
Backport #24186 to 2015.5
2015-05-27 23:16:48 -06:00
Justin Findlay
8a085a2592 Merge pull request #24192 from rallytime/bp-20474
Backport #20474 to 2015.5
2015-05-27 23:16:18 -06:00
Justin Findlay
7cc535bf4a Merge pull request #24184 from rallytime/bp-24129
Backport #24129 to 2015.5
2015-05-27 23:15:08 -06:00
Justin Findlay
eb0af70e5b Merge pull request #24183 from rallytime/bp-19320
Backport #19320 to 2015.5
2015-05-27 23:14:36 -06:00
Tyler Cipriani
db793dd0de Update salt vagrant provisioner info
Also tweaked one piece of confusing verbiage
2015-05-27 21:56:29 -06:00
Nicole Thomas
1b5bf23187 Merge pull request #24201 from whiteinge/rest_cherrypy-client-libs
Add list of client libraries for the rest_cherrypy module to the top-level documentation
2015-05-27 20:12:08 -06:00
Seth House
5f718027ca Add list of client libraries for the rest_cherrypy module 2015-05-27 19:10:48 -06:00
Seth House
28fc77f6f6 Fix rest_cherrypy config example indentation
This indentation was erroneously changed in #24185.
2015-05-27 19:10:33 -06:00
Nicole Thomas
3307ec20d9 Merge pull request #24195 from rallytime/merge-24185
Merge #24185 with a couple of fixes
2015-05-27 16:18:37 -06:00
rallytime
d8daa9dcd7 Merge #24185 with a couple of fixes
Refs #24185
2015-05-27 15:25:27 -06:00
Manoli Yiannakakis
fd3c783f3e add sudo, sudo_password params to deploy to allow for non-root deploys 2015-05-27 14:31:36 -06:00
Nicole Thomas
7e400bc3d7 Merge pull request #24166 from jayeshka/pkgng-states-unit-test
adding states/pkgng unit test case.
2015-05-27 14:27:49 -06:00
Nicole Thomas
9fcda79cd4 Merge pull request #24189 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2015-05-27 14:26:31 -06:00
Jacob Hammons
634d56bca0 Fixed pylon error 2015-05-27 13:45:00 -06:00
Colton Myers
8839e9c22e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    salt/modules/tls.py
2015-05-27 13:13:04 -06:00
Nicole Thomas
2303dec0e9 Merge pull request #24181 from jtand/file_test
Fixed error where file was evaluated as a symlink in test_absent
2015-05-27 12:26:28 -06:00
Nicole Thomas
a16276852b Merge pull request #24180 from terminalmage/fix-libvirt-test
Skip libvirt tests if not running as root
2015-05-27 12:18:47 -06:00
Nicole Thomas
9d7331c87d Merge pull request #24178 from rallytime/bp-24118
Backport #24118 to 2014.7, too.
2015-05-27 11:49:45 -06:00
Jacob Hammons
0689815d0e Fixes for doc build errors 2015-05-27 11:40:31 -06:00
pengyao
722a662479 fixed a typo 2015-05-27 11:25:28 -06:00
pengyao
565eb46ff5 Add cmd doc for WheelClient 2015-05-27 11:25:28 -06:00
Z. Liu
55db1bf8b5 sate_output_profile default to True 2015-05-27 11:20:15 -06:00
Z. Liu
991922703b fix type: statei -> state 2015-05-27 11:20:14 -06:00
Z. Liu
0549ca6266 add 'state_output_profile' option for profile output 2015-05-27 11:20:14 -06:00
Nicole Thomas
1fbc5b25e6 Merge pull request #24165 from jayeshka/portage_config-states-unit-test
adding states/portage_config unit test case.
2015-05-27 11:15:08 -06:00
Nicole Thomas
4747856411 Merge pull request #24164 from jayeshka/pecl-states-unit-test
adding states/pecl unit test case.
2015-05-27 11:14:26 -06:00
Justin
5f0e601589 Fixed error where file was evaluated as a symlink in test_absent 2015-05-27 11:08:50 -06:00
Colton Myers
cdaaa19324 Merge pull request #24160 from The-Loeki/patch-1
small enhancement to data module; pop()
2015-05-27 11:03:10 -06:00
Erik Johnson
72e7416ad2 Skip libvirt tests if not running as root
Running salt.states.libvirt.keys() results in an OSError if the pki dir
needs to be created.
2015-05-27 11:53:26 -05:00
Trevor Hammond
e2217a09e8 removed deprecated pymongo usage as no longer functional with pymongo > 3.x 2015-05-27 10:34:56 -06:00
Thomas S Hatch
4a8dbc7f13 Merge pull request #24153 from techhat/batchlist
Batch mode sometimes improperly builds lists of minions to process
2015-05-27 10:21:52 -06:00
Thomas S Hatch
ed8ccf57a2 Merge pull request #24167 from jayeshka/pagerduty-states-unit-test
adding states/pagerduty unit test case.
2015-05-27 10:14:01 -06:00
Ronald van Zantvoort
2175ff3c75 doc & merge fix
Fix doc & potential merge conflict w/#24168
2015-05-27 18:00:51 +02:00
Nicole Thomas
4e8c5031b0 Merge pull request #24159 from rallytime/keystone_doc_examples
Fill out modules/keystone.py CLI Examples
2015-05-27 09:07:11 -06:00
Nicole Thomas
fc10ee8ed5 Merge pull request #24158 from rallytime/fix_doc_error
Fix test_valid_docs test for tls module
2015-05-27 09:06:05 -06:00
Nicole Thomas
b9507d1567 Merge pull request #24156 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2015-05-27 09:05:01 -06:00
Jayesh Kariya
8cf1505392 adding states/portage_config unit test case. 2015-05-27 14:55:31 +05:30
Jayesh Kariya
2234bb0b70 adding states/pkgng unit test case. 2015-05-27 14:54:19 +05:30
Jayesh Kariya
563a5b3c30 adding states/pecl unit test case. 2015-05-27 14:52:19 +05:30
Jayesh Kariya
1af8c8334d adding states/pagerduty unit test case. 2015-05-27 14:51:19 +05:30
Ronald van Zantvoort
eba382cdda small enhancement to data module; pop()
Very simple addon to allow to pop() values from data
2015-05-27 02:42:49 +02:00
Nicole Thomas
05745fa931 Merge pull request #24145 from jfindlay/win_update_encoding
attempt to decode win update package
2015-05-26 17:20:20 -06:00
rallytime
dadac8d076 Fill out modules/keystone.py CLI Examples 2015-05-26 17:07:57 -06:00
rallytime
49a517e2ca Fix test_valid_docs test for tls module
This will make 2014.7 happy again
2015-05-26 16:45:33 -06:00
Colton Myers
e52b5ab2e2 Remove stray >>>>> 2015-05-26 15:51:56 -06:00
Colton Myers
7dfbd929ff Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-26 15:51:15 -06:00
Colton Myers
70247890de Merge pull request #24123 from makinacorpus/ss
fix service enable/disable change
2015-05-26 15:24:19 -06:00
Joseph Hall
467ba64612 Make sure that minion IDs are strings 2015-05-26 15:09:34 -06:00
Justin Findlay
51c3cec5d7 Merge pull request #24146 from rallytime/fix_centos_boto_failure
Fixes the boto_vpc_test failure on CentOS 5 tests
2015-05-26 14:15:19 -06:00