spdf/elektron
Archived
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity

resolved merge conflicts

Browse source
This commit is contained in:
Renan DelValle 2016-12-22 23:17:01 -05:00
commit 71c889982f
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -19,7 +19,7 @@ machine on which electron is launched for logging to work**
How to run (Use the --help option to get information about other command-line options): How to run (Use the --help option to get information about other command-line options):
`./electron -workload <workload json>` `./electron -workload <workload json>`
To run electron with ignoreWatts, run the following command, To run electron with ignoreWatts, run the following command,

2
schedulers/proactiveclusterwidecappers.go
View file

@ -1,6 +1,6 @@
/* /*
Cluster wide dynamic capping Cluster wide dynamic capping
This is not a scheduler but a scheduling scheme that schedulers can use. this is not a scheduler but a scheduling scheme that schedulers can use.
*/ */
package schedulers package schedulers

2
utilities/utils.go
View file

@ -7,7 +7,7 @@ The Pair and PairList have been taken from google groups forum,
https://groups.google.com/forum/#!topic/golang-nuts/FT7cjmcL7gw https://groups.google.com/forum/#!topic/golang-nuts/FT7cjmcL7gw
*/ */
// Utility that helps in sorting a map[string]float64 by value. // Utility struct that helps in sorting a map[string]float64 by value.
type Pair struct { type Pair struct {
Key string Key string
Value float64 Value float64