Commit Graph

7175 Commits

Author SHA1 Message Date
Thomas S Hatch
23de10fb2b Merge pull request #2331 from danielliang/develop
Fix pecl list if no package installed
2012-10-24 08:27:20 -07:00
Thomas S Hatch
7843fdc271 Merge pull request #2330 from anttix/brew-fix
Fix three issues with homebrew module
2012-10-24 08:23:27 -07:00
Thomas S Hatch
d92476f19d Merge pull request #2329 from anttix/develop
Fix test_chown_noop on MacOS X 10.8. Fixes #2328.
2012-10-24 08:15:42 -07:00
Tom Vaughan
15f89dbdfe Bump debian package number.
Launchpad compains that salt_0.10.4.tar.gz already exits. There is no
way to delete this tarball:

    https://answers.launchpad.net/launchpad/+faq/990

Also `dput -f` doesn't work in this case.

The Ubuntu distribution has also been added to the debian package
number. This appears to be the only way we can build salt packages on
Launchpad for multiple distributions.

http://www.youtube.com/watch?v=dJw6pcEwyXM
2012-10-24 11:13:17 -03:00
Tom Vaughan
24402baa53 bump 2012-10-24 10:54:42 -03:00
Jeffrey C. Ollie
d21f01128f Fix systemd service status.
Under systemd, not every service has a "Main PID" so using that to
determine whether a service was running failed for a number of useful
cases, especially services that use systemd's init script
compatibility layer.

Instead, use the 'systemctl is-active' command to determine the status
of a service.
2012-10-24 08:53:46 -05:00
Tom Vaughan
a04f63aefc Bump debhelper version number down to 7.0.50 in Build-Depends.
debian/rules uses one override. According to
http://pkg-perl.alioth.debian.org/debhelper.html#forcing_special_tests
overrides were introduced in 7.0.50.

This will enable builds on older Debian and Ubuntu distributions,
especially builds on older distributions on Launchpad.
2012-10-24 10:48:43 -03:00
Tom Vaughan
ebedc61bc2 Remove libzmq-dev as a Build-Depends. 2012-10-24 10:48:43 -03:00
Jonas
af3863fc97 Add quoting for postgres users and databases
Otherwise, creating users and databases within postgres fails
when they contain a dash (-).
2012-10-24 14:19:04 +02:00
Jonas
568f1f5067 Revert my changes to postgres quoting
The actual error was in cmd.run, so these changes were
unnecessary. Fixes #2279
2012-10-24 13:36:54 +02:00
Hung-te Liang
1a9f41ced4 Fix pecl list if no package installed 2012-10-24 19:20:57 +08:00
Antti Andreimann
ae7365c6a6 Fix three issues with homebrew module.
1. Add standard arguments so pkg.install works from state files
2. Do not attempt to switch user with runas if minion is already running
   under the same non-root user that was used to install homebrew
3. Support installations in a prefix different from /usr/local
2012-10-24 00:28:53 -07:00
Antti Andreimann
92b45f785c Fix test_chown_noop on MacOS X 10.8. Fixes #2328.
There seems to be a bug in Python 2.7 on OSX 10.8,
grp.getgrnam('') will return a map with gr_gid set to 0
2012-10-23 23:50:16 -07:00
Thomas S Hatch
0bc4d05f31 Merge pull request #2327 from s0undt3ch/issues/2326
Allow `salt-call` to run as if in a "masterless" setup. Fixes #2326.
2012-10-23 22:14:13 -07:00
Pedro Algarvio
d715f2a115 Allow salt-call to run as if in a "masterless" setup. Fixes #2326. 2012-10-24 06:10:40 +01:00
Thomas S Hatch
c4e32a35b2 update version number 2012-10-23 14:56:18 -06:00
Thomas S Hatch
02f872510f Single quotes :) 2012-10-23 14:46:21 -06:00
Thomas S Hatch
2f1cbb4e1b Don't log when ldap is not imported 2012-10-23 14:45:30 -06:00
Thomas S Hatch
f2de1587c5 Update manpages for 0.10.4 2012-10-23 14:36:13 -06:00
Thomas S Hatch
099d37fcbe Update manpage for eauth 2012-10-23 14:31:12 -06:00
Thomas S Hatch
43e9c83cf3 Revert "Merge pull request #2319 from ffa/improve_options_support"
This reverts commit 41dfb03a1c, reversing
changes made to 265f97ff43.
2012-10-23 14:13:45 -06:00
Thomas S Hatch
41dfb03a1c Merge pull request #2319 from ffa/improve_options_support
improve states.cmd.run options support
2012-10-23 12:48:12 -07:00
Pedro Algarvio
265f97ff43 Don't log the ImportError exception. 2012-10-23 20:26:20 +01:00
Thomas S Hatch
f16f6074fb Merge pull request #2324 from s0undt3ch/develop
Complement #2323.
2012-10-23 11:58:30 -07:00
Pedro Algarvio
558c293104 Define log earlier since it's needed earlier. 2012-10-23 19:29:43 +01:00
Pedro Algarvio
0ddb008497 Complement #2323. 2012-10-23 19:19:24 +01:00
Thomas S Hatch
e7835180d3 Merge pull request #2323 from UtahDave/develop
Clarify diff between console and log file settings
2012-10-23 09:10:56 -07:00
Dave Boucha
1cc9acc7fc Clarify diff between console and log file settings
log_level refers to console logging level
log_level_logfile refers to log file logging level

