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
Scott Walton
cb97314cf6
Some clean-up #330
2012-08-28 21:48:45 +01:00
Thomas S Hatch
b79bbe1943
Fix typo in recent commit
2012-08-28 13:50:50 -06:00
Thomas S Hatch
73d46753f7
Merge pull request #1899 from alekibango/develop
...
improved and fixed docstrings for file.(un)comment and state.show_sls
2012-08-28 12:49:51 -07:00
Thomas S Hatch
cd2850edd1
Merge pull request #1898 from uggedal/develop
...
Make salt recognize systemd service units in /etc/systemd/system.
2012-08-28 12:45:43 -07:00
Thomas S Hatch
47bd829764
Merge pull request #1895 from s0undt3ch/issues/1864
...
Fix #1864 - Support `makedirs` to `salt.states.file.append()`
2012-08-28 12:40:39 -07:00
Thomas S Hatch
e175fc4cea
Merge pull request #1894 from s0undt3ch/issues/1879
...
Fix #1879
2012-08-28 12:39:39 -07:00
Thomas S Hatch
1ab5a46f4a
Merge pull request #1893 from jeffh/pip_removed
...
Applied patch from fix #1881 .
2012-08-28 12:36:30 -07:00
Thomas S Hatch
77244fe9d4
Merge pull request #1892 from jeffh/pip_requirements
...
Fixed support for running pip install requirements with another user.
2012-08-28 12:35:32 -07:00
David Pravec
b17b609d68
Fixed wrong CLI example in show_sls docstring
...
simple edit:
state.sls -> state.show_sls
2012-08-28 17:43:45 +02:00
David Pravec
f5251f80d5
Fixed docstring for file.comment/uncomment
...
(just used text from module file)
2012-08-28 17:41:14 +02:00
Eivind Uggedal
c6c0ed2275
Make salt recognize systemd service units in /etc/systemd/system.
2012-08-28 15:15:13 +02:00
Pedro Algarvio
b3a03e391f
Fix #1864 - Support makedirs to salt.states.file.append()
2012-08-28 12:05:50 +01:00
Pedro Algarvio
8b645b339b
Fix #1879 . Searching/matching is now done on multiple lines.
...
* `salt.modules.file.contains()`, `salt.modules.file.contains_regex()`, `salt.modules.file.contains_glob()` and `salt.utils.find` now do the searching/matching against chunks of data; using defaults, 32KB chunks of data in files; instead of searching/matching line by line.
* Based on the above changes `salt.states.file.append()`, when checking if the text to append is already present, now uses `salt.modules.file.contains_regex()` in order to match spanning multiple lines ignoring the addition/deletion of white-space or new lines, except inside commas.
* The regex used on the above item is built at runtime using `salt.utils.build_whitepace_splited_regex()`, just feed the text to it and you'll get back the proper regex to the matching/searching on, for example `salt.modules.file.contains_regex()`.
* Added tests for all this code.
2012-08-28 10:03:11 +01:00
Jeff Hui
bb1c7f659b
Applied patch from fix #1881 .
2012-08-28 00:47:33 -07:00
Jeff Hui
519b837aa0
Fixed support for running pip install requirements with another user. Also moved salt:// requirements support from virtualenv state to pip module.
...
Closes #1891 .
2012-08-28 00:37:00 -07:00
