Nitin Madhok
63048f1f1b
Updating examples and description for salt.modules.zpool.create
2014-10-28 12:02:12 -04:00
Thomas Jackson
4a6f0a3c20
Cleanup logging output (to not be confusing)
2014-10-28 08:58:45 -07:00
Colton Myers
1a04ecd247
Merge branch '2014.7' into develop
2014-10-28 09:51:53 -06:00
Nitin Madhok
f1ab35c950
Adding ability to create hybrid pools with cache and log drives Fixes#16964
2014-10-28 11:51:37 -04:00
Colton Myers
3d256b2d3f
Merge pull request #16947 from s0undt3ch/hotfix/bootstrap-script
...
Update to the latest bootstrap script, v2014.10.28
2014-10-28 09:46:42 -06:00
Thomas Jackson
4d6a46d8b3
Fix for #16939
...
In the case that the master-master has no immediate downstream minions we were just incrementing the syndic_wait N times and then exiting, not pinging the lower level masters/minions. Now, I've consolidate the jinfo_timeout and timeout_at (since they were the same thing) and changed it to add syndic_wait to the timeout_at if you are a master-master, have more time to add, and would have timed out.
2014-10-28 08:45:49 -07:00
Nitin Madhok
53d98788e6
Adding ability to create pool using file vdevs
2014-10-28 11:37:05 -04:00
Thomas Jackson
75974d95c5
More spelling
2014-10-28 08:13:43 -07:00
Thomas Jackson
7cef805774
More spelling
2014-10-28 08:13:25 -07:00
Thomas Jackson
1acf7c0184
Spelling
2014-10-28 08:13:02 -07:00
Thomas Jackson
9f7dac0674
Spelling fixes for docs
2014-10-28 08:12:27 -07:00
Thomas Jackson
aabe6460f6
Misc comment cleanup in tests
2014-10-28 08:12:10 -07:00
Thomas Jackson
8aff744388
Increase backoff each iteration by one up to syndic_wait as opposed to by one
2014-10-28 08:07:19 -07:00
Thomas Jackson
3c00f7487d
Cleanup the logic-- no reason to have so many negatives
2014-10-28 08:07:07 -07:00
Nitin Madhok
ed31c9c7d7
Forgot to add force variable
2014-10-28 10:31:11 -04:00
Nitin Madhok
c851c73928
Importing stat
2014-10-28 10:30:03 -04:00
Seth House
4675cfa9d2
Added changes dict to apache.configfile state in test mode
2014-10-28 08:55:49 -05:00
Seth House
72732ea8a0
Fix apache_module states to return None and changes dict in test mode
...
Fixes #16953 .
2014-10-28 08:53:54 -05:00
Seth House
0d6e33a419
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-10-28 08:47:18 -05:00
Nitin Madhok
f9d0669cf2
Adding ability to create mirrored zpool and nested vdevs
2014-10-28 09:46:18 -04:00
Seth House
c258d7d75f
Highlight our remote training offerings
2014-10-28 08:42:08 -05:00
Nitin Madhok
2bdd7a2cc2
Chechking if zpool is present on the system
2014-10-28 08:42:08 -04:00
Joseph Hall
49da83d5c3
Merge pull request #16948 from s0undt3ch/develop
...
Install the `salt.utils.openstack.pyrax` package.
2014-10-28 06:04:22 -06:00
Chris Reeves
0384172eb9
Added inspect option to modules.dockerio.get_containers to return more
...
graunular information about running containers.
2014-10-28 09:29:08 +00:00
Pedro Algarvio
069785e892
Install the salt.utils.openstack.pyrax package.
...
Refs https://github.com/saltstack/salt/issues/16519#issuecomment-60610857
2014-10-28 03:25:07 +00:00
Pedro Algarvio
99b8caf488
Update to the latest bootstrap script, v2014.10.28
...
* Install the python systemd bindings for Arch and Fedora git installations
* Allow cloning from Salt's git repository using HTTPS. saltstack/salt-bootstrap#475
2014-10-28 02:37:50 +00:00
Mike Place
b3920023e7
Merge pull request #16943 from hulu/retreived-sic
...
fix typos: retreived [sic]
2014-10-27 19:12:57 -06:00
Mike Place
8b41141bb9
Fix linting errors
2014-10-27 18:36:13 -06:00
Mike Place
830d71635c
Fix supervisord test failures
2014-10-27 18:32:50 -06:00
Pedro Algarvio
bf5a8a4e5c
Merge pull request #16944 from hulu/string-fmt
...
runners/jobs.py: fix string formatting
2014-10-28 00:25:32 +00:00
Mike Place
39d6d8e75f
remove splitted test
2014-10-27 18:23:20 -06:00
Mike Place
e18190bc04
remove sed test
2014-10-27 18:22:18 -06:00
Mike Place
8dc8ee51be
Merge pull request #16942 from rallytime/module_state_tests
...
Added unit tests for module state
2014-10-27 18:13:11 -06:00
Chris Rebert
1728596a73
runners/jobs.py: fix string formatting
2014-10-27 16:17:04 -07:00
Chris Rebert
d37690e156
fix typos: retreived [sic]
2014-10-27 16:13:46 -07:00
Nicole Thomas
353be9779a
Merge pull request #16938 from cachedout/issue_10466
...
Better error messages for failed dns resolution
2014-10-27 17:03:26 -06:00
Joseph Hall
6c3c2b6911
Merge pull request #16940 from aboe76/suse_rpm_spec
...
Updated spec file to 2014.1.13
2014-10-27 16:32:33 -06:00
Mike Place
fec6b2716b
Remove now-deprecated file.sed
2014-10-27 16:22:07 -06:00
Mike Place
86da58a8c6
Remove function that's now deprecated in augeas state
2014-10-27 16:20:46 -06:00
Mike Place
9d8ea35fff
Remove unused and deprecated utlity function
2014-10-27 16:18:12 -06:00
Mike Place
3c38f49d33
Remove deprecated runas from at state
2014-10-27 16:14:29 -06:00
Mike Place
b67705e56d
Remove deprecated runas from gem state
2014-10-27 16:12:40 -06:00
Thomas S Hatch
77cd6c316a
Merge pull request #16913 from dmyerscough/dell-drac
...
Manage Dell DRAC
2014-10-27 16:12:00 -06:00
Mike Place
31c1949def
Remove deprecated runas from git state
2014-10-27 16:11:11 -06:00
Mike Place
5c1b2c2b69
Remove deprecations in hg state
2014-10-27 16:08:22 -06:00
Mike Place
6fc78ab7b1
Remove deprecations from npm state
2014-10-27 16:07:32 -06:00
Mike Place
d7521fbfe6
Remove deprecated runas in postgre_database
2014-10-27 16:05:25 -06:00
Mike Place
3dd213f5c3
Remove runas from argspec due to deprecation
2014-10-27 16:02:59 -06:00
Mike Place
1dc23d6110
Remove runas from argspec because it is deprecated
2014-10-27 16:02:14 -06:00
Mike Place
97487d80f3
Remove runas argspec from rbenv
2014-10-27 16:00:54 -06:00
