Pedro Algarvio
db456f38c4
Move travis-ci output to #salt-devel
2012-08-25 22:41:39 +01:00
Thomas S Hatch
fd3ed5de6f
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-08-25 11:03:51 -06:00
Thomas S Hatch
174737dacb
Nice catch @s0undt3ch
2012-08-25 11:01:19 -06:00
Thomas S Hatch
404ef9d500
Merge pull request #1877 from s0undt3ch/issues/1876
...
Fix #1876
2012-08-25 09:30:31 -07:00
Thomas S Hatch
b0cece98e8
Merge pull request #1874 from twinshadow/ipaddr-fix
...
ipaddr() again returns only the first address, like it did before 0.10.2
2012-08-25 09:24:38 -07:00
Pedro Algarvio
22d69e43c7
Properly catch some more state SLS syntax errors.
...
Sort keys before checking for same key in rule. Fixes #1876 .
2012-08-25 14:44:07 +01:00
Pedro Algarvio
d21e8c7b27
Another mkdir that should be included in previous commit.
2012-08-25 14:36:30 +01:00
Pedro Algarvio
6b2e12d9bf
Don't fail on tests because we're trying to create a directory and it exists(and that's not the actual test).
2012-08-25 14:21:38 +01:00
Pedro Algarvio
c06541bdf0
Allow some logging output when running tests.
2012-08-25 14:21:19 +01:00
Pedro Algarvio
5da4fcb109
Fix integration.runners.manage tests.
...
These tests started to fail after 54cf9ca5626332
2012-08-25 14:21:08 +01:00
Pedro Algarvio
b2ec6eba2a
Merge branch 'develop' of git://github.com/saltstack/salt into develop
2012-08-25 12:06:18 +01:00
Jeff Schroeder
90f99abbab
Merge pull request #1875 from rhyselsmore/develop
...
Forgot to add my name into the AUTHORS file in a prior commit
2012-08-25 02:50:54 -07:00
Rhys Elsmore
a9cd1ffc98
Forgot to add my name into the AUTHORS file in a prior commit
2012-08-25 18:11:44 +10:00
Anthony Cornehl
076e421ac0
ipaddr() again returns only the first address, like it did before 0.10.2.
2012-08-24 18:00:01 -07:00
Thomas S Hatch
cb709d47fe
Merge pull request #1873 from marcinkuzminski/patch-2
...
Update salt/modules/mysql.py
2012-08-24 09:16:00 -07:00
Thomas S Hatch
c0b53306cf
Merge pull request #1872 from mrud/mru/include_doc
...
Update documentation re. config file handling & autosigning
2012-08-24 09:12:51 -07:00
Marcin Kuźmiński
e08587678f
Update salt/modules/mysql.py
...
Fixed issues with mysql_chpass function
- fixed logical error that required both password and password_hash
to be present
- added FLUSH PRIVILEGES command that is really needed after password
change
- small syntax fixes
2012-08-24 18:38:01 +03:00
Ulrich Dangel
6fda0d22e7
Mention autosigning in master documentation
2012-08-24 16:20:19 +01:00
Ulrich Dangel
878e53db1b
Update documentation about default includes
2012-08-24 16:14:21 +01:00
Thomas S Hatch
dc674dc3ab
Fix some printing issues with key sigs
2012-08-24 02:39:42 -06:00
Thomas S Hatch
304c83eab4
Add finger option to salt key parser
2012-08-24 02:31:12 -06:00
Thomas S Hatch
55ae227f78
initial backend for printing key fingerprints
2012-08-24 02:26:23 -06:00
Thomas S Hatch
3c48f2214a
Fix #1848
2012-08-24 01:31:52 -06:00
Thomas S Hatch
019a316136
Change zfs module to be called zpool, Fix #1764
2012-08-24 01:14:04 -06:00
Thomas S Hatch
356e0599af
Fix #1838
2012-08-24 00:49:04 -06:00
Thomas S Hatch
d89bc36ffa
Fix #1861
2012-08-23 23:59:52 -06:00
Thomas S Hatch
e74ceb2550
Throw exceptions when referencing bad dicts
2012-08-23 23:31:17 -06:00
Thomas S Hatch
5626332003
Add an interface to refresh the pub interface
...
This system is being used to recover minion connections hen they are
lost right after commands are sent. This underlying issue appears to be
associated with zeromq issues with subscribers running on Xen and VMware
virtual machines
Fix #1827
2012-08-23 23:05:25 -06:00
Thomas S Hatch
54cf9ca313
Add pub_refresh option
2012-08-23 23:05:14 -06:00
Thomas S Hatch
40fe2a3102
fix #1784
2012-08-23 22:05:18 -06:00
Thomas S Hatch
d38f937f2a
Add Goose Linux detection to grains
2012-08-23 21:45:29 -06:00
Thomas S Hatch
c6c3ccc3c1
Fix #1776
2012-08-23 20:23:16 -06:00
Thomas S Hatch
b6b470d48a
Fix #1765
2012-08-23 19:01:07 -06:00
Thomas S Hatch
264f00cb02
Merge pull request #1869 from herlo/master
...
Well, here's my Certificate Authority module
2012-08-22 17:01:11 -07:00
Clint Savage
54a9fe4d28
documenting the CA module
2012-08-22 17:48:50 -06:00
Clint Savage
eb723198ee
add create_pkcs12 method
...
added functions to main to match methods
2012-08-22 17:36:17 -06:00
Clint Savage
a193c1e2c7
add create_ca_signed_cert method
2012-08-22 17:24:13 -06:00
Clint Savage
5ebf03d296
add create_csr method
2012-08-22 17:23:25 -06:00
Clint Savage
af0840cce9
add create_ca_cert method
2012-08-22 17:19:30 -06:00
Clint Savage
b244e07043
initial ca.py module
2012-08-22 17:14:50 -06:00
Thomas S Hatch
da8df03a6c
Merge pull request #1867 from fatbox/more-virt
...
Minidom fixups to prevent Exceptions
2012-08-22 13:42:31 -07:00
Evan Borgstrom
47fea1fc0b
Minidom fixups to prevent Exceptions
2012-08-22 15:25:45 -04:00
Thomas S Hatch
c64df33d81
Merge pull request #1866 from marcinkuzminski/patch-1
...
Update debian/control
2012-08-22 09:46:12 -07:00
Thomas S Hatch
9ac5a3d623
Merge pull request #1862 from seanchannel/develop
...
bad salt-key cmdline example
2012-08-21 19:19:54 -07:00
Sean Channel
06fdfe6cfa
bad salt-key cmdline example
2012-08-21 15:03:48 -07:00
Thomas S Hatch
b38188d43b
Add followlinks to the local client so it behaves like the remote client
2012-08-21 10:07:52 -06:00
Marcin Kuźmiński
2a90ef4d35
Update debian/control
...
When building latest dev i noticed that build doesn't require msgpack-python,
yet when trying to install build .deb it is required.
2012-08-21 16:05:20 +03:00
Thomas S Hatch
6a2084540e
Merge pull request #1860 from egut/develop
...
Added some more catch exception so we always return
2012-08-20 23:47:50 -07:00
Thomas S Hatch
aaf55b94c1
Fix #1830
2012-08-21 00:10:45 -06:00
Thomas S Hatch
353d82fc7c
Merge pull request #1859 from fatbox/more-virt
...
Add two new functions to set the memory and vcpus allocated to a VM
2012-08-20 22:13:42 -07:00
