Commit Graph

6250 Commits

Author SHA1 Message Date
Thomas S Hatch
a1699b3087 Don't traceback if the runlevel fails to return 2012-08-30 16:10:57 -06:00
Thomas S Hatch
9d24c93e79 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-08-30 16:03:20 -06:00
Thomas S Hatch
b96c8e07f2 Start cleaning up ca module 2012-08-30 16:02:56 -06:00
Thomas S Hatch
60431aa2c6 Merge pull request #1926 from wilkystyle/develop
fixed typo in error message
2012-08-30 14:45:30 -07:00
Thomas S Hatch
0d43b4dd2f Clean up cassandra virtual function 2012-08-30 15:44:45 -06:00
Thomas S Hatch
666959c0b5 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-08-30 15:39:36 -06:00
Thomas S Hatch
24dcfa03e8 Clean up unused imports and pylint bugs from Jenkins 2012-08-30 15:38:57 -06:00
Thomas S Hatch
3c5b4cbbb5 Merge pull request #1925 from seanchannel/patch-3
delete the word "Facter"
2012-08-30 14:37:17 -07:00
Mike Wilkerson
de04f2660a fixed typo in error message 2012-08-30 17:35:16 -04:00
Sean Channel
61a0318ae9 delete the word "Facter"
seems just fine without it
2012-08-30 14:28:52 -07:00
Thomas S Hatch
da0468c159 remove unused serial objects 2012-08-30 15:25:52 -06:00
Thomas S Hatch
3da76531b4 repair oversight in cython module autoloading 2012-08-30 15:04:01 -06:00
Thomas S Hatch
c059416351 clean up augeas loading 2012-08-30 14:22:25 -06:00
Thomas S Hatch
34829cd046 Clean up unused imports and variables 2012-08-30 14:14:02 -06:00
Thomas S Hatch
6ae5f97f25 Fix issue with the mode being the name 2012-08-30 13:35:50 -06:00
Thomas S Hatch
511eb57fdd remove unused import 2012-08-30 13:26:35 -06:00
Thomas S Hatch
f68816ed47 Remove unused import 2012-08-30 13:25:17 -06:00
Thomas S Hatch
497e40849e Add comments for consistency 2012-08-30 13:08:02 -06:00
Thomas S Hatch
a23b979031 fix #1922 2012-08-30 13:07:00 -06:00
Thomas S Hatch
83e0158569 Should have caught that, no need to iterate that much! 2012-08-30 12:00:18 -06:00
Thomas S Hatch
2aecca3e75 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-08-30 11:40:43 -06:00
Thomas S Hatch
396d404aae Better detect upstart and sysv services, fix #1915 2012-08-30 11:34:15 -06:00
Thomas S Hatch
e7151f9b9f Merge pull request #1919 from romeotheriault/add-solaris-ps-grain
Add solaris ps grain
2012-08-30 09:20:48 -07:00
Thomas S Hatch
57824887c0 Merge pull request #1918 from romeotheriault/add-solaris-memory-grain
added a SunOS memory grain
2012-08-30 09:18:44 -07:00
Romeo Theriault
eaab9bd52b added a ps grain for SunOS 2012-08-29 22:14:40 -10:00
Romeo Theriault
6083d67df7 added a SunOS memory grain 2012-08-29 22:04:00 -10:00
Thomas S Hatch
2be45293df Fix #1906 2012-08-29 23:39:20 -06:00
Thomas S Hatch
0e4d399b82 Don't copy permission bits, fix #1916 2012-08-29 22:38:21 -06:00
Thomas S Hatch
627e74cff5 Moved to salt-contrib, fix #1917 2012-08-29 19:50:23 -06:00
Thomas S Hatch
8efd5ee53f Add traceback data to log errors in the loader 2012-08-29 19:11:16 -06:00
Thomas S Hatch
7c29074903 update event system to bind to minion events properly 2012-08-29 18:33:38 -06:00
Thomas S Hatch
9446902d42 Sockets don't disappear the way I thought they would, reverting check 2012-08-29 16:31:59 -06:00
Thomas S Hatch
dc68cf3595 Add missing import 2012-08-29 16:10:21 -06:00
Thomas S Hatch
7ef5aebcb4 Merge pull request #1911 from uggedal/develop
Fix dict iteration bug introduced in pull request #1908.
2012-08-29 14:34:31 -07:00
Thomas S Hatch
705509cf62 Merge pull request #1910 from alekibango/develop
fix wrong rst syntax in yaml_idiosyncrasies.rst
2012-08-29 14:25:00 -07:00
Eivind Uggedal
c528f690f4 Fix dict iteration bug introduced in pull request #1908. 2012-08-29 20:48:59 +02:00
David Pravec
956b89013e fix wrong rst syntax in yaml_idiosyncrasies.rst
and this time i also verified the builded documentation to be ok.
Sorry i didnt do it last time.
2012-08-29 19:06:19 +02:00
Thomas S Hatch
f510dcbc2f Take out the first person speak 2012-08-29 10:41:39 -06:00
Thomas S Hatch
44ad17237e Merge pull request #1907 from alekibango/develop
explained how to (not) use UTF8 with YAML
2012-08-29 09:36:55 -07:00
Thomas S Hatch
34aef57b6f Merge pull request #1908 from uggedal/develop
Use `systemctl list-unit-files` for finding systemd units.
2012-08-29 09:34:42 -07:00
Eivind Uggedal
8ab6de500b Strip shell escape sequences from systemctl list-unit-files call.
Without this the matches against each unit's state for get_enabled and
get_disabled will not match.
2012-08-29 16:20:02 +02:00
Eivind Uggedal
578aec642a Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-08-29 15:59:47 +02:00
Eivind Uggedal
d5080a12fa Use systemctl list-unit-files for finding systemd units.
Since we get the state of each unit with one command we don't
have to call `systemctl is-enabled` one time per unit to find
all enabled or disabled services. In addition we now get
a list of all units, not only those of the service type.
2012-08-29 15:56:49 +02:00
David Pravec
7df0764bcb explained how to (not) use UTF8 with YAML
yaml is really pain sometimes... It does support ASCII characters only.
This little text explains how to write extra characters if its needed.
2012-08-29 15:56:12 +02:00
Thomas S Hatch
6eb99f8815 Merge pull request #1903 from uggedal/develop
Ability to handle other systemd unit types than service (like socket).
2012-08-28 15:47:03 -07:00
Eivind Uggedal
2dcb76c0c8 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-08-29 00:35:50 +02:00
Eivind Uggedal
9ba058e420 Ability to handle other systemd unit types than service (like socket). 2012-08-29 00:32:17 +02:00
Thomas S Hatch
5574e8c657 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-08-28 15:46:13 -06:00
Thomas S Hatch
c9412cbc78 clean up socket management for the minion event system 2012-08-28 15:45:46 -06:00
Thomas S Hatch
3175430300 Merge pull request #1901 from scott-w/develop
Added hg state
2012-08-28 14:41:07 -07:00