Brian Riley
eabba9030e
Presentation link fix
...
The link on the doc homepage to presentations was broken. I changed it
as per whiteinge's instructions.
2012-07-16 16:04:17 -07:00
Brian Riley
a3c456f8cd
Fix for bad installation link
...
The tutorials had a link to a non-existant installation page. I changed
this to link to the installation index document. I also removed the
unused installtion link from `conf.py`.
2012-07-16 15:55:23 -07:00
Brian Riley
425ce24e68
Remove :orphan: as per request
...
I removed the `:orphan:` element at the top as per whiteinge's request
on IRC.
2012-07-16 15:35:08 -07:00
Thomas S Hatch
ba516b0703
Merge pull request #1640 from grierj/contribute
...
Allow the passage of a timeout value to salt runners.
2012-07-16 12:45:22 -07:00
Grier Johnson
1baadea1df
Fixing typo
2012-07-16 12:11:02 -07:00
Grier Johnson
7287ef5888
Allow the passage of a timeout value to salt runners.
...
This is needed in larger environments as 2-3k machines take about 8-9
seconds to all respond to a test.ping. I've updated both runners that
set a default timeout value of 1 to accept the timeout from __opts__
Conflicts:
salt/runners/jobs.py
2012-07-16 12:09:37 -07:00
Thomas S Hatch
1d7f668d57
Merge pull request #1639 from dekkers/show-diff
...
Show diff with test=True
2012-07-16 11:34:57 -07:00
Jeroen Dekkers
fba8a2bc9f
When using the test interface, call cp.cache_file on files that are
...
different so that we are able to calculate the diff. Closes GH-1480.
2012-07-16 19:25:16 +02:00
Thomas S Hatch
ea4f6d8f62
Merge pull request #1637 from dekkers/normalize-all-privilege
...
normalize ALL to ALL PRIVILEGES, so that grant_exists and grant_create ALL work correctly
2012-07-16 07:30:34 -07:00
Thomas S Hatch
4d646e0563
Merge pull request #1636 from intchanter/develop
...
Fixed typo
2012-07-16 07:29:47 -07:00
Jeroen Dekkers
00f6ecea09
normalize ALL to ALL PRIVILEGES, so that grant_exists and grant_create
...
ALL work correctly
2012-07-16 16:18:42 +02:00
Intchanter
cf39fc7ad8
Fixed typo
2012-07-16 08:15:49 -06:00
Seth House
eabfcbc8d7
Merge pull request #1634 from pau/develop
...
Fixed bug were the minimum keysize could be greater than 2048.
2012-07-15 17:30:18 -07:00
Paulo Tioseco
a3ba6d1643
Fixed bug were the minimum keysize could be greater than 2048.
...
Looks like this was introduced in saltstack/salt@4981752f1d
2012-07-15 17:16:53 -07:00
Thomas S Hatch
b95b9fd1e1
Merge pull request #1633 from dekkers/docstring-typo
...
Fix typo in mysql.user_create docstring
2012-07-15 15:54:01 -07:00
Seth House
58d36b186d
Check if dir_mode is passed before trying to change the mode
...
Thanks again to @Mistobaan for walking me through this fix. Fixes #1631
2012-07-15 14:53:10 -07:00
Jeroen Dekkers
7b6bdd7be2
Fix typo in mysql.user_create docstring
2012-07-15 23:52:56 +02:00
Seth House
9b9c8dbe51
Use the built in salt function to set the dir perms
...
Thanks to @Mistobaan for walking me through this fix. Fixes #1629
2012-07-15 14:49:04 -07:00
Thomas S Hatch
7ee76850e9
Merge pull request #1632 from jre/so-reuseaddr
...
Set the SO_REUSEADDR option when performing the bind() test.
2012-07-15 14:46:55 -07:00
Thomas S Hatch
c163c62397
Merge pull request #1630 from jre/service
...
OpenBSD service module improvements
2012-07-15 14:46:14 -07:00
Joshua Elsasser
5212351177
Set the SO_REUSEADDR option when performing the bind() test.
...
Make failure of this test fatal again as well.
2012-07-15 14:26:07 -07:00
Joshua Elsasser
b0bbb0db92
Disable the systemd service module on non-Linux systems.
2012-07-15 13:50:40 -07:00
Seth House
2fc0b0610f
Added hacking to the TOC
2012-07-15 11:37:41 -07:00
Seth House
45937c02c0
Added a "See also" for the hacking doc to the install page
2012-07-15 11:36:51 -07:00
Seth House
dd0f6910cc
Added development env installation instructions to HACKING
2012-07-15 11:18:38 -07:00
Seth House
3791d3ba0a
Added path checking to setup.py
2012-07-15 11:18:38 -07:00
Seth House
6e7afc0d0e
Changed setuptools opt-in to be more explicit; added a quick explanation
2012-07-15 11:18:38 -07:00
Seth House
983ef87626
Change setup.py shebang to point to python instead of python2
2012-07-15 11:18:38 -07:00
Joshua Elsasser
81b4344d3f
Disable OpenBSD service module on 5.0, it won't work reliably there.
2012-07-15 10:05:06 -07:00
Thomas S Hatch
24df88cb87
Merge pull request #1628 from jre/grains
...
Grain fiddling on OpenBSD (second try)
2012-07-15 08:38:54 -07:00
Joshua Elsasser
c4524819e4
Insure num_cpus grains is an int on BSD systems, for consistency with Linux.
2012-07-15 07:53:55 -07:00
Joshua Elsasser
de41270818
On OpenBSD, set cpuarch grain to the application architecture, not kernel.
...
OpenBSD has the concept of a separate application architecture and
kernel architecture. The former may be shared between several
platforms while the latter is unique.
For example, a PowerPC Macintosh computer will have application and
kernel architectures of 'powerpc' and 'macppc', respectively. Certain
PowerPC-based NAS hardware will have the same application architecture
but have a kernel architecture of 'socppc'. This allows them to have
different kernels and base systems while sharing the same set of
packages.
2012-07-15 07:53:47 -07:00
Joshua Elsasser
47c237dc50
Rename and refactor the BSD cpudata grains function.
2012-07-15 07:53:24 -07:00
Thomas S Hatch
53285798e0
The watcher function is called mod_watch now
...
and has been for some time...
2012-07-15 01:03:26 -06:00
Thomas S Hatch
7b63b7edb5
Merge pull request #1626 from intchanter/develop
...
Made some language clearer.
2012-07-15 00:00:24 -07:00
Intchanter
588f93a5cd
Made some language clearer.
2012-07-15 00:57:53 -06:00
Thomas S Hatch
e87f442213
Fix #1621
2012-07-15 00:15:15 -06:00
Thomas S Hatch
e3156635d0
Fix #1515
2012-07-15 00:13:12 -06:00
Thomas S Hatch
05d07c4512
Add error detection to pillar top files
2012-07-14 23:58:22 -06:00
Thomas S Hatch
3f0e9ad8df
Merge pull request #1625 from dekkers/fix-undefined-name-errors
...
Fix "undefined name" errors spotted by pyflakes
2012-07-14 22:01:26 -07:00
Thomas S Hatch
45c6ffe0b0
Merge pull request #1624 from bretep/develop
...
Print salt version
2012-07-14 18:33:08 -07:00
Jeroen Dekkers
a28272e2fb
Fix "undefined name" errors spotted by pyflakes
2012-07-15 03:01:35 +02:00
Bret Palsson
83de9bb4b1
Reverting the spec file
...
I was wrong... when building the src rpm you only need to have the files defined in the Source{n}. So if you have the packaged files tarballed, grabbing the version automatically will not work.
2012-07-14 17:41:08 -06:00
Bret Palsson
f803935d26
Merge remote-tracking branch 'upstream/develop' into develop
2012-07-14 17:17:04 -06:00
Bret Palsson
52b3aebe01
Get version of salt when building RPM
...
When building an RPM either src or binary you must have all the source files in the %{_sourcedir}, this means we can pull out the version of salt we are building from the source files, keeping things sane. The source URL in the salt.spec file is only used for documentation purposes, we don't use it to grab the source to build from. This potentially could change, but 99.99% of the packages out there do not do this.
2012-07-14 17:03:57 -06:00
Jeff Schroeder
300856a030
Merge pull request #1623 from mrud/mru/zypper
...
Use zypper for all Suse products instead of only for openSUSE
2012-07-14 11:08:42 -07:00
Ulrich Dangel
8604b586cd
Use zypper for all Suse products instead of only for openSUSE
2012-07-14 18:52:15 +02:00
Joshua Elsasser
b24b5fc5d5
Don't set hardware grains on OpenBSD if the matching sysctl isn't available.
...
This means that OpenBSD minions won't end up with grains such as
biosversion set to 'sysctl: hw.version: value is not available', the
grain will instead be absent.
2012-07-14 08:11:20 -07:00
Thomas S Hatch
ade4a9f02d
fix overlooked conversion to sreq
2012-07-14 00:54:43 -06:00
Thomas S Hatch
b4ae7d97a0
fix email
2012-07-13 09:38:59 -06:00
