Thomas S Hatch
8748414b21
Merge pull request #1520 from mattrobenolt/fix-ssh-module-tests-vagrant
...
Hardcode /tmp/subsalttest dir in ssh module integration tests
2012-06-30 11:55:47 -07:00
Matt Robenolt
57ff2bfe3e
Hardcode /tmp/subsalttest dir in ssh module integration tests
...
I don't really like doing this, but `/tmp/subsalttest dir` is already
hardcoded in other places for running tests.
Without this, when running tests under a mounted Vagrant drive,
`ssh-keygen` doesn't have permission to create the symlink for
known_hosts to known_hosts.old, causing a test to fail.
```
======================================================================
FAIL: test_rm_known_host (integration.modules.ssh.SSHModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/vagrant/tests/integration/modules/ssh.py", line 143, in
test_rm_known_host
self.assertEqual(ret, 'add')
AssertionError: 'exists' != 'add'
```
`link /vagrant/tests/integration/tmp/known_hosts to
/vagrant/tests/integration/tmp/known_hosts.old: Operation not permitted`
2012-06-30 11:46:31 -07:00
Thomas S Hatch
0911c130a7
Add master side event evaluation
2012-06-30 12:39:51 -06:00
Thomas S Hatch
7424738dc9
Merge pull request #1519 from intchanter/develop
...
Remove 'DO NOT EDIT', as distros copy as-is.
2012-06-30 11:19:05 -07:00
Intchanter
5f98f6cc83
Remove 'DO NOT EDIT', as distros copy as-is.
2012-06-30 12:14:58 -06:00
Jeff Schroeder
27bba6ad0c
Merge pull request #1518 from laprice/develop
...
Tenants rent your property. Tenets are are principles that you uphold.
2012-06-30 10:48:38 -07:00
Thomas S Hatch
8f8597d91f
Merge pull request #1517 from baijum/sprint
...
Fix various issues with `is_replication_enabled`
2012-06-30 10:12:21 -07:00
Baiju Muthukadan
fa6b8b989c
Fix various issues with is_replication_enabled
...
- `_is_master()` is global function
- `is_none()` was not defined (use is None)
- s/replication_enabled/enabled
2012-07-01 03:54:59 +05:30
Thomas S Hatch
e01a4c2d26
Merge pull request #1516 from baijum/sprint
...
ignore 'tmp' directory created by integration test
2012-06-30 09:49:50 -07:00
Baiju Muthukadan
4668e2c5d8
ignore 'tmp' directory created by integration test
2012-07-01 03:46:43 +05:30
larry
919f1e5b29
Tenants rent your property. Tenets are are principles that you uphold.
2012-06-30 06:25:06 -07:00
Thomas S Hatch
0c66239842
Merge pull request #1513 from wilkystyle/develop
...
Develop
2012-06-29 09:53:33 -07:00
Mike Wilkerson
6805eae79a
fixed globbing when no minions are found
2012-06-29 12:47:33 -04:00
Mike Wilkerson
a8d3ac3de1
Merge remote-tracking branch 'upstream/master' into develop
2012-06-29 12:15:13 -04:00
Thomas S Hatch
f922152bfc
Spelling error in state module
2012-06-28 22:10:53 -06:00
Thomas S Hatch
df0dfc4638
Merge pull request #1511 from peacetara/patch-2
...
The function appears to be called run now, and not sls.
2012-06-28 14:18:09 -07:00
Thomas S Hatch
1ba7629bc0
Merge pull request #1510 from peacetara/patch-1
...
Adding 'Running and debugging salt states' section. That shows off the ...
2012-06-28 11:54:42 -07:00
peacetara
3aaad890ca
The function appears to be called run now, and not sls.
2012-06-28 11:53:54 -07:00
peacetara
2f54587cbc
Adding 'Running and debugging salt states' section. That shows off the salt-call command, to help you debug. Also shows you how in the world to run a .sls file, which is always a good thing :)
2012-06-28 11:51:25 -07:00
Thomas S Hatch
8e51797e0f
Add makedirs support to file.rename
...
Fix #1447
2012-06-27 17:58:37 -06:00
Thomas S Hatch
b9b0a36b07
Add file.rename
2012-06-27 16:42:19 -06:00
Thomas S Hatch
1d6b929d5b
Jeff wanted more comments :P
2012-06-27 16:02:05 -06:00
Thomas S Hatch
e15957e975
Fix rare issue when watch is used but not supported
2012-06-27 15:27:00 -06:00
Thomas S Hatch
f9c3facbed
it would only check one before
2012-06-27 13:47:58 -06:00
Thomas S Hatch
1f1354440b
Add a cmd.script state
...
So that scripts can be executed dierctly from the master, Fix #1486
2012-06-27 12:37:59 -06:00
Thomas S Hatch
44a40b7072
fix docstring spelling error
2012-06-27 12:13:33 -06:00
Thomas S Hatch
0d8876f68b
Fix #1454
2012-06-27 10:57:27 -06:00
Thomas S Hatch
eb0f5873e0
Fix #1460
2012-06-27 10:32:48 -06:00
Thomas S Hatch
febd81d65d
Hook verify_socket function into the master startup
...
Fix #1452
2012-06-27 10:27:32 -06:00
Thomas S Hatch
551a788ea9
Add verify_socket method
2012-06-27 10:26:58 -06:00
Thomas S Hatch
1b13c2c155
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-06-27 09:10:50 -06:00
Thomas S Hatch
33646d77a8
Fix #1505
2012-06-27 09:09:58 -06:00
Jeff Schroeder
e96f08dbbc
Merge pull request #1502 from avimar/develop
...
Update GIT status help text
2012-06-26 15:38:25 -07:00
avimar
47abbfea16
Update develop
2012-06-27 01:16:53 +03:00
avimar
ee7cd4c690
Update develop
2012-06-27 01:16:42 +03:00
avimar
01eb6e588c
Update develop
2012-06-27 01:16:26 +03:00
Jeff Schroeder
bee175fdd3
Merge pull request #1503 from andytinycat/develop
...
Fix documentation oops in 'include' option
2012-06-26 15:06:45 -07:00
Andy Sykes
29c2763527
Fix documentation oops in 'include' option
2012-06-26 21:55:21 +01:00
avimar
c3179cc720
add note + how to do hashed pass
2012-06-26 23:36:26 +03:00
avimar
96ff108fd6
dependency
2012-06-26 23:33:19 +03:00
avimar
dc86e8ed1d
grammar typo
2012-06-26 23:29:55 +03:00
avimar
f1c86d9557
Add note about config
2012-06-26 23:28:44 +03:00
avimar
c8ffff1e0c
Be slightly more descriptive in the mysql docs
2012-06-26 23:26:47 +03:00
avimar
95cbabeb77
Update develop
2012-06-26 23:21:23 +03:00
Jeff Schroeder
162762ec6f
Merge pull request #1501 from andytinycat/develop
...
Bugfix + documentation update for 'include' option
2012-06-26 13:00:46 -07:00
Andy Sykes
df096d754f
Documentation oops
2012-06-26 20:54:56 +01:00
Andy Sykes
fbbe74bb35
Bugfixes/documentation update for the 'include' option
...
Bugfixes:
- handle case where 'include' option has an empty value
- globs were not handled correctly
- warning issued if any include option fails to match any files; this
may be deliberate by the user, but it's there to catch the case where
someone typos the path
Documentation updated with a few examples of how to use it. Minion
template config file also updated with similar examples.
2012-06-26 20:53:27 +01:00
Thomas S Hatch
3e6da4ff04
Merge pull request #1497 from jhutchins/networkstate
...
Networkstate
2012-06-25 15:09:39 -07:00
Jeff Hutchins
6ee599ebd5
Fix minor logic error.
2012-06-25 14:43:47 -06:00
Thomas S Hatch
03a8cc5532
Catch error where value of 0 is truncated
2012-06-25 10:56:08 -06:00
