Skip to content

Commit 89fce15

Browse files
committed
Config problem is fixed, and a fix for HDD/MEM/CPU parm in one
1 parent 363492f commit 89fce15

File tree

271 files changed

+168
-125253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

271 files changed

+168
-125253
lines changed

Godeps/Godeps.json

+2-361
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

carton/assembly.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ func (a *Ambly) SetStatus(status provision.Status) error {
197197
return nil
198198
}
199199

200-
//update outputs in riak, nuke the matching keys available
200+
//update outputs in scylla, nuke the matching keys available
201201
func (a *Ambly) NukeAndSetOutputs(m map[string][]string) error {
202202
if len(m) > 0 {
203-
log.Debugf("nuke and set outputs in riak [%s]", m)
203+
log.Debugf("nuke and set outputs in scylla [%s]", m)
204204
js := a.getOutputs()
205205
js.NukeAndSet(m) //just nuke the matching output key:
206206
update_fields := make(map[string]interface{})
@@ -273,7 +273,7 @@ func (a *Ambly) dig() (Assembly, error) {
273273
for _, cid := range a.Components {
274274
if len(strings.TrimSpace(cid)) > 1 {
275275
if comp, err := NewComponent(cid); err != nil {
276-
log.Errorf("Failed to get component %s from riak: %s.", cid, err.Error())
276+
log.Errorf("Failed to get component %s from scylla: %s.", cid, err.Error())
277277
return asm, err
278278
} else {
279279
asm.Components[cid] = comp

0 commit comments

Comments
 (0)