Thomas S Hatch
e02b297bf3
Remove local path imports
...
This should address #1924
2012-09-01 23:54:39 -06:00
Thomas S Hatch
1f3765c7d0
Add top file environment tracking to module syncing
2012-09-01 22:40:54 -06:00
Thomas S Hatch
d0a985b773
Merge pull request #1939 from s0undt3ch/issues/1896
...
Fix saltstack/salt#1896
2012-09-01 09:17:37 -07:00
Pedro Algarvio
a45c0bdce8
Fix saltstack/salt#1896
...
* Added `source` support to `salt.states.file.append()`
* Added tests for the above.
2012-09-01 07:49:34 +01:00
Thomas S Hatch
468efd0f48
Merge pull request #1938 from s0undt3ch/issues/1900
...
Add tests for saltstack/salt#1900
2012-08-31 23:39:11 -07:00
Pedro Algarvio
accb15d6ee
Add tests for saltstack/salt#1900
...
* Test both master and minion events firing
* Allow targeting the minions in `tests.integration.ModuleCase.run_function()`
* The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 07:29:06 +01:00
Thomas S Hatch
bc988be9bb
Merge pull request #1937 from s0undt3ch/issues/1935
...
Allow skipping random failing tests saltstack/salt#1935
2012-08-31 21:25:18 -07:00
Pedro Algarvio
71c842a896
Allow skipping random failing tests saltstack/salt#1935
2012-09-01 05:20:53 +01:00
Thomas S Hatch
6a6ab0d157
Merge pull request #1936 from s0undt3ch/issues/1900
...
Fix the tests related to saltstack/salt#1900
2012-08-31 21:19:35 -07:00
Pedro Algarvio
174f3d6d19
Fix the tests related to saltstack/salt#1900
2012-09-01 05:06:44 +01:00
Thomas S Hatch
000b770fa7
Merge pull request #1933 from s0undt3ch/issues/1900
...
Fix saltstack/salt#1900
2012-08-31 19:08:44 -07:00
Pedro Algarvio
cd1395ca72
Final saltstack/salt#1900 fixes
...
* Change `SaltEvent`, `MasterEvent` and `MinionEvent` class signatures to simplify it's use and passing `kwargs` to it.
2012-09-01 02:47:35 +01:00
Pedro Algarvio
3c5f1ca6a6
Some more saltstack/salt#1900 fixes
...
* Replace `SaltEvent` for `MasterEvent` where applicable;
* Pass `__opts__` to `salt.modules.event.fire`, it was missing;
* Add some more debug logging to `salt.utils.event`
* Instead of appending and slicing the event tag string, make use of python's string `format()`
2012-09-01 02:34:37 +01:00
Thomas S Hatch
67535af56f
Merge pull request #1932 from rentalita/package-versions
...
Fix #1772 . Use `apt-cache policy` to find available package version.
2012-08-31 10:37:52 -07:00
Tom Vaughan
755c42f822
Fix #1772 . Use apt-cache policy
to find available package version.
...
See also issue #1454 : https://github.com/saltstack/salt/issues/1454
2012-08-31 10:09:41 -07:00
Thomas S Hatch
b7e2c0d189
Merge pull request #1929 from romeotheriault/add-solaris-cpuarch-grain
...
added cpu grains for solaris
2012-08-31 08:43:15 -07:00
Romeo Theriault
9fd2a8669a
added cpu grains for solaris
2012-08-30 22:33:27 -10:00
Thomas S Hatch
6d9fe8d4b1
Repair some import errors
2012-08-30 23:07:06 -06:00
Thomas S Hatch
f6be468a60
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-08-30 19:02:12 -06:00
Thomas S Hatch
8f51e4ce03
Merge pull request #1928 from s0undt3ch/issues/1900
...
Fix saltstack/salt#1900
2012-08-30 18:01:14 -07:00
Thomas S Hatch
595af43c1d
Ubuntu default runlevel is 2
2012-08-30 18:59:42 -06:00
Thomas S Hatch
ec54f0608d
Merge pull request #1927 from seanchannel/patch-4
...
misplaced space
2012-08-30 17:58:40 -07:00
Pedro Algarvio
fff6736a95
Add some more debug logging calls.
2012-08-31 01:40:56 +01:00
Pedro Algarvio
ed7878e7c8
Fix saltstack/salt#1900
...
* Minor typo.
* Fix MinionEvent getting 'id' from kwargs and not getting the proper default value.
* And some unittest about this issue.
2012-08-31 01:20:32 +01:00
Sean Channel
6ffe36f322
misplaced space
...
"tot he" -> "to the"
2012-08-30 16:02:55 -07:00
Thomas S Hatch
0c42f6af18
Pylint errors fixed in client
2012-08-30 16:20:33 -06:00
Thomas S Hatch
a1699b3087
Don't traceback if the runlevel fails to return
2012-08-30 16:10:57 -06:00
Thomas S Hatch
9d24c93e79
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-08-30 16:03:20 -06:00
Thomas S Hatch
b96c8e07f2
Start cleaning up ca module
2012-08-30 16:02:56 -06:00
Thomas S Hatch
60431aa2c6
Merge pull request #1926 from wilkystyle/develop
...
fixed typo in error message
2012-08-30 14:45:30 -07:00
Thomas S Hatch
0d43b4dd2f
Clean up cassandra virtual function
2012-08-30 15:44:45 -06:00
Thomas S Hatch
666959c0b5
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-08-30 15:39:36 -06:00
Thomas S Hatch
24dcfa03e8
Clean up unused imports and pylint bugs from Jenkins
2012-08-30 15:38:57 -06:00
Thomas S Hatch
3c5b4cbbb5
Merge pull request #1925 from seanchannel/patch-3
...
delete the word "Facter"
2012-08-30 14:37:17 -07:00
Mike Wilkerson
de04f2660a
fixed typo in error message
2012-08-30 17:35:16 -04:00
Sean Channel
61a0318ae9
delete the word "Facter"
...
seems just fine without it
2012-08-30 14:28:52 -07:00
Thomas S Hatch
da0468c159
remove unused serial objects
2012-08-30 15:25:52 -06:00
Thomas S Hatch
3da76531b4
repair oversight in cython module autoloading
2012-08-30 15:04:01 -06:00
Thomas S Hatch
c059416351
clean up augeas loading
2012-08-30 14:22:25 -06:00
Thomas S Hatch
34829cd046
Clean up unused imports and variables
2012-08-30 14:14:02 -06:00
Thomas S Hatch
6ae5f97f25
Fix issue with the mode being the name
2012-08-30 13:35:50 -06:00
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