These are configured separately.
2012-10-23 10:06:12 -06:00
Thomas S Hatch
f18522f4a0 Merge pull request #2322 from KrisSaxton/develop
added LDAP external authentication module
2012-10-23 09:05:52 -07:00
Kris Saxton
95a35653ea added LDAP external authentication module 2012-10-23 17:02:04 +01:00
Thomas S Hatch
bc783a7518 Merge pull request #2320 from tail/fix-pip-install-options
Fixed --install-option for pip module.
2012-10-23 08:44:46 -07:00
Thomas S Hatch
3ebe607526 Merge pull request #2318 from ffa/remove_system_links_support
add link removal to the modules.file.remove fuction.
2012-10-23 08:39:11 -07:00
Jason Yan
ff34fe1df4 Fixed --install-option for pip module. 2012-10-23 02:13:35 -07:00
Adam
b0a34c4dd9 improve states.cmd.run options support
In the states.cmd.run function, inherit kwargs, so misc variables may
be passed to the modules.cmd.run function.

For env, environmental, variables, allow dicts in addition to a string.
The string is converted into a dict anyways.
2012-10-23 00:52:52 -07:00
ffa
dbb02ce8ae add link removal to the modules.file.remove fuction. 2012-10-23 00:46:25 -07:00
Thomas S Hatch
2ee9e9513c Update the release notes with more goodies :) 2012-10-22 18:01:18 -06:00
Thomas S Hatch
3df288129a Merge pull request #2317 from romeotheriault/develop
update solaris release notes
2012-10-22 16:34:23 -07:00
Thomas S Hatch
59615b4e6f Fix #2240 2012-10-22 17:33:37 -06:00
Romeo Theriault
a0a315e4e6 update solaris release notes 2012-10-22 13:25:29 -10:00
Thomas S Hatch
ec34d5ab0d Merge pull request #2316 from UtahDave/develop
First draft of 0.10.4 Release notes
2012-10-22 16:00:11 -07:00
Dave Boucha
6ecd7b2515 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-10-22 16:55:28 -06:00
Dave Boucha
154dbec554 Formatting and grammar fixes. 2012-10-22 16:53:21 -06:00
Dave Boucha
e52c27a230 Additions to 0.10.4 release notes. 2012-10-22 16:09:45 -06:00
Thomas S Hatch
8eafdb3e3d need index for .format strings!!!!! 2012-10-22 15:23:04 -06:00
Thomas S Hatch
f34e9de0ab Fix memory mapping issue 2012-10-22 15:14:21 -06:00
Thomas S Hatch
c1429a2927 Catch when rabbitmq does not return expected output 2012-10-22 14:55:45 -06:00
Thomas S Hatch
a308a2c52f Have to use field numbers for .format to work in python 2.6 2012-10-22 14:51:48 -06:00
Thomas S Hatch
9f05f53fd7 Fix tests from failing if token present for the user 2012-10-22 14:43:47 -06:00
Thomas S Hatch
4c561272a7 Fix problem where old master code may return a string 2012-10-22 13:41:35 -06:00
Thomas S Hatch
e210936afc Fix minor issue in tokens when the auth fails 2012-10-22 11:57:49 -06:00