Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Revert "Merge pull request #4997 from cherylj/fix-go-fmt" #5008

Merged
merged 1 commit into from Apr 6, 2016
Merged

Revert "Merge pull request #4997 from cherylj/fix-go-fmt" #5008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/jujud/bootstrap.go
View file
Open in desktop
Expand Up @@ -226,10 +226,10 @@ func (c *BootstrapCommand) Run(_ *cmd.Context) error {
}

err = c.ChangeConfig(func(config agent.ConfigSetter) error {
// We'll try for mongo 3.2 first and fallback to
// mongo 2.4 if the newer binaries are not available.
if mongo.BinariesAvailable(mongo.Mongo32wt) {
config.SetMongoVersion(mongo.Mongo32wt)
// We cannot set wired tiger as the storage because mongo
// shipped with ubuntu lacks js.
if mongo.BinariesAvailable(mongo.Mongo30wt) {
config.SetMongoVersion(mongo.Mongo30wt)
} else {
config.SetMongoVersion(mongo.Mongo24)
}
Expand Down