Skip to content

/ saltfs

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle multiple (redundant) masters #284

Merged
merged 1 commit into from Mar 29, 2016
+3 −3
Merged

Handle multiple (redundant) masters #284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

4 .travis.yml
View file
Open in desktop
@@ -16,13 +16,13 @@ matrix:
os: linux
sudo: required
dist: trusty
- env: SALT_NODE_ID=servo-master
- env: SALT_NODE_ID=servo-master1
os: linux
sudo: required
dist: trusty
allow_failures:
- env: SALT_NODE_ID=servo-linux-cross1

before_install:
- .travis/install_salt -F -c .travis -- "${TRAVIS_OS_NAME}"

2 top.sls
View file
Open in desktop
@@ -29,7 +29,7 @@ base:
- servo-build-dependencies
- xvfb

'servo-master':
'servo-master\d+':
- git
- buildbot.master
- homu
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.