Thomas S Hatch
75bf4574d7
Fix files to be opened via with statements
2012-09-06 22:03:41 -06:00
Thomas S Hatch
b793afc3fa
Merge pull request #1984 from 0xDEC0DE/develop
...
Make the ability to determine the SysV runlevel on Upstart track how the system does it
2012-09-06 15:32:38 -07:00
Nicolas Simonds
b0b002d7fb
Make the ability to determine the SysV runlevel on Upstart track how the system does it
...
This cures a problem where Salt cannot tell if any of the SysV-style services
are enabled, because it cannot reliably determine the current runlevel.
(strictly speaking, the current method of "guess 2 if the command fails" also
works, but is sub-wonderful)
2012-09-06 14:05:43 -07:00
Thomas S Hatch
f5ff920fc7
update comment, uncomment and append to include the diff in changes
...
Fix #1951
2012-09-06 14:42:59 -06:00
Thomas S Hatch
cb63aa7313
Fix for #1978
2012-09-06 14:23:06 -06:00
Thomas S Hatch
5cc5a7671a
Add integration test docs
2012-09-06 14:09:17 -06:00
Pedro Algarvio
d0338d5e05
Merge pull request #1983 from s0undt3ch/issues/1981
...
Keep configuration variables to the minimum possible. Refs #1981 .
2012-09-06 12:06:10 -07:00
Pedro Algarvio
7c50be20a0
Keep configuration variables to the minimum possible. Refs #1981 .
2012-09-06 20:04:14 +01:00
Pedro Algarvio
c292f01d7c
Merge pull request #1982 from s0undt3ch/issues/1981
...
Restore the date to the logfile `datefmt`. Fix #1981 .
2012-09-06 11:53:40 -07:00
Pedro Algarvio
f6edff66e9
Restore the date to the logfile datefmt. Fix #1981 .
2012-09-06 19:51:24 +01:00
Thomas S Hatch
7dbc411154
Merge pull request #1962 from drzero42/develop
...
Add full restart option to upstart and service-state
2012-09-06 10:44:43 -07:00
Thomas S Hatch
c54df116af
Merge pull request #1980 from s0undt3ch/issues/1964
...
Raise max open files when starting master. Refs #1964
2012-09-06 10:38:23 -07:00
Pedro Algarvio
2062cee6cf
Correct log message. Refs #1964 .
2012-09-06 18:21:33 +01:00
Pedro Algarvio
89cffc051e
Raise max open files when starting master. Refs #1964
...
When `salt-master` starts, it checks the soft and hard limits for max open files, it then raises it's process allowed max open files to the maximum if `max_open_files` is unset on the configuration file or to the set value.
2012-09-06 18:07:30 +01:00
Thomas S Hatch
45c11bd622
Merge pull request #1979 from benhosmer/develop
...
Adding set_date function to shadow moudle
2012-09-06 09:14:51 -07:00
Ben Hosmer
cef1c90c55
Adding set_date function to shadow moudle
2012-09-06 11:58:53 -04:00
Thomas S Hatch
a8b1e4c6f3
Test interface returns None as the result
2012-09-06 09:10:26 -06:00
Thomas S Hatch
33be413b8f
Merge pull request #1973 from kjkuan/develop
...
Fix bugs in pip and virtualenv module/state.
2012-09-06 08:07:04 -07:00
Jack Kuan
105335542a
Make cmd.script accept arguments.
2012-09-06 09:46:04 -04:00
Thomas S Hatch
b54a5171d4
Merge pull request #1975 from romeotheriault/add-solaris-install-docs
...
added documentation on how to install salt on solaris
2012-09-05 21:44:48 -07:00
Romeo Theriault
c263ede05c
added documentation on how to install salt on solaris
2012-09-05 18:12:17 -10:00
Thomas S Hatch
c50f98ac4f
Merge pull request #1970 from stas/develop
...
Updated jobs runner to handle printing of job return data.
2012-09-05 20:11:44 -07:00
Pedro Algarvio
0c830784f3
Merge pull request #1974 from s0undt3ch/issues/1964
...
Reduce requirements to generate keys.
2012-09-05 14:38:03 -07:00
Pedro Algarvio
6e9b2810ee
Reduce requirements to generate keys.
...
The generation of keys does not involve all the checks required to accept/deny/list keys. This code change allows:
* regular users to generate keys
* `/etc/salt` and `/var/log/salt` not to exist or not to be readable by the current user
It also does not check for a running master. We have now lowered the requirements to run this script just for generating keys.
2012-09-05 22:31:12 +01:00
Jack Kuan
c7f5f0be6d
Fix bugs in pip and virtualenv module/state.
...
- Fixed a local 'treq' referenced before assignment bug when the
requirements file is not "salt://..." but a local file path.
- Fixed virtualenv such that the result will be False if pip fails.
2012-09-05 15:49:46 -04:00
Stas SUȘCOV
f7c31faff7
Updated jobs runner to handle printing of job return data.
...
This should be useful when a peer publishes a command
and wants to fetch details back.
2012-09-05 20:59:54 +03:00
Thomas S Hatch
bd1058ab44
Start on test docs, ref #1920
2012-09-05 10:34:33 -06:00
Thomas S Hatch
cd2f8a6ece
Merge pull request #1969 from wilkystyle/develop
...
Develop
2012-09-05 08:45:54 -07:00
Mike Wilkerson
64b6f68b45
improved the shebang removal for JSON
2012-09-05 11:38:44 -04:00
Mike Wilkerson
3ab02e5cb1
added cmd_json.py
2012-09-05 10:51:00 -04:00
Mike Wilkerson
d925d0b117
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2012-09-05 10:49:46 -04:00
Mike Wilkerson
88ad39a4fb
fixed passing the shebang line as json
2012-09-05 10:49:26 -04:00
Pedro Algarvio
a8e62f1a15
Merge pull request #1968 from s0undt3ch/develop
...
Fix `ValueError` on Py2.6 zero length field names are not supported
2012-09-05 04:13:33 -07:00
Pedro Algarvio
75f262c447
Fix ValueError on Py2.6 zero length field names are not supported
2012-09-05 12:11:16 +01:00
Pedro Algarvio
33f1f312ed
Merge pull request #1967 from s0undt3ch/issues/1964
...
Fix/Improve the minionswarm
2012-09-05 04:06:29 -07:00
Pedro Algarvio
fc3070c3bb
Keep minionswarm temporary files/dirs. Refs #1964 .
...
* Provide an option to the parer which allows not to delete temporary files/directories created for the minionswarm.
2012-09-05 12:01:48 +01:00
Pedro Algarvio
145197b48b
Fix test/minionswarm.py. Refs #1964 .
...
* Allow the `minionswarm` to run under user space
* Provide some additional configuration to the minions to use the temporary directories created for the swarm.
* Try to properly shutdown the running minions.
* As a last resort, `kill -KILL` all minions still running.
2012-09-05 11:54:17 +01:00
Anders Bruun Olsen
ac23b52483
Add full restart option to upstart and service-state
2012-09-04 20:16:41 +02:00
Thomas S Hatch
777820133f
Merge pull request #1958 from s0undt3ch/develop
...
Only try to create non empty directory names.
2012-09-04 07:44:35 -07:00
Pedro Algarvio
436e161517
Add a log messages to know the minion's socket URI's
2012-09-04 15:24:44 +01:00
Pedro Algarvio
9c071fdddb
Only try to create non empty directory names.
2012-09-04 14:49:14 +01:00
Thomas S Hatch
d7a9fcb826
Merge pull request #1954 from s0undt3ch/issues/1948
...
Fix #1948
2012-09-03 19:48:49 -07:00
Thomas S Hatch
983767d3aa
Merge pull request #1950 from s0undt3ch/develop
...
Fix syntax error from last commit.
2012-09-03 19:44:04 -07:00
Pedro Algarvio
99a714d235
Some PEP8 fixes.
2012-09-03 23:32:41 +01:00
Pedro Algarvio
81ccd7c9a7
Remove un-used import.
2012-09-03 23:26:59 +01:00
Pedro Algarvio
e7a10cce98
Fix saltstack/salt#1948
...
* `SaltCPOptionParser` was not reading any configuration file. It should!
* Fixed the `salt-cp` test which was not testing anything, until now.
2012-09-03 23:24:08 +01:00
Pedro Algarvio
f33622f05c
Merge branch 'develop' of git://github.com/saltstack/salt into develop
2012-09-03 22:26:31 +01:00
Pedro Algarvio
6110a72231
Fix syntax error from last commit.
2012-09-03 19:10:38 +01:00
Thomas S Hatch
71e08a8e26
Merge pull request #1949 from s0undt3ch/develop
...
Fix state tests && auto ulimit handling
2012-09-03 10:24:08 -07:00
Thomas S Hatch
9b6c38ac07
Merge pull request #1947 from romeotheriault/add-solaris-virtual-grain
...
Separated and cleaned up solaris zone detection
2012-09-03 10:20:55 -07:00
